From 08af9deb09bb07277127c0ff4221cca44e313294 Mon Sep 17 00:00:00 2001 From: Yuuki <6851027-yukiz@users.noreply.gitlab.com> Date: Wed, 21 Aug 2024 09:48:06 +0800 Subject: [PATCH] small update proto p4 --- proto/AbilityActionGenerateElemBall.proto | 2 -- proto/AvatarChangeAnimHashReq.proto | 9 ++++++ proto/AvatarEnterElementViewNotify.proto | 9 ++++++ proto/AvatarFetterLevelRewardReq.proto | 10 +++--- proto/AvatarFetterLevelRewardRsp.proto | 13 ++++---- proto/BattlePassRewardTakeOption.proto | 3 -- proto/ChatEmojiCollectionData.proto | 19 ++---------- proto/ClientTriggerEventNotify.proto | 10 ++++++ proto/CreateVehicleReq.proto | 29 +++++------------ proto/CreateVehicleRsp.proto | 27 ++++------------ proto/DeleteFriendRsp.proto | 24 +++----------- proto/DropItemReq.proto | 13 ++++---- proto/DropItemRsp.proto | 11 +++---- proto/DungeonCandidateTeamCreateReq.proto | 9 ++++++ proto/EntityAiKillSelfNotify.proto | 8 ++--- proto/EventTriggerType.proto | 23 ++++++++++++++ proto/EvtAvatarSitDownNotify.proto | 28 ++++------------- proto/EvtBulletDeactiveNotify.proto | 27 ++++------------ proto/EvtBulletMoveNotify.proto | 26 +++------------- proto/EvtEntityStartDieEndNotify.proto | 12 +++++++ proto/FireworksReformData.proto | 24 +++----------- proto/FireworksReformDataNotify.proto | 24 +++----------- proto/FireworksReformParam.proto | 23 +++----------- proto/FocusAvatarReq.proto | 9 ++++++ proto/GCGTavernNpcInfo.proto | 9 ++++++ proto/GachaOpenWishNotify.proto | 9 ++++++ proto/GetAreaExplorePointReq.proto | 8 +++++ proto/GetBattlePassProductReq.proto | 8 +++++ proto/GetBattlePassProductRsp.proto | 12 +++++++ proto/GetChatEmojiCollectionRsp.proto | 23 +++----------- proto/GetFriendShowAvatarInfoReq.proto | 23 +++----------- proto/GetOnlinePlayerInfoReq.proto | 2 +- proto/GetParentQuestVideoKeyReq.proto | 23 +++----------- proto/HitClientTrivialNotify.proto | 10 ++++++ proto/HomeBlueprintInfoNotify.proto | 9 ++++++ proto/HomeSearchBlueprintReq.proto | 8 +++++ proto/MarkNewNotify.proto | 10 +++--- ...MarkTargetInvestigationMonsterNotify.proto | 14 +++------ proto/MatchType.proto | 27 ++++++++++++++++ proto/MeetNpcReq.proto | 7 +++++ proto/PlayerApplyEnterHomeNotify.proto | 2 +- proto/PlayerCompoundMaterialReq.proto | 25 +++------------ proto/PlayerStartMatchReq.proto | 14 +++++++++ proto/ReadPrivateChatReq.proto | 23 +++----------- proto/ReformFireworksReq.proto | 22 ++----------- proto/ReliquaryDecomposeReq.proto | 12 +++---- proto/ReliquaryDecomposeRsp.proto | 10 +++--- proto/ReliquaryFilterStateSaveNotify.proto | 22 ++----------- proto/ReliquaryUpgradeReq.proto | 15 +++++---- proto/ReliquaryUpgradeRsp.proto | 21 +++++++------ proto/SceneAudioNotify.proto | 31 +++++-------------- proto/SceneAvatarStaminaStepReq.proto | 23 +++----------- proto/SceneAvatarStaminaStepRsp.proto | 11 +++++++ proto/SceneKickPlayerReq.proto | 22 ++----------- proto/SetChatEmojiCollectionReq.proto | 23 +++----------- proto/SetFriendEnterHomeOptionReq.proto | 23 +++----------- proto/TakeAchievementGoalRewardReq.proto | 8 ++--- proto/TakeAchievementGoalRewardRsp.proto | 13 ++++---- proto/TakeAchievementRewardReq.proto | 8 ++--- proto/TakeAchievementRewardRsp.proto | 13 ++++---- proto/TakeBattlePassRewardReq.proto | 11 +++---- proto/TakeBattlePassRewardRsp.proto | 13 +++----- proto/TakePlayerLevelRewardReq.proto | 6 ++-- proto/TowerGetFloorStarRewardReq.proto | 8 +++++ ...teAbilityCreatedMovingPlatformNotify.proto | 9 +++--- proto/UseMiracleRingReq.proto | 11 +++++++ proto/VehicleInteractReq.proto | 29 +++++------------ proto/VehicleInteractRsp.proto | 6 ++-- proto/ViewCodexReq.proto | 9 ++++++ 69 files changed, 454 insertions(+), 583 deletions(-) create mode 100644 proto/AvatarChangeAnimHashReq.proto create mode 100644 proto/AvatarEnterElementViewNotify.proto create mode 100644 proto/ClientTriggerEventNotify.proto create mode 100644 proto/DungeonCandidateTeamCreateReq.proto create mode 100644 proto/EventTriggerType.proto create mode 100644 proto/EvtEntityStartDieEndNotify.proto create mode 100644 proto/FocusAvatarReq.proto create mode 100644 proto/GCGTavernNpcInfo.proto create mode 100644 proto/GachaOpenWishNotify.proto create mode 100644 proto/GetAreaExplorePointReq.proto create mode 100644 proto/GetBattlePassProductReq.proto create mode 100644 proto/GetBattlePassProductRsp.proto create mode 100644 proto/HitClientTrivialNotify.proto create mode 100644 proto/HomeBlueprintInfoNotify.proto create mode 100644 proto/HomeSearchBlueprintReq.proto create mode 100644 proto/MatchType.proto create mode 100644 proto/MeetNpcReq.proto create mode 100644 proto/PlayerStartMatchReq.proto create mode 100644 proto/SceneAvatarStaminaStepRsp.proto create mode 100644 proto/TowerGetFloorStarRewardReq.proto create mode 100644 proto/UseMiracleRingReq.proto create mode 100644 proto/ViewCodexReq.proto diff --git a/proto/AbilityActionGenerateElemBall.proto b/proto/AbilityActionGenerateElemBall.proto index 6795b77b..044ce696 100644 --- a/proto/AbilityActionGenerateElemBall.proto +++ b/proto/AbilityActionGenerateElemBall.proto @@ -1,8 +1,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - import "Vector.proto"; - // 4.7.0 // LNFNHFNNCOP (lock) message AbilityActionGenerateElemBall { diff --git a/proto/AvatarChangeAnimHashReq.proto b/proto/AvatarChangeAnimHashReq.proto new file mode 100644 index 00000000..2d883379 --- /dev/null +++ b/proto/AvatarChangeAnimHashReq.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; +// 4.7.0 +// CmdId: 29050 +// Obf: PCBLKNOGPEC +message AvatarChangeAnimHashReq { + uint64 avatar_guid = 6; + uint32 anim_hash = 7; +} diff --git a/proto/AvatarEnterElementViewNotify.proto b/proto/AvatarEnterElementViewNotify.proto new file mode 100644 index 00000000..aa6fe775 --- /dev/null +++ b/proto/AvatarEnterElementViewNotify.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; +// 4.7.0 +// CmdId: 912 +// Obf: NANIENKHCOJ +message AvatarEnterElementViewNotify { + bool is_triggerd = 12; + uint32 avatar_entity_id = 1; +} diff --git a/proto/AvatarFetterLevelRewardReq.proto b/proto/AvatarFetterLevelRewardReq.proto index 73f19464..d070cdaa 100644 --- a/proto/AvatarFetterLevelRewardReq.proto +++ b/proto/AvatarFetterLevelRewardReq.proto @@ -1,9 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - -// 4.6.0 -// CmdId: 4220 +// 4.7.0 +// CmdId: 1484 +// CMNOAMPAIKP message AvatarFetterLevelRewardReq { - uint32 fetter_level = 9; - uint64 avatar_guid = 14; + uint32 fetter_level = 1; + uint64 avatar_guid = 9; } \ No newline at end of file diff --git a/proto/AvatarFetterLevelRewardRsp.proto b/proto/AvatarFetterLevelRewardRsp.proto index 5825bb96..a40bc6a5 100644 --- a/proto/AvatarFetterLevelRewardRsp.proto +++ b/proto/AvatarFetterLevelRewardRsp.proto @@ -1,11 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - -// 4.6.0 -// CmdId: 27738 +// 4.7.0 +// CmdId: 9717 message AvatarFetterLevelRewardRsp { - uint32 fetter_level = 6; - uint32 reward_id = 7; - int32 retcode = 10; - uint64 avatar_guid = 14; + uint32 fetter_level = 8; + uint32 reward_id = 14; + int32 retcode = 4; + uint64 avatar_guid = 6; } \ No newline at end of file diff --git a/proto/BattlePassRewardTakeOption.proto b/proto/BattlePassRewardTakeOption.proto index 118892ae..8600f986 100644 --- a/proto/BattlePassRewardTakeOption.proto +++ b/proto/BattlePassRewardTakeOption.proto @@ -1,9 +1,6 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - import "BattlePassRewardTag.proto"; - // Version: 4.7.0 // Obfs: FIMEPLBAJMH message BattlePassRewardTakeOption { diff --git a/proto/ChatEmojiCollectionData.proto b/proto/ChatEmojiCollectionData.proto index ca7b7761..3b6ddcbb 100644 --- a/proto/ChatEmojiCollectionData.proto +++ b/proto/ChatEmojiCollectionData.proto @@ -1,22 +1,7 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Obf: GFDAHNLKKNG +// 4.7.0 +// Obf: ? message ChatEmojiCollectionData { repeated uint32 emoji_id_list = 1; } diff --git a/proto/ClientTriggerEventNotify.proto b/proto/ClientTriggerEventNotify.proto new file mode 100644 index 00000000..ca282487 --- /dev/null +++ b/proto/ClientTriggerEventNotify.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; +import "EventTriggerType.proto"; +// 4.7.0 +// CmdId: 8634 +// Obf: BDEGOOGHAMA +message ClientTriggerEventNotify { + uint32 force_id = 12; + EventTriggerType event_type = 14; +} diff --git a/proto/CreateVehicleReq.proto b/proto/CreateVehicleReq.proto index 56953f4b..aed7e35b 100644 --- a/proto/CreateVehicleReq.proto +++ b/proto/CreateVehicleReq.proto @@ -1,27 +1,12 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; -// CmdId: 29875 -// Obf: FJIDLNFEHBG +// 4.7.0 +// CmdId: 26744 +// Obf: LMCAJLPNBAC message CreateVehicleReq { - uint32 scene_point_id = 4; - Vector pos = 10; - uint32 vehicle_id = 11; - Vector rot = 5; + uint32 scene_point_id = 8; + Vector pos = 3; + uint32 vehicle_id = 1; + Vector rot = 11; } diff --git a/proto/CreateVehicleRsp.proto b/proto/CreateVehicleRsp.proto index 5f73f41d..f2499b3c 100644 --- a/proto/CreateVehicleRsp.proto +++ b/proto/CreateVehicleRsp.proto @@ -1,25 +1,10 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 958 -// Obf: PGCCKGDHLME +// 4.7.0 +// CmdId: 4740 +// Obf: NKPJDHIBIEA message CreateVehicleRsp { - uint32 vehicle_id = 9; - uint32 entity_id = 11; - int32 retcode = 2; + uint32 vehicle_id = 5; + uint32 entity_id = 2; + int32 retcode = 3; } diff --git a/proto/DeleteFriendRsp.proto b/proto/DeleteFriendRsp.proto index ec8a67a2..e67c499c 100644 --- a/proto/DeleteFriendRsp.proto +++ b/proto/DeleteFriendRsp.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"; -// CmdId: 9786 -// Obf: BDBANFKGEEN +// CmdId: 9192,23108,5432,4789,29028,23875,22728? +// Obf: ? message DeleteFriendRsp { - uint32 target_uid = 14; - int32 retcode = 13; + uint32 target_uid = 13; + int32 retcode = 12; } diff --git a/proto/DropItemReq.proto b/proto/DropItemReq.proto index 6a9ff34f..950c1d77 100644 --- a/proto/DropItemReq.proto +++ b/proto/DropItemReq.proto @@ -1,14 +1,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - import "Vector.proto"; import "StoreType.proto"; - -// 4.6.0 -// CmdId: 23960 +// 4.7.0 +// CmdId: 9675 +// ? message DropItemReq { uint64 guid = 3; - Vector pos = 6; - uint32 count = 12; + Vector pos = 1; + uint32 count = 11; StoreType store_type = 13; -} \ No newline at end of file +} diff --git a/proto/DropItemRsp.proto b/proto/DropItemRsp.proto index 94dfbd02..1a641916 100644 --- a/proto/DropItemRsp.proto +++ b/proto/DropItemRsp.proto @@ -1,12 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - import "StoreType.proto"; - -// 4.6.0 -// CmdId: 26504 +// 4.7.0 +// CmdId: 4117 +// ? message DropItemRsp { uint64 guid = 2; - int32 retcode = 3; - StoreType store_type = 12; + int32 retcode = 8; + StoreType store_type = 6; } \ No newline at end of file diff --git a/proto/DungeonCandidateTeamCreateReq.proto b/proto/DungeonCandidateTeamCreateReq.proto new file mode 100644 index 00000000..f72f6cc8 --- /dev/null +++ b/proto/DungeonCandidateTeamCreateReq.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; +// 4.7.0 +// CmdId: 1126 +// Obf: IKFJEKLIEAO +message DungeonCandidateTeamCreateReq { + uint32 dungeon_id = 2; + uint32 point_id = 5; +} diff --git a/proto/EntityAiKillSelfNotify.proto b/proto/EntityAiKillSelfNotify.proto index 16fb91a8..250a7bd9 100644 --- a/proto/EntityAiKillSelfNotify.proto +++ b/proto/EntityAiKillSelfNotify.proto @@ -1,8 +1,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - -// Obf: KCBLONBAAEL -// CmdId: 29500 +// 4.7.0 +// Obf: KENDFFHKAEL? +// CmdId: 4703 message EntityAiKillSelfNotify { - uint32 entity_id = 9; + uint32 entity_id = 15; } diff --git a/proto/EventTriggerType.proto b/proto/EventTriggerType.proto new file mode 100644 index 00000000..629e5cca --- /dev/null +++ b/proto/EventTriggerType.proto @@ -0,0 +1,23 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a 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: NCBNIKIODKP +enum EventTriggerType { + EVENT_TRIGGER_NONE = 0; + EVENT_TRIGGER_ENTER_FORCE = 1; +} diff --git a/proto/EvtAvatarSitDownNotify.proto b/proto/EvtAvatarSitDownNotify.proto index d5c71df1..e41df934 100644 --- a/proto/EvtAvatarSitDownNotify.proto +++ b/proto/EvtAvatarSitDownNotify.proto @@ -1,27 +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: 23010 -// Obf: EGKACDGMPPG +// CmdId: 26530 +// Obf: ? message EvtAvatarSitDownNotify { - uint64 chair_id = 6; - int32 direction = 8; - Vector position = 9; - uint32 entity_id = 4; + uint64 chair_id = 12; + int32 direction = 8; // OK + Vector position = 3; + uint32 entity_id = 13; } diff --git a/proto/EvtBulletDeactiveNotify.proto b/proto/EvtBulletDeactiveNotify.proto index 868d4eff..08cfb57b 100644 --- a/proto/EvtBulletDeactiveNotify.proto +++ b/proto/EvtBulletDeactiveNotify.proto @@ -1,27 +1,12 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "ForwardType.proto"; import "Vector.proto"; -// CmdId: 26348 -// Obf: FJJAANMLOOB +// 4.7.0 +// CmdId: 28844 sus +// Obf: OIFFIANHCNK message EvtBulletDeactiveNotify { - ForwardType forward_type = 1; - uint32 entity_id = 14; - Vector disappear_pos = 8; + ForwardType forward_type = 14; + uint32 entity_id = 5; + Vector disappear_pos = 12; } diff --git a/proto/EvtBulletMoveNotify.proto b/proto/EvtBulletMoveNotify.proto index 7b612cb1..fe6da4c9 100644 --- a/proto/EvtBulletMoveNotify.proto +++ b/proto/EvtBulletMoveNotify.proto @@ -1,27 +1,11 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; import "ForwardType.proto"; -// CmdId: 8672 -// Obf: PJHHOALDCDN +// CmdId: 24809 +// Obf: BKFCEHKJCCA message EvtBulletMoveNotify { - uint32 entity_id = 6; - Vector cur_pos = 13; - ForwardType forward_type = 15; + uint32 entity_id = 10; + Vector cur_pos = 14; + ForwardType forward_type = 2; } diff --git a/proto/EvtEntityStartDieEndNotify.proto b/proto/EvtEntityStartDieEndNotify.proto new file mode 100644 index 00000000..21af5725 --- /dev/null +++ b/proto/EvtEntityStartDieEndNotify.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; +import "ForwardType.proto"; +// 4.7.0 +// CmdId: 485 +// Obf: ??? +message EvtEntityStartDieEndNotify { + uint32 die_state_flag = 4; + uint32 entity_id = 12; + bool immediately = 10; + ForwardType forward_type = 13; +} diff --git a/proto/FireworksReformData.proto b/proto/FireworksReformData.proto index 903362a7..c7e19c36 100644 --- a/proto/FireworksReformData.proto +++ b/proto/FireworksReformData.proto @@ -1,24 +1,10 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "FireworksReformParam.proto"; -// Obf: PNMCPOPPKJL +// 4.7.0 +// Obf: EKFIOHFEPOH message FireworksReformData { - repeated FireworksReformParam reform_param_list = 9; - uint32 id = 4; + repeated FireworksReformParam reform_param_list = 13; + repeated uint32 uk1 = 15; + uint32 id = 2; } diff --git a/proto/FireworksReformDataNotify.proto b/proto/FireworksReformDataNotify.proto index 7a638739..ba7504ca 100644 --- a/proto/FireworksReformDataNotify.proto +++ b/proto/FireworksReformDataNotify.proto @@ -1,24 +1,10 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "FireworksReformData.proto"; -// CmdId: 7551 -// Obf: OFPJGJACJBD +// 4.7.0 +// CmdId: 23329 +// Obf: MFHAPJMFPON message FireworksReformDataNotify { - repeated FireworksReformData fireworks_reform_data_list = 4; + uint32 uk1 = 7; + repeated FireworksReformData fireworks_reform_data_list = 10; } diff --git a/proto/FireworksReformParam.proto b/proto/FireworksReformParam.proto index 2dfb5901..3e34d5f9 100644 --- a/proto/FireworksReformParam.proto +++ b/proto/FireworksReformParam.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 "FireworksReformParamType.proto"; -// Obf: PMAIMKODBLA +// 4.7.0 +// Obf: HEGNJFOAJKM message FireworksReformParam { - FireworksReformParamType type = 2; - int32 value = 3; + FireworksReformParamType type = 14; + int32 value = 4; } diff --git a/proto/FocusAvatarReq.proto b/proto/FocusAvatarReq.proto new file mode 100644 index 00000000..17e5bc69 --- /dev/null +++ b/proto/FocusAvatarReq.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; +// 4.7.0 +// CmdId: 27317 +// Obf: ? +message FocusAvatarReq { + bool is_focus = 3; + uint64 avatar_guid = 2; +} diff --git a/proto/GCGTavernNpcInfo.proto b/proto/GCGTavernNpcInfo.proto new file mode 100644 index 00000000..7da76ea9 --- /dev/null +++ b/proto/GCGTavernNpcInfo.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; +// 4.7.0 +// Obf: IOMHEAFIGGJ +message GCGTavernNpcInfo { + uint32 id = 13; + uint32 level_id = 12; + uint32 scene_point_id = 1; +} diff --git a/proto/GachaOpenWishNotify.proto b/proto/GachaOpenWishNotify.proto new file mode 100644 index 00000000..2ac5b4d1 --- /dev/null +++ b/proto/GachaOpenWishNotify.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; +// 4.7.0 +// CmdId: 9144 +// Obf: JDGGEKLLNAK +message GachaOpenWishNotify { + uint32 gacha_schedule_id = 6; + uint32 gacha_type = 9; +} diff --git a/proto/GetAreaExplorePointReq.proto b/proto/GetAreaExplorePointReq.proto new file mode 100644 index 00000000..b843c969 --- /dev/null +++ b/proto/GetAreaExplorePointReq.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; +// 4.7.0 +// CmdId: 533 +// Obf: ? +message GetAreaExplorePointReq { + repeated uint32 area_id_list = 13; +} diff --git a/proto/GetBattlePassProductReq.proto b/proto/GetBattlePassProductReq.proto new file mode 100644 index 00000000..80d85ff7 --- /dev/null +++ b/proto/GetBattlePassProductReq.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; +// 4.7.0 +// CmdId: 27468 +// Obf: LNHMAMCNDGJ +message GetBattlePassProductReq { + uint32 battle_pass_product_play_type = 4; +} diff --git a/proto/GetBattlePassProductRsp.proto b/proto/GetBattlePassProductRsp.proto new file mode 100644 index 00000000..e2e4c6ff --- /dev/null +++ b/proto/GetBattlePassProductRsp.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; +// 4.7.0 +// CmdId: 9981? +// Obf: NNBFBPPCIPE +message GetBattlePassProductRsp { + int32 retcode = 12; + string price_tier = 14; + string product_id = 6; + uint32 cur_schedule_id = 4; + uint32 battle_pass_product_play_type = 1; +} diff --git a/proto/GetChatEmojiCollectionRsp.proto b/proto/GetChatEmojiCollectionRsp.proto index b32342c3..3418a228 100644 --- a/proto/GetChatEmojiCollectionRsp.proto +++ b/proto/GetChatEmojiCollectionRsp.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 "ChatEmojiCollectionData.proto"; -// CmdId: 21858 -// Obf: NOLCBIPMJDJ +// 4.7.0 +// CmdId: 26849 +// Obf: ? message GetChatEmojiCollectionRsp { - ChatEmojiCollectionData chat_emoji_collection_data = 1; + ChatEmojiCollectionData chat_emoji_collection_data = 3; int32 retcode = 14; } diff --git a/proto/GetFriendShowAvatarInfoReq.proto b/proto/GetFriendShowAvatarInfoReq.proto index 514fd760..6df32edb 100644 --- a/proto/GetFriendShowAvatarInfoReq.proto +++ b/proto/GetFriendShowAvatarInfoReq.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: 3887 -// Obf: HPFMOEEPOGI +// 4.7.0 +// CmdId: 22460 +// Obf: HCLGHFLOHPN message GetFriendShowAvatarInfoReq { - uint32 uid = 1; + uint32 uid = 8; } diff --git a/proto/GetOnlinePlayerInfoReq.proto b/proto/GetOnlinePlayerInfoReq.proto index 17ed9f13..87ea52cd 100644 --- a/proto/GetOnlinePlayerInfoReq.proto +++ b/proto/GetOnlinePlayerInfoReq.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // 4.7.0 // CmdId: 4777 -// Obf: ? +// Obf: ??? message GetOnlinePlayerInfoReq { bool is_online_id = 9; oneof player_id { diff --git a/proto/GetParentQuestVideoKeyReq.proto b/proto/GetParentQuestVideoKeyReq.proto index 8951aea1..32a13fa6 100644 --- a/proto/GetParentQuestVideoKeyReq.proto +++ b/proto/GetParentQuestVideoKeyReq.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: 28598 -// Obf: IDDDDFEJCNE +// 4.7.0 +// CmdId: 28109,25153,21386,4473,8018 +// Obf: ? message GetParentQuestVideoKeyReq { - uint32 parent_quest_id = 14; + uint32 parent_quest_id = 13; } diff --git a/proto/HitClientTrivialNotify.proto b/proto/HitClientTrivialNotify.proto new file mode 100644 index 00000000..04bde1b0 --- /dev/null +++ b/proto/HitClientTrivialNotify.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; +import "Vector.proto"; +// 4.7.0 +// CmdId: 5424 +// Obf: KJAGDKJPKJD +message HitClientTrivialNotify { + uint32 owner_entity_id = 15; + Vector position = 9; +} diff --git a/proto/HomeBlueprintInfoNotify.proto b/proto/HomeBlueprintInfoNotify.proto new file mode 100644 index 00000000..d8d52a98 --- /dev/null +++ b/proto/HomeBlueprintInfoNotify.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; +// 4.7.0 +// CmdId: 24913 +// Obf: LOJKBCEKOFC +message HomeBlueprintInfoNotify { + bool uk1 = 1; + bool uk2 = 5; +} diff --git a/proto/HomeSearchBlueprintReq.proto b/proto/HomeSearchBlueprintReq.proto new file mode 100644 index 00000000..498ca9ea --- /dev/null +++ b/proto/HomeSearchBlueprintReq.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; +// 4.7.0 +// CmdId: 8091 +// Obf: PAJDGEEFIHJ +message HomeSearchBlueprintReq { + string share_code = 9; +} diff --git a/proto/MarkNewNotify.proto b/proto/MarkNewNotify.proto index caac7f67..59050605 100644 --- a/proto/MarkNewNotify.proto +++ b/proto/MarkNewNotify.proto @@ -1,9 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - -// 4.6.0 -// CmdId: 5948 +// 4.7.0 +// CmdId: 5979 +// CMJDIHAKIHN message MarkNewNotify { - repeated uint32 id_list = 1; - uint32 mark_new_type = 2; + repeated uint32 id_list = 13; + uint32 mark_new_type = 7; } \ No newline at end of file diff --git a/proto/MarkTargetInvestigationMonsterNotify.proto b/proto/MarkTargetInvestigationMonsterNotify.proto index 35d8480c..8e09647f 100644 --- a/proto/MarkTargetInvestigationMonsterNotify.proto +++ b/proto/MarkTargetInvestigationMonsterNotify.proto @@ -1,15 +1,11 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - -import "DeshretObeliskChestInfo.proto"; - +// 4.7.0 // CmdId: 4072 -// Version: 4.7.0 -// Obfs: BNJPANBFBDL +// Obf: BNJPANBFBDL message MarkTargetInvestigationMonsterNotify { - uint32 investigation_monster_id = 1; uint32 scene_id = 6; - uint32 group_id = 12; uint32 monster_id = 3; -} \ No newline at end of file + uint32 investigation_monster_id = 1; + uint32 group_id = 12; +} diff --git a/proto/MatchType.proto b/proto/MatchType.proto new file mode 100644 index 00000000..ae2d88ad --- /dev/null +++ b/proto/MatchType.proto @@ -0,0 +1,27 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; +// Obf: DAHBJFKJLHG +enum MatchType { + MATCH_TYPE_NONE = 0; + MATCH_TYPE_DUNGEON = 1; + MATCH_TYPE_MP_PLAY = 2; + MATCH_TYPE_MECHANICUS = 3; + MATCH_TYPE_GENERAL = 4; + MATCH_TYPE_GCG = 5; +} diff --git a/proto/MeetNpcReq.proto b/proto/MeetNpcReq.proto new file mode 100644 index 00000000..14181075 --- /dev/null +++ b/proto/MeetNpcReq.proto @@ -0,0 +1,7 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; +// CmdId: 5374 +// Obf: CBGKMDOIFEO +message MeetNpcReq { + uint32 npc_id = 10; +} diff --git a/proto/PlayerApplyEnterHomeNotify.proto b/proto/PlayerApplyEnterHomeNotify.proto index be4c851f..647e1621 100644 --- a/proto/PlayerApplyEnterHomeNotify.proto +++ b/proto/PlayerApplyEnterHomeNotify.proto @@ -1,7 +1,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "OnlinePlayerInfo.proto"; -// CmdId: 5247 ? (4.7.0) +// CmdId: 5247? OR 23074 ? (4.7.0) // Obf: BDPJPLOMCHE message PlayerApplyEnterHomeNotify { OnlinePlayerInfo src_player_info = 2; diff --git a/proto/PlayerCompoundMaterialReq.proto b/proto/PlayerCompoundMaterialReq.proto index 90ea959e..d732acca 100644 --- a/proto/PlayerCompoundMaterialReq.proto +++ b/proto/PlayerCompoundMaterialReq.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: 7541 -// Obf: AILEMFGGGHN +// 4.7.0 +// CmdId: 26870 +// Obf: PAMALPJFMAF message PlayerCompoundMaterialReq { - uint32 compound_id = 2; - uint32 count = 11; + uint32 compound_id = 4; + uint32 count = 2; } diff --git a/proto/PlayerStartMatchReq.proto b/proto/PlayerStartMatchReq.proto new file mode 100644 index 00000000..10a1c1af --- /dev/null +++ b/proto/PlayerStartMatchReq.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; +import "MatchType.proto"; +// 4.7.0 +// CmdId: 28139 +// Obf: JGKMFLFKLBK +message PlayerStartMatchReq { + uint32 mp_play_id = 13; // OK + uint32 mechanicus_difficult_level = 14; + MatchType match_type = 8; // OK + uint32 match_id = 9; // OK + repeated uint32 match_param_list = 5; // OK + uint32 dungeon_id = 11; // OK +} diff --git a/proto/ReadPrivateChatReq.proto b/proto/ReadPrivateChatReq.proto index 5f157237..3e5ecf8e 100644 --- a/proto/ReadPrivateChatReq.proto +++ b/proto/ReadPrivateChatReq.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: 5538 -// Obf: BMBHFJMPFKB +// 4.7.0 ? +// CmdId: 24013 +// Obf: MEEPMDHNAND message ReadPrivateChatReq { - uint32 target_uid = 4; + uint32 target_uid = 11; } diff --git a/proto/ReformFireworksReq.proto b/proto/ReformFireworksReq.proto index bfd81a64..2f773813 100644 --- a/proto/ReformFireworksReq.proto +++ b/proto/ReformFireworksReq.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 "FireworksReformData.proto"; -// CmdId: 28941 -// Obf: PICLGFMPPAN +// CmdId: 3254 +// Obf: CIOAPOACPEE message ReformFireworksReq { - FireworksReformData fireworks_reform_data = 10; + FireworksReformData fireworks_reform_data = 1; } diff --git a/proto/ReliquaryDecomposeReq.proto b/proto/ReliquaryDecomposeReq.proto index c3f3c9e5..5eae70a3 100644 --- a/proto/ReliquaryDecomposeReq.proto +++ b/proto/ReliquaryDecomposeReq.proto @@ -1,10 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - -// 4.6.0 -// CmdId: 23132 +// 4.7.0 +// CmdId: 25206 +// NMBAPILLLFN message ReliquaryDecomposeReq { - uint32 target_count = 4; - repeated uint64 guid_list = 5; - uint32 config_id = 6; + uint32 target_count = 12; + repeated uint64 guid_list = 7; + uint32 config_id = 1; } \ No newline at end of file diff --git a/proto/ReliquaryDecomposeRsp.proto b/proto/ReliquaryDecomposeRsp.proto index d4b45777..ed398019 100644 --- a/proto/ReliquaryDecomposeRsp.proto +++ b/proto/ReliquaryDecomposeRsp.proto @@ -1,9 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - -// 4.6.0 -// CmdId: 22479 +// 4.7.0 +// CmdId: 8148 +// HCLMCPMJLHA message ReliquaryDecomposeRsp { - repeated uint64 guid_list = 14; - int32 retcode = 15; + repeated uint64 guid_list = 2; + int32 retcode = 15; // ok } \ No newline at end of file diff --git a/proto/ReliquaryFilterStateSaveNotify.proto b/proto/ReliquaryFilterStateSaveNotify.proto index 6929f81b..04e9fabd 100644 --- a/proto/ReliquaryFilterStateSaveNotify.proto +++ b/proto/ReliquaryFilterStateSaveNotify.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: 4815 -// Obf: ECBLOLDIABL +// CmdId: 28625 +// Obf: ? message ReliquaryFilterStateSaveNotify { - map reliquary_filter_state_map = 4; + map reliquary_filter_state_map = 6; } diff --git a/proto/ReliquaryUpgradeReq.proto b/proto/ReliquaryUpgradeReq.proto index 45dbdce7..f97d4c43 100644 --- a/proto/ReliquaryUpgradeReq.proto +++ b/proto/ReliquaryUpgradeReq.proto @@ -1,12 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - import "ItemParam.proto"; - -// 4.6.0 -// CmdId: 20208 +// 4.7.0 +// CmdId: 9142 +// ? message ReliquaryUpgradeReq { - repeated ItemParam item_param_list = 1; - repeated uint64 food_reliquary_guid_list = 8; - uint64 target_reliquary_guid = 11; -} \ No newline at end of file + repeated ItemParam item_param_list = 5; + repeated uint64 food_reliquary_guid_list = 6; + uint64 target_reliquary_guid = 3; +} diff --git a/proto/ReliquaryUpgradeRsp.proto b/proto/ReliquaryUpgradeRsp.proto index 44b2533c..d23164cd 100644 --- a/proto/ReliquaryUpgradeRsp.proto +++ b/proto/ReliquaryUpgradeRsp.proto @@ -1,14 +1,15 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - -// 4.6.0 -// CmdId: 336 +// 4.7.0 +// CmdId: 5692 +// ? message ReliquaryUpgradeRsp { - uint64 target_reliquary_guid = 2; - int32 retcode = 3; - uint32 power_up_rate = 5; - uint32 cur_level = 6; - uint32 old_level = 7; - repeated uint32 cur_append_prop_list = 9; //old_append_prop_list or cur_append_prop_list - repeated uint32 old_append_prop_list = 10; //old_append_prop_list or cur_append_prop_list + uint64 target_reliquary_guid = 12; + int32 retcode = 5; + uint32 power_up_rate = 11; + uint32 cur_level = 7; + uint32 old_level = 14; + // sus + repeated uint32 cur_append_prop_list = 1; + repeated uint32 old_append_prop_list = 8; } \ No newline at end of file diff --git a/proto/SceneAudioNotify.proto b/proto/SceneAudioNotify.proto index 7d6398a1..609acac1 100644 --- a/proto/SceneAudioNotify.proto +++ b/proto/SceneAudioNotify.proto @@ -1,27 +1,12 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 4490 -// Obf: KJPABKOEPJN +// 4.7.0 +// CmdId: 7184 +// Obf: DDCKECBDELH message SceneAudioNotify { - repeated string param3 = 11; - repeated float param2 = 6; - uint32 source_uid = 2; - repeated uint32 param1 = 4; - int32 type = 12; + repeated string param3 = 10; + repeated float param2 = 8; + uint32 source_uid = 6; + repeated uint32 param1 = 1; + int32 type = 4; } diff --git a/proto/SceneAvatarStaminaStepReq.proto b/proto/SceneAvatarStaminaStepReq.proto index 35e51fc3..5188abf5 100644 --- a/proto/SceneAvatarStaminaStepReq.proto +++ b/proto/SceneAvatarStaminaStepReq.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 "Vector.proto"; -// CmdId: 543 -// Obf: OALKNGKGAJL +// 4.7.0 +// CmdId: 27101 +// Obf: ALBFMCCECLE message SceneAvatarStaminaStepReq { - Vector rot = 5; + Vector rot = 15; bool use_client_rot = 8; } diff --git a/proto/SceneAvatarStaminaStepRsp.proto b/proto/SceneAvatarStaminaStepRsp.proto new file mode 100644 index 00000000..8f3ccbfd --- /dev/null +++ b/proto/SceneAvatarStaminaStepRsp.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; +import "Vector.proto"; +// 4.7.0 +// CmdId: 29213 +// Obf: HPHCIAAOGKJ +message SceneAvatarStaminaStepRsp { + Vector rot = 3; + bool use_client_rot = 13; + int32 retcode = 1; +} diff --git a/proto/SceneKickPlayerReq.proto b/proto/SceneKickPlayerReq.proto index c3b9766b..e56343ba 100644 --- a/proto/SceneKickPlayerReq.proto +++ b/proto/SceneKickPlayerReq.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: 29095 -// Obf: HMIBDCFKKBC +// CmdId: 182 ??? +// Obf: ??? message SceneKickPlayerReq { - uint32 target_uid = 4; + uint32 target_uid = 3; } diff --git a/proto/SetChatEmojiCollectionReq.proto b/proto/SetChatEmojiCollectionReq.proto index f118de81..8fcef1f2 100644 --- a/proto/SetChatEmojiCollectionReq.proto +++ b/proto/SetChatEmojiCollectionReq.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 "ChatEmojiCollectionData.proto"; -// CmdId: 21632 -// Obf: CAOLNHCCHFO +// 4.7.0 +// CmdId: 1123 +// Obf: EACENNKMOFN message SetChatEmojiCollectionReq { - ChatEmojiCollectionData chat_emoji_collection_data = 10; + ChatEmojiCollectionData chat_emoji_collection_data = 4; } diff --git a/proto/SetFriendEnterHomeOptionReq.proto b/proto/SetFriendEnterHomeOptionReq.proto index e13243b4..e91a2dc3 100644 --- a/proto/SetFriendEnterHomeOptionReq.proto +++ b/proto/SetFriendEnterHomeOptionReq.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 "FriendEnterHomeOption.proto"; -// CmdId: 26896 -// Obf: GFLDPKKAAKP +// 4.7.0 +// CmdId: 27828 +// Obf: EGCPPBGPKEM message SetFriendEnterHomeOptionReq { - FriendEnterHomeOption option = 6; + FriendEnterHomeOption option = 9; } diff --git a/proto/TakeAchievementGoalRewardReq.proto b/proto/TakeAchievementGoalRewardReq.proto index dafea45e..94743ad9 100644 --- a/proto/TakeAchievementGoalRewardReq.proto +++ b/proto/TakeAchievementGoalRewardReq.proto @@ -1,8 +1,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - -// 4.6.0 -// CmdId: 2692 +// 4.7.0 +// CmdId: 6501 (or TakeAchievementRewardReq) +// EOIFNDPMMHC message TakeAchievementGoalRewardReq { - repeated uint32 id_list = 12; + repeated uint32 id_list = 7; } diff --git a/proto/TakeAchievementGoalRewardRsp.proto b/proto/TakeAchievementGoalRewardRsp.proto index e0b88e57..e8a1b952 100644 --- a/proto/TakeAchievementGoalRewardRsp.proto +++ b/proto/TakeAchievementGoalRewardRsp.proto @@ -1,12 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - import "ItemParam.proto"; - -// 4.6.0 -// CmdId: 23787 +// 4.7.0 +// CmdId: 8945 +// NNIPPHOMNAE message TakeAchievementGoalRewardRsp { - repeated ItemParam item_list = 4; - repeated uint32 id_list = 12; - int32 retcode = 13; + repeated ItemParam item_list = 15; + repeated uint32 id_list = 2; + int32 retcode = 5; } diff --git a/proto/TakeAchievementRewardReq.proto b/proto/TakeAchievementRewardReq.proto index f423f167..25d1ea41 100644 --- a/proto/TakeAchievementRewardReq.proto +++ b/proto/TakeAchievementRewardReq.proto @@ -1,8 +1,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - -// 4.6.0 -// CmdId: 8646 +// 4.7.0 +// CmdId: 29798 +// FMJKPBJPKLP message TakeAchievementRewardReq { - repeated uint32 id_list = 9; + repeated uint32 id_list = 5; } diff --git a/proto/TakeAchievementRewardRsp.proto b/proto/TakeAchievementRewardRsp.proto index 2e6ec982..7307ab41 100644 --- a/proto/TakeAchievementRewardRsp.proto +++ b/proto/TakeAchievementRewardRsp.proto @@ -1,12 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - import "ItemParam.proto"; - -// 4.6.0 -// CmdId: 24805 +// 4.7.0 +// CmdId: 8024 +// AAMGNJNLNPJ message TakeAchievementRewardRsp { - int32 retcode = 3; - repeated ItemParam item_list = 4; - repeated uint32 id_list = 13; + int32 retcode = 9; + repeated ItemParam item_list = 14; + repeated uint32 id_list = 5; } diff --git a/proto/TakeBattlePassRewardReq.proto b/proto/TakeBattlePassRewardReq.proto index 659d1b74..ee767d44 100644 --- a/proto/TakeBattlePassRewardReq.proto +++ b/proto/TakeBattlePassRewardReq.proto @@ -1,12 +1,9 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - import "BattlePassRewardTakeOption.proto"; - -// CmdId: 28683 -// Version: 4.6.0 -// Obfs: IMCLHEMCFIC +// CmdId: 27855 +// Version: 4.7.0 +// Obfs: ? message TakeBattlePassRewardReq { - repeated BattlePassRewardTakeOption take_option_list = 1; + repeated BattlePassRewardTakeOption take_option_list = 8; } diff --git a/proto/TakeBattlePassRewardRsp.proto b/proto/TakeBattlePassRewardRsp.proto index 38f3e2de..202a7d2a 100644 --- a/proto/TakeBattlePassRewardRsp.proto +++ b/proto/TakeBattlePassRewardRsp.proto @@ -1,15 +1,12 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - import "BattlePassRewardTakeOption.proto"; import "ItemParam.proto"; - -// CmdId: 1049 -// Version: 4.6.0 -// Obfs: PCPEJDNJIAD +// CmdId: 3069 +// Version: 4.7.0 +// Obfs: ? message TakeBattlePassRewardRsp { - repeated ItemParam item_list = 3; + repeated ItemParam item_list = 14; repeated BattlePassRewardTakeOption take_option_list = 4; - int32 retcode = 14; + int32 retcode = 9; } diff --git a/proto/TakePlayerLevelRewardReq.proto b/proto/TakePlayerLevelRewardReq.proto index bd669071..131b171d 100644 --- a/proto/TakePlayerLevelRewardReq.proto +++ b/proto/TakePlayerLevelRewardReq.proto @@ -2,8 +2,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // 4.7.0 -// cmdid: 20108 (lock) or 23531 or 8505 -// NOFJHPDHIEK ? +// cmdid: 20108x or 23531(OK) or 8505 +// HELMFFAEDBN message TakePlayerLevelRewardReq { - uint32 level = 2; + uint32 level = 10; } diff --git a/proto/TowerGetFloorStarRewardReq.proto b/proto/TowerGetFloorStarRewardReq.proto new file mode 100644 index 00000000..5c85ffce --- /dev/null +++ b/proto/TowerGetFloorStarRewardReq.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; +// 4.7.0 +// CmdId: 23282 +// Obf: FILMDKJGMHF +message TowerGetFloorStarRewardReq { + uint32 floor_id = 10; +} diff --git a/proto/UpdateAbilityCreatedMovingPlatformNotify.proto b/proto/UpdateAbilityCreatedMovingPlatformNotify.proto index 1b556315..3beca732 100644 --- a/proto/UpdateAbilityCreatedMovingPlatformNotify.proto +++ b/proto/UpdateAbilityCreatedMovingPlatformNotify.proto @@ -1,15 +1,14 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - -// 4.6.0 -// CmdId: 3822 +// 4.7.0 +// CmdId: 6778 +// ? message UpdateAbilityCreatedMovingPlatformNotify { enum OpType { OP_TYPE_NONE = 0; OP_TYPE_ACTIVATE = 1; OP_TYPE_DEACTIVATE = 2; } - - uint32 entity_id = 7; + uint32 entity_id = 5; OpType op_type = 12; } \ No newline at end of file diff --git a/proto/UseMiracleRingReq.proto b/proto/UseMiracleRingReq.proto new file mode 100644 index 00000000..8c54ec7a --- /dev/null +++ b/proto/UseMiracleRingReq.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; +import "Vector.proto"; +// 4.7.0 +// CmdId: 24421 +// Obf: NPPAHHLALEN +message UseMiracleRingReq { + Vector pos = 7; + uint32 miracle_ring_op_type = 3; + Vector rot = 22; +} diff --git a/proto/VehicleInteractReq.proto b/proto/VehicleInteractReq.proto index 28848c1f..de2c10ca 100644 --- a/proto/VehicleInteractReq.proto +++ b/proto/VehicleInteractReq.proto @@ -1,27 +1,12 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "VehicleInteractType.proto"; -// CmdId: 28312 -// Obf: BPOCDLCHOCO +// 4.7.0 +// CmdId: 5099 +// Obf: ? message VehicleInteractReq { - uint32 entity_id = 10; - uint32 pos = 7; - VehicleInteractType interact_type = 9; - bool EPCIACIPLAN = 15; + uint32 entity_id = 1; + uint32 pos = 2; + VehicleInteractType interact_type = 14; + bool uk1 = 4; } diff --git a/proto/VehicleInteractRsp.proto b/proto/VehicleInteractRsp.proto index e43fe58e..e22bf2ec 100644 --- a/proto/VehicleInteractRsp.proto +++ b/proto/VehicleInteractRsp.proto @@ -9,10 +9,10 @@ import "VehicleInteractType.proto"; message VehicleInteractRsp { int32 retcode = 1; VehicleMember member = 6; - //Vector KKDFCJENDNI = 4; + Vector uk1 = 2; uint32 entity_id = 13; VehicleInteractType interact_type = 5; uint32 gadget_id = 8; - //Vector JGOGBMEKOPP = 1; - //uint32 CJIMMADJKHD = 10; + Vector uk2 = 15; + uint32 uk3 = 12; } diff --git a/proto/ViewCodexReq.proto b/proto/ViewCodexReq.proto new file mode 100644 index 00000000..f88bb52f --- /dev/null +++ b/proto/ViewCodexReq.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; +import "CodexTypeData.proto"; +// 4.7.0 +// CmdId: 4291 +// Obf: ? +message ViewCodexReq { + repeated CodexTypeData type_data_list = 8; +}