From 0b7044b24cf4ede7b21448a27d781b4f8494f57f Mon Sep 17 00:00:00 2001 From: Yuuki <6851027-yukiz@users.noreply.gitlab.com> Date: Mon, 22 Jul 2024 11:47:23 +0800 Subject: [PATCH] shop,gacha,abyss fix p1 --- proto/BatchBuyGoodsReq.proto | 13 ++--- proto/BatchBuyGoodsRsp.proto | 15 +++--- proto/BuyGoodsParam.proto | 11 ++-- proto/BuyGoodsReq.proto | 15 +++--- proto/BuyGoodsRsp.proto | 17 +++---- proto/CanUseSkillNotify.proto | 7 ++- proto/ChallengeBrief.proto | 2 - proto/ChallengeDataNotify.proto | 12 ++--- proto/ChallengeFinishType.proto | 2 - proto/DailyDungeonEntryInfo.proto | 18 +++---- proto/DoGachaReq.proto | 3 +- proto/DoGachaRsp.proto | 32 ++++++------ proto/DungeonPlayerDieNotify.proto | 35 ++++--------- proto/DungeonPlayerDieReq.proto | 11 ++-- proto/DungeonPlayerDieRsp.proto | 23 ++------- proto/DungeonSettleNotify.proto | 33 +++++------- proto/GachaInfo.proto | 51 ++++++++++--------- proto/GachaItem.proto | 17 +++---- proto/GachaTransferItem.proto | 11 ++-- proto/GachaUpInfo.proto | 2 - proto/GachaWishReq.proto | 3 +- proto/GachaWishRsp.proto | 10 ++-- proto/GetActivityInfoReq.proto | 21 ++------ proto/GetAuthkeyReq.proto | 7 ++- proto/GetAuthkeyRsp.proto | 3 +- proto/GetDailyDungeonEntryInfoReq.proto | 8 +-- proto/GetDailyDungeonEntryInfoRsp.proto | 13 ++--- proto/GetGachaInfoRsp.proto | 3 -- proto/GetShopReq.proto | 3 +- proto/GetShopRsp.proto | 2 - proto/GetShopmallDataReq.proto | 2 +- proto/GetShopmallDataRsp.proto | 10 ++-- proto/ParamList.proto | 4 +- proto/SceneEntityDrownReq.proto | 12 ++--- proto/SceneEntityDrownRsp.proto | 25 ++------- proto/SceneEntityMoveNotify.proto | 27 +++------- proto/Shop.proto | 3 +- proto/ShopGoods.proto | 50 ++++++++++-------- proto/StrengthenPointData.proto | 2 - proto/TowerAllDataRsp.proto | 13 ++--- proto/TowerCurLevelRecord.proto | 3 -- proto/TowerCurLevelRecordChangeNotify.proto | 9 ++-- proto/TowerEnterLevelReq.proto | 8 ++- proto/TowerEnterLevelRsp.proto | 15 +++--- proto/TowerFloorRecord.proto | 3 -- proto/TowerFloorRecordChangeNotify.proto | 3 -- proto/TowerLevelEndNotify.proto | 18 +++---- proto/TowerLevelRecord.proto | 2 - proto/TowerLevelStarCondData.proto | 13 +++-- proto/TowerLevelStarCondNotify.proto | 14 +++-- proto/TowerMiddleLevelChangeTeamNotify.proto | 21 ++------ proto/TowerMonthlyBrief.proto | 14 ++--- proto/TowerTeam.proto | 2 - proto/TowerTeamSelectReq.proto | 3 -- proto/TrialAvatarFirstPassDungeonNotify.proto | 8 +-- 55 files changed, 256 insertions(+), 431 deletions(-) diff --git a/proto/BatchBuyGoodsReq.proto b/proto/BatchBuyGoodsReq.proto index 83027f38..e778fb0c 100644 --- a/proto/BatchBuyGoodsReq.proto +++ b/proto/BatchBuyGoodsReq.proto @@ -1,13 +1,10 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - import "BuyGoodsParam.proto"; - -// CmdId: 6661 -// Version: 4.6.0 -// Obfs: MGHFKOEEGKD +// CmdId: 21323 +// Version: 4.7.0 +// Obfs: GJPKFIHDNNF message BatchBuyGoodsReq { - uint32 shop_type = 10; - repeated BuyGoodsParam buy_goods_list = 11; + uint32 shop_type = 2; + repeated BuyGoodsParam buy_goods_list = 4; } diff --git a/proto/BatchBuyGoodsRsp.proto b/proto/BatchBuyGoodsRsp.proto index df04c9b6..a8a58a4a 100644 --- a/proto/BatchBuyGoodsRsp.proto +++ b/proto/BatchBuyGoodsRsp.proto @@ -1,16 +1,13 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - import "BuyGoodsParam.proto"; import "ShopGoods.proto"; - -// CmdId: 23001 -// Version: 4.6.0 -// Obfs: PHGJENGMPOE +// CmdId: 8097 +// Version: 4.7.0 +// Obfs: GCHGAJJHEJO message BatchBuyGoodsRsp { - repeated ShopGoods goods_list = 1; - repeated BuyGoodsParam buy_goods_list = 2; - int32 retcode = 5; + repeated ShopGoods goods_list = 15; + repeated BuyGoodsParam buy_goods_list = 14; + int32 retcode = 7; uint32 shop_type = 11; } diff --git a/proto/BuyGoodsParam.proto b/proto/BuyGoodsParam.proto index 8d04129d..a0a31138 100644 --- a/proto/BuyGoodsParam.proto +++ b/proto/BuyGoodsParam.proto @@ -1,12 +1,9 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - import "ShopGoods.proto"; - -// Version: 4.6.0 -// Obfs: KHNAGEGDMIJ +// Version: 4.7.0 +// Obfs: MACJPBNAKLI message BuyGoodsParam { - uint32 buy_count = 6; - ShopGoods goods = 10; + uint32 buy_count = 13; + ShopGoods goods = 8; } diff --git a/proto/BuyGoodsReq.proto b/proto/BuyGoodsReq.proto index 41590fed..95c95c53 100644 --- a/proto/BuyGoodsReq.proto +++ b/proto/BuyGoodsReq.proto @@ -1,14 +1,11 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - import "ShopGoods.proto"; - -// CmdId: 28819 -// Version: 4.6.0 -// Obfs: OGHIMOFAHII +// CmdId: 23649 +// Version: 4.7.0 +// Obfs: CGCCHDKDIJG message BuyGoodsReq { - uint32 buy_count = 4; - uint32 shop_type = 8; - ShopGoods goods = 15; + uint32 buy_count = 11; + uint32 shop_type = 12; + ShopGoods goods = 13; } diff --git a/proto/BuyGoodsRsp.proto b/proto/BuyGoodsRsp.proto index 66836433..c885284d 100644 --- a/proto/BuyGoodsRsp.proto +++ b/proto/BuyGoodsRsp.proto @@ -1,16 +1,13 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - import "ShopGoods.proto"; - -// CmdId: 8 -// Version: 4.6.0 -// Obfs: ALLGKCIALEP +// CmdId: 22736 +// Version: 4.7.0 +// Obfs: EEOIKFGEOCJ message BuyGoodsRsp { - repeated ShopGoods goods_list = 1; - int32 retcode = 4; - ShopGoods goods = 9; - uint32 buy_count = 12; + repeated ShopGoods goods_list = 7; + int32 retcode = 13; + ShopGoods goods = 3; + uint32 buy_count = 8; uint32 shop_type = 14; } diff --git a/proto/CanUseSkillNotify.proto b/proto/CanUseSkillNotify.proto index 24b0e806..914f6245 100644 --- a/proto/CanUseSkillNotify.proto +++ b/proto/CanUseSkillNotify.proto @@ -1,9 +1,8 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - -// Version: 4.6.0 +// Version: 4.7.0 // CmdId: 5279 +// ? message CanUseSkillNotify { - bool is_can_use_skill = 2; + bool is_can_use_skill = 13; } diff --git a/proto/ChallengeBrief.proto b/proto/ChallengeBrief.proto index ef5720b2..1791757a 100644 --- a/proto/ChallengeBrief.proto +++ b/proto/ChallengeBrief.proto @@ -1,7 +1,5 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - // 4.7.0 // IHPNNDNPAAP message ChallengeBrief { diff --git a/proto/ChallengeDataNotify.proto b/proto/ChallengeDataNotify.proto index 14736ac2..a5207df4 100644 --- a/proto/ChallengeDataNotify.proto +++ b/proto/ChallengeDataNotify.proto @@ -1,11 +1,9 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - -// 4.6.0 -// CmdId: 2570 +// 4.7.0 +// CmdId: 6967 message ChallengeDataNotify { - uint32 challenge_index = 6; - uint32 value = 7; - uint32 param_index = 8; + uint32 challenge_index = 13; + uint32 value = 1; + uint32 param_index = 10; } \ No newline at end of file diff --git a/proto/ChallengeFinishType.proto b/proto/ChallengeFinishType.proto index 66bf9ffb..30f94384 100644 --- a/proto/ChallengeFinishType.proto +++ b/proto/ChallengeFinishType.proto @@ -1,7 +1,5 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - // 4.7.0 // DILEFMOGENI enum ChallengeFinishType { diff --git a/proto/DailyDungeonEntryInfo.proto b/proto/DailyDungeonEntryInfo.proto index 177a10ed..bdc4372c 100644 --- a/proto/DailyDungeonEntryInfo.proto +++ b/proto/DailyDungeonEntryInfo.proto @@ -1,17 +1,13 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - import "DungeonEntryInfo.proto"; - -// CmdId: 7795 -// Version: 4.6.0 -// Obfs: PJIEDHIAOEH +// Version: 4.7.0 +// Obfs: ? message DailyDungeonEntryInfo { - DungeonEntryInfo recommend_dungeon_entry_info = 2; - uint32 recommend_dungeon_id = 6; + DungeonEntryInfo recommend_dungeon_entry_info = 7; + uint32 recommend_dungeon_id = 13; uint32 dungeon_entry_id = 9; - uint32 dungeon_entry_config_id = 10; - bool is_point_unlocked = 13; // FBMFIAFCPKB - bool is_quick_open = 14; // KHMADLJLNEB + uint32 dungeon_entry_config_id = 5; + bool is_point_unlocked = 14; + bool is_quick_open = 1; } \ No newline at end of file diff --git a/proto/DoGachaReq.proto b/proto/DoGachaReq.proto index d81e834b..9002ac26 100644 --- a/proto/DoGachaReq.proto +++ b/proto/DoGachaReq.proto @@ -1,8 +1,7 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - // 4.7.0 +// CmdId: 1018 message DoGachaReq { uint32 gacha_schedule_id = 4; string gacha_tag = 6; diff --git a/proto/DoGachaRsp.proto b/proto/DoGachaRsp.proto index 8c7cbcbb..b1c57d9f 100644 --- a/proto/DoGachaRsp.proto +++ b/proto/DoGachaRsp.proto @@ -1,28 +1,26 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - import "GachaItem.proto"; - // 4.7.0 +// CmdId: 27578 message DoGachaRsp { - uint32 gacha_type = 6; + uint32 gachaTimesLimit = 1; + uint32 wishMaxProgress = 2; + uint32 wishItemId = 3; repeated GachaItem gacha_item_list = 4; + uint32 tenCostItemNum = 5; + uint32 gacha_type = 6; + int32 retcode = 7; + uint32 gacha_times = 8; + uint32 newGachaRandom = 9; + uint32 tenCostItemId = 10; + uint32 costItemId = 11; + uint32 leftGachaTimes = 12; uint32 gacha_schedule_id = 13; + uint32 wishProgress = 14; + uint32 costItemNum = 15; bool is_under_general_restrict = 713; + uint32 gachaSortId = 971; uint32 daily_gacha_times = 1479; bool is_under_minors_restrict = 1626; - uint32 gacha_times = 8; - int32 retcode = 7; - uint32 tenCostItemNum = 14; - uint32 wishMaxProgress = 9; - uint32 leftGachaTimes = 11; - uint32 costItemNum = 10; - uint32 curScheduleDailyGachaTimes = 706; - uint32 wishProgress = 5; - uint32 newGachaRandom = 16; - uint32 costItemId = 12; - uint32 tenCostItemId = 3; - uint32 gachaTimesLimit = 15; - uint32 wishItemId = 1; } diff --git a/proto/DungeonPlayerDieNotify.proto b/proto/DungeonPlayerDieNotify.proto index b146641d..337c290c 100644 --- a/proto/DungeonPlayerDieNotify.proto +++ b/proto/DungeonPlayerDieNotify.proto @@ -1,34 +1,19 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "StrengthenPointData.proto"; import "PlayerDieType.proto"; -// CmdId: 28240 -// Obf: JNJBBMEHNOL +// 4.7.0 +// CmdId: 8234 +// Obf: ? message DungeonPlayerDieNotify { - uint32 revive_count = 6; - map strengthen_point_data_map = 1; - PlayerDieType die_type = 11; - uint32 wait_time = 9; - uint32 dungeon_id = 4; + uint32 revive_count = 7; // sus + map strengthen_point_data_map = 14; + PlayerDieType die_type = 9; + uint32 wait_time = 11; + uint32 dungeon_id = 8; oneof entity { - uint32 monster_id = 3; - uint32 gadget_id = 10; + uint32 monster_id = 13; + uint32 gadget_id = 1; } uint32 murderer_entity_id = 15; } diff --git a/proto/DungeonPlayerDieReq.proto b/proto/DungeonPlayerDieReq.proto index e44d3180..317a656c 100644 --- a/proto/DungeonPlayerDieReq.proto +++ b/proto/DungeonPlayerDieReq.proto @@ -1,11 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - import "PlayerDieType.proto"; - -// 4.6.0 -// CmdId: 23739 +// 4.7.0 +// CmdId: 7032 +// ? message DungeonPlayerDieReq { - uint32 dungeon_id = 3; - PlayerDieType die_type = 7; + uint32 dungeon_id = 7; + PlayerDieType die_type = 11; } \ No newline at end of file diff --git a/proto/DungeonPlayerDieRsp.proto b/proto/DungeonPlayerDieRsp.proto index 138b0acb..e37daa48 100644 --- a/proto/DungeonPlayerDieRsp.proto +++ b/proto/DungeonPlayerDieRsp.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: 29888 -// Obf: OAJOHKDAIJF +// 4.7.0 +// CmdId: 28416 ? +// Obf: GGGLNIBKMGC message DungeonPlayerDieRsp { - int32 retcode = 14; + int32 retcode = 13; } diff --git a/proto/DungeonSettleNotify.proto b/proto/DungeonSettleNotify.proto index 8344f840..ff137e0c 100644 --- a/proto/DungeonSettleNotify.proto +++ b/proto/DungeonSettleNotify.proto @@ -2,31 +2,26 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -//import "DungeonSettleExhibitionInfo.proto"; import "StrengthenPointData.proto"; import "ParamList.proto"; import "TowerLevelEndNotify.proto"; import "TrialAvatarFirstPassDungeonNotify.proto"; -//import "ChannelerSlabLoopDungeonResultInfo.proto"; -//import "EffigyChallengeDungeonResultInfo.proto"; -// Version: 4.6.0 -// CmdId: 944 +// Version: 4.7.0 +// CmdId: 3857 +// CEPEBFLLCLB message DungeonSettleNotify { - uint32 result = 1; - uint32 close_time = 3; - //repeated DungeonSettleExhibitionInfo exhibition_info_list = 5; - uint32 use_time = 6; - map strengthen_point_data_map = 8; - bool is_success = 9; - uint32 create_player_uid = 11; - map settle_show = 12; - repeated uint32 fail_cond_list = 13; - uint32 dungeon_id = 14; + uint32 result = 14; // sus + uint32 close_time = 13; // OK + uint32 use_time = 9; // OK + map strengthen_point_data_map = 1; // OK + bool is_success = 4; // OK + uint32 create_player_uid = 7; // OK + map settle_show = 10; // OK + repeated uint32 fail_cond_list = 11; // OK + uint32 dungeon_id = 6; // OK oneof detail { - TowerLevelEndNotify tower_level_end_notify = 517; - TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 1297; - //ChannelerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 803; - //EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 974; + TowerLevelEndNotify tower_level_end_notify = 1190; + TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 1546; } } \ No newline at end of file diff --git a/proto/GachaInfo.proto b/proto/GachaInfo.proto index dc1e7553..98fbfddf 100644 --- a/proto/GachaInfo.proto +++ b/proto/GachaInfo.proto @@ -1,9 +1,6 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - import "GachaUpInfo.proto"; - // 4.7.0 // PKGNKDGHLOF message GachaInfo { @@ -13,28 +10,36 @@ message GachaInfo { uint32 begin_time = 12; // OK bool is_new_wish = 778; // OK repeated GachaUpInfo gacha_up_info_list = 802; // OK - repeated uint32 displayUp4ItemList = 1046; // SUS - repeated uint32 displayUp5ItemList = 1152; // SUS + + repeated uint32 displayUp4ItemList = 1152; // OK + repeated uint32 displayUp5ItemList = 1046; // OK // string sus - string gachaPreviewPrefabPath = 1; - string titleTextmap = 3; - string gachaPrefabPath = 7; - string gachaRecordUrlOversea = 14; - string gachaRecordUrl = 784; - string gachaProbUrlOversea = 1355; - string gachaProbUrl = 1926; + string gachaPreviewPrefabPath = 7; // OK + string titleTextmap = 3; // OK? + string gachaPrefabPath = 1; // OK + + string gachaRecordUrlOversea = 1355; // LOCK + // string gachaRecordUrl = 1355; // XCN, 14x + string gachaProbUrlOversea = 784; // LOCK + // string gachaProbUrl = 1926; // XCN // int32 sus - uint32 costItemId = 2; - uint32 wishMaxProgress = 4; - uint32 curScheduleDailyGachaTimes = 6; - uint32 leftGachaTimes = 8; - uint32 tenCostItemNum = 9; - uint32 wishProgress = 13; - uint32 tenCostItemId = 15; - uint32 gachaSortId = 1106; - uint32 wishItemId = 1274; - uint32 gachaTimesLimit = 1869; - uint32 costItemNum = 1954; + uint32 tenCostItemNum = 4; // OK LOCK + uint32 tenCostItemId = 8; // OK LOCK + uint32 costItemNum = 9; // OK LOCK + uint32 costItemId = 15; // OK LOCK + + // LOCK + uint32 wishMaxProgress = 1274; // ONMDPPDFMEL T1 + uint32 wishProgress = 1954; // NJMNJNNPFPL T2 + uint32 wishItemId = 1106; // EMFBCNGMLJJ T3 + + // 1 STUFF + uint32 curScheduleDailyGachaTimes = 6; // OK + + // 2 STUFF + uint32 gachaSortId = 1869; + uint32 leftGachaTimes = 2; // LOCK + uint32 gachaTimesLimit = 13; // LOCK } \ No newline at end of file diff --git a/proto/GachaItem.proto b/proto/GachaItem.proto index 356ccdb8..8a612988 100644 --- a/proto/GachaItem.proto +++ b/proto/GachaItem.proto @@ -1,16 +1,13 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - import "ItemParam.proto"; import "GachaTransferItem.proto"; - -// Version: 4.6.0 -// Obfs: EDJOEJJIOMG +// Version: 4.7.0 +// Obfs: ? message GachaItem { - ItemParam gacha_item = 4; - repeated ItemParam token_item_list = 9; - bool is_gacha_item_new = 11; // CKAPCKPPAIG - repeated GachaTransferItem transfer_items = 12; - bool is_flash_card = 14; // AAECBIKHMFM + ItemParam gacha_item = 9; + repeated ItemParam token_item_list = 14; + bool is_gacha_item_new = 11; + repeated GachaTransferItem transfer_items = 1; + bool is_flash_card = 12; } diff --git a/proto/GachaTransferItem.proto b/proto/GachaTransferItem.proto index 4f1b419a..9d0982cc 100644 --- a/proto/GachaTransferItem.proto +++ b/proto/GachaTransferItem.proto @@ -1,12 +1,9 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - import "ItemParam.proto"; - -// Version: 4.6.0 -// Obfs: AFCOODFGGDL +// Version: 4.7.0 +// Obfs: ? message GachaTransferItem { - ItemParam item = 2; - bool is_transfer_item_new = 3; + ItemParam item = 9; + bool is_transfer_item_new = 14; } diff --git a/proto/GachaUpInfo.proto b/proto/GachaUpInfo.proto index 0f31a152..25186364 100644 --- a/proto/GachaUpInfo.proto +++ b/proto/GachaUpInfo.proto @@ -1,7 +1,5 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - // Version: 4.7.0 // Obfs: JEJNMHJKEPK message GachaUpInfo { diff --git a/proto/GachaWishReq.proto b/proto/GachaWishReq.proto index 62226819..69abe9e9 100644 --- a/proto/GachaWishReq.proto +++ b/proto/GachaWishReq.proto @@ -1,8 +1,7 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - // 4.7.0 +// CmdId: 5636 message GachaWishReq { uint32 gacha_type = 4; uint32 gacha_schedule_id = 10; diff --git a/proto/GachaWishRsp.proto b/proto/GachaWishRsp.proto index f85de02d..29360204 100644 --- a/proto/GachaWishRsp.proto +++ b/proto/GachaWishRsp.proto @@ -1,13 +1,13 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - // 4.7.0 +// CmdId: 26208 message GachaWishRsp { uint32 gacha_schedule_id = 1; uint32 gacha_type = 11; int32 retcode = 9; - uint32 wishItemId = 4; - uint32 wishMaxProgress = 5; - uint32 wishProgress = 7; + + uint32 wishItemId = 7; // T3 + uint32 wishMaxProgress = 4; // T1 + uint32 wishProgress = 5; // T2 } diff --git a/proto/GetActivityInfoReq.proto b/proto/GetActivityInfoReq.proto index b1e9ca65..d97b7ce5 100644 --- a/proto/GetActivityInfoReq.proto +++ b/proto/GetActivityInfoReq.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: 25586 -// Obf: OOBNLCBIPJK +// 4.7.0 +// CmdId: 25360 +// Obf: ? message GetActivityInfoReq { repeated uint32 activity_id_list = 9; } diff --git a/proto/GetAuthkeyReq.proto b/proto/GetAuthkeyReq.proto index 8dd6408a..5cec2dee 100644 --- a/proto/GetAuthkeyReq.proto +++ b/proto/GetAuthkeyReq.proto @@ -1,10 +1,9 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - // 4.7.0 +// CmdId: 20204 message GetAuthkeyReq { string auth_appid = 1; - uint32 authkey_ver = 6; // OEMFLAILONG - uint32 sign_type = 7; // GOABEJGJJJP + uint32 authkey_ver = 6; + uint32 sign_type = 7; } diff --git a/proto/GetAuthkeyRsp.proto b/proto/GetAuthkeyRsp.proto index 3f6e31b0..fca6ed8b 100644 --- a/proto/GetAuthkeyRsp.proto +++ b/proto/GetAuthkeyRsp.proto @@ -1,8 +1,7 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - // 4.7.0 +// CmdId: 383 message GetAuthkeyRsp { int32 retcode = 1; string auth_appid = 2; diff --git a/proto/GetDailyDungeonEntryInfoReq.proto b/proto/GetDailyDungeonEntryInfoReq.proto index 2cba8864..78949a1e 100644 --- a/proto/GetDailyDungeonEntryInfoReq.proto +++ b/proto/GetDailyDungeonEntryInfoReq.proto @@ -2,9 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 25932 -// Version: 4.6.0 -// Obfs: KOEFMCGDFGA +// CmdId: 23493 ? +// Version: 4.7.0 +// Obfs: KOOFBAPIMEJ message GetDailyDungeonEntryInfoReq { - uint32 scene_id = 7; + uint32 scene_id = 4; } \ No newline at end of file diff --git a/proto/GetDailyDungeonEntryInfoRsp.proto b/proto/GetDailyDungeonEntryInfoRsp.proto index e7d9a20f..6f913804 100644 --- a/proto/GetDailyDungeonEntryInfoRsp.proto +++ b/proto/GetDailyDungeonEntryInfoRsp.proto @@ -1,13 +1,10 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - import "DailyDungeonEntryInfo.proto"; - -// CmdId: 7795 -// Version: 4.6.0 -// Obfs: EDDHDLPMJCE +// CmdId: 6323 +// Version: 4.7.0 +// Obfs: ? message GetDailyDungeonEntryInfoRsp { - repeated DailyDungeonEntryInfo daily_dungeon_info_list = 3; - int32 retcode = 12; + repeated DailyDungeonEntryInfo daily_dungeon_info_list = 5; + int32 retcode = 2; } \ No newline at end of file diff --git a/proto/GetGachaInfoRsp.proto b/proto/GetGachaInfoRsp.proto index 7de6e611..15784335 100644 --- a/proto/GetGachaInfoRsp.proto +++ b/proto/GetGachaInfoRsp.proto @@ -1,9 +1,6 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - import "GachaInfo.proto"; - // 4.7.0 // cmdid: 26742 // AKCGBLHGPED diff --git a/proto/GetShopReq.proto b/proto/GetShopReq.proto index 1963da2c..6cd69ec7 100644 --- a/proto/GetShopReq.proto +++ b/proto/GetShopReq.proto @@ -1,7 +1,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - // 4.7.0 +// CmdId: 5877 +// ? message GetShopReq { uint32 shop_type = 14; } \ No newline at end of file diff --git a/proto/GetShopRsp.proto b/proto/GetShopRsp.proto index c2f83b79..d99ca376 100644 --- a/proto/GetShopRsp.proto +++ b/proto/GetShopRsp.proto @@ -1,8 +1,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - import "Shop.proto"; - // 4.7.0 // CmdId: 27397 message GetShopRsp { diff --git a/proto/GetShopmallDataReq.proto b/proto/GetShopmallDataReq.proto index 23a80e18..b470a038 100644 --- a/proto/GetShopmallDataReq.proto +++ b/proto/GetShopmallDataReq.proto @@ -4,6 +4,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 20724 ? // Version: 4.7.0 -// Obfs: KFGIJGBNIGG (in menu, but not work???) +// Obfs: KFGIJGBNIGG message GetShopmallDataReq { } \ No newline at end of file diff --git a/proto/GetShopmallDataRsp.proto b/proto/GetShopmallDataRsp.proto index 6f85f7a7..c0801215 100644 --- a/proto/GetShopmallDataRsp.proto +++ b/proto/GetShopmallDataRsp.proto @@ -1,11 +1,9 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - -// CmdId: 25915 ? +// CmdId: 6919(1lock),28359(2),27873(4),25495(1),24983(4),27354(1),505(1),27308(2),24348(5),1343(7),23548(1),23633(3),28511(3),29372(5),25915(1),8699(7),6693(1),3442(2),1130(3),467(3),24437(1) // Version: 4.7.0 -// Obfs: ABELEBMOGFM +// Obfs: CABMIAPOIPE message GetShopmallDataRsp { - repeated uint32 shop_type_list = 13; - int32 retcode = 11; + repeated uint32 shop_type_list = 3; + int32 retcode = 4; } \ No newline at end of file diff --git a/proto/ParamList.proto b/proto/ParamList.proto index 4b94b095..6ad7a9e4 100644 --- a/proto/ParamList.proto +++ b/proto/ParamList.proto @@ -1,8 +1,6 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - -// Version: 4.6.0 +// Version: 4.7.0 message ParamList { repeated uint32 param_list = 1; } \ No newline at end of file diff --git a/proto/SceneEntityDrownReq.proto b/proto/SceneEntityDrownReq.proto index 2b546d95..fdf5e42f 100644 --- a/proto/SceneEntityDrownReq.proto +++ b/proto/SceneEntityDrownReq.proto @@ -1,10 +1,8 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - -// CmdId: 24672 -// Version: 4.6.0 -// Obfs: LFBKNJCPKIJ +// CmdId: 23233 +// Version: 4.7.0 +// Obfs: ? message SceneEntityDrownReq { - uint32 entity_id = 13; -} \ No newline at end of file + uint32 entity_id = 2; +} diff --git a/proto/SceneEntityDrownRsp.proto b/proto/SceneEntityDrownRsp.proto index 4caf7544..68730241 100644 --- a/proto/SceneEntityDrownRsp.proto +++ b/proto/SceneEntityDrownRsp.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: 23727 -// Obf: BFJPILGBDJK +// 4.7.0 +// CmdId: 29817 +// Obf: ? message SceneEntityDrownRsp { - uint32 entity_id = 15; - int32 retcode = 6; + uint32 entity_id = 10; + int32 retcode = 12; } diff --git a/proto/SceneEntityMoveNotify.proto b/proto/SceneEntityMoveNotify.proto index 639ef3c3..570fc34b 100644 --- a/proto/SceneEntityMoveNotify.proto +++ b/proto/SceneEntityMoveNotify.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 "MotionInfo.proto"; -// CmdId: 25367 +// 4.7.0 +// CmdId: 6446 // Obf: CNFNMBHLHEK message SceneEntityMoveNotify { - MotionInfo motion_info = 7; - uint32 entity_id = 11; - uint32 reliable_seq = 10; - uint32 scene_time = 14; + MotionInfo motion_info = 3; + uint32 entity_id = 15; + uint32 reliable_seq = 12; + uint32 scene_time = 8; } diff --git a/proto/Shop.proto b/proto/Shop.proto index 992585ef..05459142 100644 --- a/proto/Shop.proto +++ b/proto/Shop.proto @@ -1,12 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - import "ShopConcertProduct.proto"; import "ShopCardProduct.proto"; import "ShopGoods.proto"; import "ShopMcoinProduct.proto"; - // 4.7.0 +// ? message Shop { repeated ShopConcertProduct concert_product_list = 2; uint32 next_refresh_time = 3; diff --git a/proto/ShopGoods.proto b/proto/ShopGoods.proto index 3a0f38e4..543aebe3 100644 --- a/proto/ShopGoods.proto +++ b/proto/ShopGoods.proto @@ -1,28 +1,34 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - import "ItemParam.proto"; - // 4.7.0 message ShopGoods { - ItemParam goods_item = 6; - uint32 end_time = 3; - uint32 begin_time = 12; - repeated ItemParam cost_item_list = 10; - uint32 goods_id = 11; - repeated uint32 pre_goods_id_list = 15; - uint32 next_refresh_time = 14; - uint32 bought_num = 2; - uint32 hcoin = 13; - uint32 buy_limit = 1; - uint32 max_level = 5; - uint32 min_level = 4; - uint32 scoin = 9; - uint32 mcoin = 144; - uint32 secondary_sheet_id = 663; - uint32 single_limit = 133; - uint32 discount_id = 150; - uint32 discount_end_time = 821; - uint32 discount_begin_time = 410; + ItemParam goods_item = 6; // OK + uint32 end_time = 3; // OK + uint32 begin_time = 12; // OK + + repeated ItemParam cost_item_list = 10; // OK + repeated uint32 pre_goods_id_list = 15; // OK + uint32 goods_id = 11; // OK + uint32 next_refresh_time = 14; // OK + + uint32 bought_num = 2; // OK (1x maybe ok too but this limit other, 7=mora) + uint32 buy_limit = 9; // ? + + uint32 max_level = 5; // OK + uint32 min_level = 4; // OK + + uint32 hcoin = 13; // LOCK + uint32 scoin = 7; // LOCK + uint32 mcoin = 8; // LOCK + + //Hcoin: Primogem + //Scoin: Mora + //Mcoin: Genesis crystal + + //uint32 secondary_sheet_id = 663; + //uint32 single_limit = 133; + //uint32 discount_id = 150; + //uint32 discount_end_time = 821; + //uint32 discount_begin_time = 410; } diff --git a/proto/StrengthenPointData.proto b/proto/StrengthenPointData.proto index 3403387c..76350052 100644 --- a/proto/StrengthenPointData.proto +++ b/proto/StrengthenPointData.proto @@ -1,7 +1,5 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - // 4.7.0 // ? message StrengthenPointData { diff --git a/proto/TowerAllDataRsp.proto b/proto/TowerAllDataRsp.proto index a3e64ec2..cbdd5e14 100644 --- a/proto/TowerAllDataRsp.proto +++ b/proto/TowerAllDataRsp.proto @@ -1,29 +1,22 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - import "TowerCurLevelRecord.proto"; import "TowerFloorRecord.proto"; import "TowerMonthlyBrief.proto"; - // 4.7.0 // CmdId: 2253 message TowerAllDataRsp { - uint32 tower_schedule_id = 3; + uint32 tower_schedule_id = 4; bool is_finished_entrance_floor = 10; - uint32 valid_floor_record_list = 4; // sus + uint32 valid_floor_record_list = 6; // 1 SUS TowerCurLevelRecord cur_level_record = 1; int32 retcode = 11; map skip_floor_granted_reward_item_map = 14; // sus bool is_first_interact = 7; - //uint32 NNIGLOKAEAI = 8; map floor_open_time_map = 15; // sus - //uint32 ANOHIMHLMID = 10; - //uint32 MICBOPDAEFN = 11; - uint32 next_schedule_change_time = 12; // sus + uint32 next_schedule_change_time = 3; // OK TowerMonthlyBrief monthly_brief = 8; repeated TowerFloorRecord tower_floor_record_list = 5; - //uint32 LKDMPGCGDCJ = 15; uint32 schedule_start_time = 1082; TowerMonthlyBrief last_schedule_monthly_brief = 1040; } \ No newline at end of file diff --git a/proto/TowerCurLevelRecord.proto b/proto/TowerCurLevelRecord.proto index a7ef0273..0b68cf52 100644 --- a/proto/TowerCurLevelRecord.proto +++ b/proto/TowerCurLevelRecord.proto @@ -1,9 +1,6 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - import "TowerTeam.proto"; - // 4.7.0 message TowerCurLevelRecord { uint32 cur_floor_id = 1; // sus diff --git a/proto/TowerCurLevelRecordChangeNotify.proto b/proto/TowerCurLevelRecordChangeNotify.proto index 8e9d380b..6597fec3 100644 --- a/proto/TowerCurLevelRecordChangeNotify.proto +++ b/proto/TowerCurLevelRecordChangeNotify.proto @@ -1,11 +1,8 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - import "TowerCurLevelRecord.proto"; - -// 4.6.0 -// CmdId: 24979 +// 4.7.0 +// CmdId: 8595 message TowerCurLevelRecordChangeNotify { - TowerCurLevelRecord cur_level_record = 9; + TowerCurLevelRecord cur_level_record = 7; } \ No newline at end of file diff --git a/proto/TowerEnterLevelReq.proto b/proto/TowerEnterLevelReq.proto index 3a70e503..39bc42b0 100644 --- a/proto/TowerEnterLevelReq.proto +++ b/proto/TowerEnterLevelReq.proto @@ -1,9 +1,7 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - -// 4.6.0 -// CmdId: 5485 +// 4.7.0 +// CmdId: 20408 message TowerEnterLevelReq { - uint32 enter_point_id = 13; + uint32 enter_point_id = 14; } \ No newline at end of file diff --git a/proto/TowerEnterLevelRsp.proto b/proto/TowerEnterLevelRsp.proto index 9a38f3c4..c0d0c21b 100644 --- a/proto/TowerEnterLevelRsp.proto +++ b/proto/TowerEnterLevelRsp.proto @@ -1,12 +1,11 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - -// 4.6.0 -// CmdId: 21658 +// 4.7.0 +// CmdId: 5746 +// ADFHGDCDAOA message TowerEnterLevelRsp { - repeated uint32 tower_buff_id_list = 7; - uint32 floor_id = 9; - uint32 level_index = 11; - int32 retcode = 15; + repeated uint32 tower_buff_id_list = 4; + uint32 floor_id = 11; + uint32 level_index = 2; + int32 retcode = 8; } \ No newline at end of file diff --git a/proto/TowerFloorRecord.proto b/proto/TowerFloorRecord.proto index 1c56939f..cb1ca622 100644 --- a/proto/TowerFloorRecord.proto +++ b/proto/TowerFloorRecord.proto @@ -1,9 +1,6 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - import "TowerLevelRecord.proto"; - // 4.7.0 message TowerFloorRecord { map passed_level_map = 2; diff --git a/proto/TowerFloorRecordChangeNotify.proto b/proto/TowerFloorRecordChangeNotify.proto index f674c912..0c455a79 100644 --- a/proto/TowerFloorRecordChangeNotify.proto +++ b/proto/TowerFloorRecordChangeNotify.proto @@ -1,9 +1,6 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - import "TowerFloorRecord.proto"; - // 4.7.0 // CmdId: 1981 // AIIOPKKFPFF diff --git a/proto/TowerLevelEndNotify.proto b/proto/TowerLevelEndNotify.proto index bc3c5399..771478a2 100644 --- a/proto/TowerLevelEndNotify.proto +++ b/proto/TowerLevelEndNotify.proto @@ -1,17 +1,15 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - import "ItemParam.proto"; - -// 4.6.0 -// CmdId: 25369 +// 4.7.0 +// CmdId: 4173 +// ? message TowerLevelEndNotify { - repeated uint32 finished_star_cond_list = 3; - repeated ItemParam reward_item_list = 7; - uint32 next_floor_id = 9; // FJLBPFJCOEB sus (9, 15) - bool is_success = 13; - uint32 continue_state = 15; // MMIKGNOABLJ sus (9, 15) + repeated uint32 finished_star_cond_list = 1; + repeated ItemParam reward_item_list = 13; + uint32 next_floor_id = 4; // sus + bool is_success = 10; + uint32 continue_state = 8; // sus enum ContinueStateType { CONTINUE_STATE_TYPE_CAN_NOT_CONTINUE = 0; diff --git a/proto/TowerLevelRecord.proto b/proto/TowerLevelRecord.proto index 0028e3d4..fae9c3b7 100644 --- a/proto/TowerLevelRecord.proto +++ b/proto/TowerLevelRecord.proto @@ -1,7 +1,5 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - // 4.7.0 message TowerLevelRecord { uint32 level_id = 13; diff --git a/proto/TowerLevelStarCondData.proto b/proto/TowerLevelStarCondData.proto index 9eb44b6d..439d53ab 100644 --- a/proto/TowerLevelStarCondData.proto +++ b/proto/TowerLevelStarCondData.proto @@ -1,11 +1,10 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - -// 4.6.0 +// 4.7.0 +// DNCIPFNDOEC message TowerLevelStarCondData { - bool is_fail = 4; // sus - uint32 cond_value = 5; // sus - bool is_pause = 9; // sus - uint32 star_cond_index = 12; // sus + bool is_fail = 6; // sus + bool is_pause = 10; // sus + uint32 cond_value = 3; // sus + uint32 star_cond_index = 14; // sus } diff --git a/proto/TowerLevelStarCondNotify.proto b/proto/TowerLevelStarCondNotify.proto index b56aed65..7032551a 100644 --- a/proto/TowerLevelStarCondNotify.proto +++ b/proto/TowerLevelStarCondNotify.proto @@ -1,13 +1,11 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - import "TowerLevelStarCondData.proto"; - -// 4.6.0 -// CmdId: 9959 +// 4.7.0 +// CmdId: 29627 +// IJCOJMJFIDB message TowerLevelStarCondNotify { - repeated TowerLevelStarCondData cond_data_list = 9; - uint32 floor_id = 10; - uint32 level_index = 13; + repeated TowerLevelStarCondData cond_data_list = 11; + uint32 floor_id = 9; + uint32 level_index = 5; } diff --git a/proto/TowerMiddleLevelChangeTeamNotify.proto b/proto/TowerMiddleLevelChangeTeamNotify.proto index ebc05e8d..7cce91ac 100644 --- a/proto/TowerMiddleLevelChangeTeamNotify.proto +++ b/proto/TowerMiddleLevelChangeTeamNotify.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"; -// CmdId: 2027 -// Obf: NMHAKMEJMMM +// 4.7.0 +// CmdId: 22701x or 379x or 24532x or 20682 +// Obf: ? message TowerMiddleLevelChangeTeamNotify { } diff --git a/proto/TowerMonthlyBrief.proto b/proto/TowerMonthlyBrief.proto index 0298fcea..1efd84a5 100644 --- a/proto/TowerMonthlyBrief.proto +++ b/proto/TowerMonthlyBrief.proto @@ -1,11 +1,11 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - -// 4.6.0 +// 4.7.0 +// ? message TowerMonthlyBrief { - uint32 tower_schedule_id = 3; - uint32 best_level_index = 11; - uint32 best_floor_index = 12; - uint32 total_star_count = 14; + uint32 tower_schedule_id = 14; // OK + // SUS + uint32 best_level_index = 2; + uint32 best_floor_index = 8; + uint32 total_star_count = 15; } \ No newline at end of file diff --git a/proto/TowerTeam.proto b/proto/TowerTeam.proto index ac9f9b70..c43f44b8 100644 --- a/proto/TowerTeam.proto +++ b/proto/TowerTeam.proto @@ -1,7 +1,5 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - // 4.7.0 message TowerTeam { uint32 tower_team_id = 5; diff --git a/proto/TowerTeamSelectReq.proto b/proto/TowerTeamSelectReq.proto index 348d65de..470b4f8a 100644 --- a/proto/TowerTeamSelectReq.proto +++ b/proto/TowerTeamSelectReq.proto @@ -1,9 +1,6 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - import "TowerTeam.proto"; - // 4.7.0 // CmdId: 28157 // OACGHLELOPK diff --git a/proto/TrialAvatarFirstPassDungeonNotify.proto b/proto/TrialAvatarFirstPassDungeonNotify.proto index 158cf428..90ae0937 100644 --- a/proto/TrialAvatarFirstPassDungeonNotify.proto +++ b/proto/TrialAvatarFirstPassDungeonNotify.proto @@ -1,8 +1,8 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - -// CmdId: 7953 +// 4.7.0 +// CmdId: 26939 +// ? message TrialAvatarFirstPassDungeonNotify { - uint32 trial_avatar_index_id = 10; + uint32 trial_avatar_index_id = 13; } \ No newline at end of file