diff --git a/proto/ActivityInfo.proto b/proto/ActivityInfo.proto index 89d10910..6f2af838 100644 --- a/proto/ActivityInfo.proto +++ b/proto/ActivityInfo.proto @@ -86,12 +86,12 @@ message ActivityInfo { uint32 activity_id = 1; repeated ActivityPushTipsData activity_push_tips_data_list = 1986; bool DCENNBKGOAH = 1227; - repeated uint32 CGFKLALMOLH = 5; + repeated uint32 meet_cond_list = 5; // CGFKLALMOLH uint32 schedule_id = 2; bool DNKBDEJAOMC = 6; bool MPCDIKMJOAC = 2041; uint32 cur_score = 882; - uint32 OIPEAKGOPDE = 11; + uint32 activity_type = 11; bool GODELKHIPDE = 3; bool DLNNGPNHBFB = 1789; uint32 first_day_start_time = 617; diff --git a/proto/AnnounceData.proto b/proto/AnnounceData.proto index 848a13de..6e7cabee 100644 --- a/proto/AnnounceData.proto +++ b/proto/AnnounceData.proto @@ -5,14 +5,14 @@ option java_package = "emu.grasscutter.net.proto"; // Name: FOGGKINBMOI message AnnounceData { - string MLDDOLJCDAM = 9; + string count_down_text = 9; // MLDDOLJCDAM bool is_center_system_last_5_every_minutes = 2; - string HEAKAFCFBHM = 10; - uint32 OMEJDCDMJKH = 12; + string center_system_text = 10; // HEAKAFCFBHM + uint32 center_system_frequency = 12; // OMEJDCDMJKH uint32 config_id = 13; - string DLKKCKHJJAC = 5; + string dungeon_confirm_text = 5; // DLKKCKHJJAC uint32 begin_time = 14; - uint32 GBNNHNDNCPP = 15; + uint32 count_down_frequency = 15; // GBNNHNDNCPP uint32 end_time = 3; } diff --git a/proto/AsterActivityDetailInfo.proto b/proto/AsterActivityDetailInfo.proto index d85ec302..5f7a1caa 100644 --- a/proto/AsterActivityDetailInfo.proto +++ b/proto/AsterActivityDetailInfo.proto @@ -16,7 +16,7 @@ message AsterActivityDetailInfo { bool is_special_reward_taken = 8; AsterLargeDetailInfo aster_large = 3; bool is_content_closed = 14; - uint32 MFJDILDLMGP = 11; - uint32 HNJDOJKGDOP = 5; + uint32 aster_token = 11; // MFJDILDLMGP + uint32 aster_credit = 5; // HNJDOJKGDOP } diff --git a/proto/AvatarTeamResonanceInfo.proto b/proto/AvatarTeamResonanceInfo.proto index 5051d18f..e607b431 100644 --- a/proto/AvatarTeamResonanceInfo.proto +++ b/proto/AvatarTeamResonanceInfo.proto @@ -5,8 +5,8 @@ option java_package = "emu.grasscutter.net.proto"; // Name: EJAIGOIJOFM message AvatarTeamResonanceInfo { - repeated uint32 CHDOILLJEEN = 7; - repeated uint32 PLLHPHJJOKM = 12; + repeated uint32 add_team_resonance_id_list = 7; + repeated uint32 del_team_resonance_id_list = 12; uint64 avatar_guid = 5; uint32 entity_id = 11; } diff --git a/proto/BattlePassMission.proto b/proto/BattlePassMission.proto index 080b0f18..c15c7d4e 100644 --- a/proto/BattlePassMission.proto +++ b/proto/BattlePassMission.proto @@ -15,9 +15,9 @@ message BattlePassMission { uint32 mission_id = 11; MissionStatus mission_status = 14; - uint32 GJNMCPGNCMA = 13; + uint32 mission_type = 13; uint32 cur_progress = 15; uint32 total_progress = 10; - uint32 OCEJMMCLNKC = 3; + uint32 reward_battle_pass_point = 3; } diff --git a/proto/BattlePassProduct.proto b/proto/BattlePassProduct.proto index d58f54d1..98aa7c5d 100644 --- a/proto/BattlePassProduct.proto +++ b/proto/BattlePassProduct.proto @@ -5,8 +5,8 @@ option java_package = "emu.grasscutter.net.proto"; // Name: ENLKHNPEPCL message BattlePassProduct { - string LCLGNDMDBPG = 13; - string DEFBKEGPICP = 10; - string GLEBBINJLCC = 7; + string normalProductId = 13; + string extraProductId = 10; + string upgradeProductId = 7; } diff --git a/proto/BattlePassSchedule.proto b/proto/BattlePassSchedule.proto index 2f082b6b..ff9bca57 100644 --- a/proto/BattlePassSchedule.proto +++ b/proto/BattlePassSchedule.proto @@ -9,16 +9,16 @@ import "BattlePassUnlockStatus.proto"; // Name: IGIIEHFMKKN message BattlePassSchedule { - bool NJCGHBKBKDO = 2; + bool isViewed = 2; uint32 level = 4; - bool LCPFDLLEDNM = 13; + bool isExtraPaidRewardTaken = 13; repeated BattlePassRewardTag reward_taken_list = 9; BattlePassProduct product_info = 10; uint32 end_time = 15; - uint32 FOENJPJJGBA = 12; + uint32 point = 12; BattlePassUnlockStatus unlock_status = 6; - uint32 PHECELJJFCK = 7; - uint32 GAMMCGFEAIH = 14; + uint32 paidPlatformFlags = 7; + uint32 curCyclePoints = 14; BattlePassCycle cur_cycle = 3; uint32 schedule_id = 8; uint32 begin_time = 5; diff --git a/proto/CardProductRewardNotify.proto b/proto/CardProductRewardNotify.proto index 92b0e75f..89da436c 100644 --- a/proto/CardProductRewardNotify.proto +++ b/proto/CardProductRewardNotify.proto @@ -6,8 +6,8 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4149 // Name: FGEMJEBIEBF message CardProductRewardNotify { - uint32 MLKHDJPCJLG = 8; - uint32 OKKCPKEGAJF = 1; + uint32 hcoin = 8; // MLKHDJPCJLG + uint32 remain_days = 1; // OKKCPKEGAJF string product_id = 12; } diff --git a/proto/CodexDataFullNotify.proto b/proto/CodexDataFullNotify.proto index 3aa56162..76e23934 100644 --- a/proto/CodexDataFullNotify.proto +++ b/proto/CodexDataFullNotify.proto @@ -7,9 +7,9 @@ import "CodexTypeData.proto"; // CmdId: 4202 // Name: DEOFNLAMNKE message CodexDataFullNotify { - uint32 IAELPGINMBN = 15; + uint32 last_read_pushtips_type_id = 15; repeated CodexTypeData type_data_list = 13; repeated uint32 recent_viewed_pushtips_list = 14; - uint32 PDEMHIKAFGI = 7; + uint32 last_read_pushtips_codex_id = 7; } diff --git a/proto/CoopChapter.proto b/proto/CoopChapter.proto index 5b841964..0f8d0b10 100644 --- a/proto/CoopChapter.proto +++ b/proto/CoopChapter.proto @@ -16,14 +16,14 @@ message CoopChapter { STATE_ACCEPT = 3; } - uint32 NDGENILJBLM = 4; + uint32 finished_end_count = 4; repeated uint32 KAKALNAGLGJ = 7; map seen_ending_map = 14; repeated CoopReward coop_reward_list = 5; repeated CoopPoint coop_point_list = 8; repeated uint32 LNOCPBNPHIE = 12; uint32 id = 1; - uint32 EHFGHJDBOLG = 6; + uint32 total_end_count = 6; State state = 2; repeated CoopCg coop_cg_list = 10; } diff --git a/proto/DailyDungeonEntryInfo.proto b/proto/DailyDungeonEntryInfo.proto index c1b08722..ba2ed642 100644 --- a/proto/DailyDungeonEntryInfo.proto +++ b/proto/DailyDungeonEntryInfo.proto @@ -8,7 +8,7 @@ import "DungeonEntryInfo.proto"; message DailyDungeonEntryInfo { uint32 recommend_dungeon_id = 11; DungeonEntryInfo recommend_dungeon_entry_info = 12; - uint32 BKPHNNDJJDM = 13; - uint32 LNDLCHHFFEA = 14; + uint32 dungeon_entry_config_id = 13; // BKPHNNDJJDM + uint32 dungeon_entry_id = 14; // LNDLCHHFFEA } diff --git a/proto/DataResVersionNotify.proto b/proto/DataResVersionNotify.proto index 9cb172cf..be35c646 100644 --- a/proto/DataResVersionNotify.proto +++ b/proto/DataResVersionNotify.proto @@ -14,12 +14,12 @@ message DataResVersionNotify { OP_TYPE_MP_RELOGIN = 2; } - string KJJAIPPKFCI = 8; + string next_res_version_config = 8; uint32 client_silence_data_version = 6; string client_silence_version_suffix = 9; ResVersionConfig res_version_config = 7; bool is_data_need_relogin = 3; - string CLDKNBOLOEN = 5; + string client_md5 = 5; DataResVersionOpType op_type = 1; uint32 client_data_version = 2; string client_version_suffix = 14; diff --git a/proto/DoGachaReq.proto b/proto/DoGachaReq.proto index 755cf024..a976d0c0 100644 --- a/proto/DoGachaReq.proto +++ b/proto/DoGachaReq.proto @@ -6,10 +6,10 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1589 // Name: PCNKFCOOMOH message DoGachaReq { - uint32 PAHELCJNHAH = 5; - uint32 AOLMBNPLFEO = 6; - string gacha_tag = 1; - uint32 KJPOJHMDBNE = 12; - uint32 EJKJHLLCHMC = 2; + uint32 gachaRandom = 5; + uint32 gachaType = 6; + string gachaTag = 1; + uint32 gachaScheduleId = 12; + uint32 gachaTimes = 2; } diff --git a/proto/DoGachaRsp.proto b/proto/DoGachaRsp.proto index d63a62b1..a6e41abc 100644 --- a/proto/DoGachaRsp.proto +++ b/proto/DoGachaRsp.proto @@ -7,24 +7,24 @@ import "GachaItem.proto"; // CmdId: 1576 // Name: BIMBGHFINGO message DoGachaRsp { - bool HFEKPDOKLDK = 823; - uint32 AOLMBNPLFEO = 7; - uint32 KDFPKENAIOJ = 5; - bool PKOIBFIOLAO = 651; - uint32 DKCIEKFPMCG = 8; + bool Unk3300_HFEKPDOKLDK = 823; + uint32 gacha_type = 7; + uint32 wishProgress = 5; + bool Unk3300_PKOIBFIOLAO = 651; + uint32 tenCostItemNum = 8; repeated GachaItem gacha_item_list = 4; int32 retcode = 10; - uint32 EJKJHLLCHMC = 9; - uint32 JICLMBKMGCG = 1; - uint32 PELOHDIKFAM = 845; - uint32 FBIDPNFLBJL = 14; - uint32 EAGFIDHCDPD = 3; - uint32 BIPHOPJBNHC = 15; - uint32 KJPOJHMDBNE = 2; - uint32 KKDFKKEMEBA = 12; - uint32 PKPENDLDPKI = 965; - uint32 FIHHLGMNIDM = 11; - uint32 OKKJEHDBIHK = 6; - uint32 FBILBJNNIKE = 13; + uint32 gacha_times = 9; + uint32 gachaTimesLimit = 1; + uint32 curScheduleDailyGachaTimes = 845; + uint32 costItemId = 14; + uint32 leftGachaTimes = 3; + uint32 tenCostItemId = 15; + uint32 gacha_schedule_id = 2; + uint32 wishItemId = 12; + uint32 newGachaRandom = 965; //PKPENDLDPKI + uint32 daily_gacha_times = 11; //FIHHLGMNIDM + uint32 costItemNum = 6; + uint32 wishMaxProgress = 13; } diff --git a/proto/DungeonSettleNotify.proto b/proto/DungeonSettleNotify.proto index bd00dc20..1d693ff2 100644 --- a/proto/DungeonSettleNotify.proto +++ b/proto/DungeonSettleNotify.proto @@ -23,7 +23,7 @@ import "WindFieldDungeonSettleInfo.proto"; // Name: ACFCCAJPEOP message DungeonSettleNotify { uint32 use_time = 5; - uint32 CHNDMCHIOON = 9; + uint32 result = 9; // CHNDMCHIOON map settle_show = 14; map strengthen_point_data_map = 8; uint32 close_time = 13; diff --git a/proto/GachaInfo.proto b/proto/GachaInfo.proto index 15ab5b0b..9813ab89 100644 --- a/proto/GachaInfo.proto +++ b/proto/GachaInfo.proto @@ -6,31 +6,32 @@ import "GachaUpInfo.proto"; // Name: INCDGNIDDAE message GachaInfo { - uint32 FBILBJNNIKE = 578; - uint32 BIPHOPJBNHC = 9; - uint32 FBIDPNFLBJL = 7; - string OMGFPIJPPGH = 3; - uint32 PELOHDIKFAM = 316; - uint32 begin_time = 1; - uint32 DINELKJLAPI = 4; - uint32 end_time = 10; - uint32 JICLMBKMGCG = 12; - string PEFGGCAMAJE = 908; - uint32 OKKJEHDBIHK = 11; - uint32 schedule_id = 13; - uint32 KKDFKKEMEBA = 2003; - string JAHGGIJLMCD = 883; - string FGLBHLDAFAM = 15; - repeated GachaUpInfo gacha_up_info_list = 771; - string LAMBGJLFDCN = 8; - string AMGOIFHFKIE = 1371; - repeated uint32 LANKFGHJJEB = 793; - bool is_new_wish = 1748; - uint32 AOLMBNPLFEO = 6; - uint32 DKCIEKFPMCG = 5; - uint32 EAGFIDHCDPD = 14; - uint32 KDFPKENAIOJ = 1986; - repeated uint32 LIBFHKDFHLG = 565; - string DACBIMFIOFO = 2; + uint32 wishMaxProgress = 578; //FBILBJNNIKE + uint32 tenCostItemId = 9; //ok + uint32 costItemId = 7; //ok + string gachaPreviewPrefabPath = 3; //ok + uint32 curScheduleDailyGachaTimes = 316; //ok + uint32 begin_time = 1; //ok + uint32 gachaSortId = 4; //ok + uint32 end_time = 10; //ok + uint32 gachaTimesLimit = 12; //ok + string titleTextmap = 908; //ok + uint32 costItemNum = 11; //ok + uint32 schedule_id = 13; //ok + uint32 wishItemId = 2003; //KKDFKKEMEBA + string gachaProbUrlOversea = 883; //ok + string gachaProbUrl = 15; //ok + repeated GachaUpInfo gacha_up_info_list = 771; //ok + string gachaRecordUrl = 8; //ok + string gachaRecordUrlOversea = 1371; //ok + repeated uint32 displayUp5ItemList = 793; //ok + bool is_new_wish = 1748; //ok + uint32 gachaType = 6; //ok + uint32 tenCostItemNum = 5; //ok + uint32 leftGachaTimes = 14; //ok + uint32 wishProgress = 1986; //ok? KDFPKENAIOJ + repeated uint32 displayUp4ItemList = 565; //ok + string gachaPrefabPath = 2; //ok } + diff --git a/proto/GachaOpenWishNotify.proto b/proto/GachaOpenWishNotify.proto index f07d690c..de4f0db5 100644 --- a/proto/GachaOpenWishNotify.proto +++ b/proto/GachaOpenWishNotify.proto @@ -6,7 +6,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1541 // Name: EHEPDPEIEHP message GachaOpenWishNotify { - uint32 KJPOJHMDBNE = 14; - uint32 AOLMBNPLFEO = 2; + uint32 gachaScheduleId = 14; + uint32 gachaType = 2; } diff --git a/proto/GachaWishReq.proto b/proto/GachaWishReq.proto index bd4ef060..4fcb1c63 100644 --- a/proto/GachaWishReq.proto +++ b/proto/GachaWishReq.proto @@ -7,7 +7,7 @@ option java_package = "emu.grasscutter.net.proto"; // Name: JEOLICDPLML message GachaWishReq { uint32 item_id = 15; - uint32 KJPOJHMDBNE = 14; - uint32 AOLMBNPLFEO = 3; + uint32 gachaScheduleId = 14; + uint32 gachaType = 3; } diff --git a/proto/GachaWishRsp.proto b/proto/GachaWishRsp.proto index 0c0d3022..a58175d9 100644 --- a/proto/GachaWishRsp.proto +++ b/proto/GachaWishRsp.proto @@ -6,11 +6,11 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1556 // Name: AEEFJKOLIKC message GachaWishRsp { - uint32 KKDFKKEMEBA = 4; - uint32 KJPOJHMDBNE = 15; - uint32 FBILBJNNIKE = 14; - uint32 KDFPKENAIOJ = 6; + uint32 wishItemId = 4; // KKDFKKEMEBA + uint32 gachaScheduleId = 15; + uint32 wishMaxProgress = 14; // FBILBJNNIKE + uint32 wishProgress = 6; // KDFPKENAIOJ int32 retcode = 1; - uint32 AOLMBNPLFEO = 5; + uint32 gachaType = 5; } diff --git a/proto/GetAllMailResultNotify.proto b/proto/GetAllMailResultNotify.proto index 59662844..43ae8b9a 100644 --- a/proto/GetAllMailResultNotify.proto +++ b/proto/GetAllMailResultNotify.proto @@ -7,10 +7,10 @@ import "MailData.proto"; // CmdId: 1499 // Name: GOLFMOPNENJ message GetAllMailResultNotify { - uint32 CDLABECFBPJ = 7; + uint32 page_index = 7; // CDLABECFBPJ repeated MailData mail_list = 5; bool is_collected = 12; - uint32 GAAHHONLFPA = 8; + uint32 total_page_count = 8; // GAAHHONLFPA int32 retcode = 2; string transaction = 10; } diff --git a/proto/GetGachaInfoRsp.proto b/proto/GetGachaInfoRsp.proto index 7d4f22cc..f47f50d1 100644 --- a/proto/GetGachaInfoRsp.proto +++ b/proto/GetGachaInfoRsp.proto @@ -9,9 +9,9 @@ import "GachaInfo.proto"; message GetGachaInfoRsp { repeated GachaInfo gacha_info_list = 9; int32 retcode = 7; - uint32 PAHELCJNHAH = 4; + uint32 gachaRandom = 4; // PAHELCJNHAH bool HFEKPDOKLDK = 15; bool PKOIBFIOLAO = 6; - uint32 PKPENDLDPKI = 2; + uint32 dailyGachaTimes = 2; // PKPENDLDPKI } diff --git a/proto/GetHomeExchangeWoodInfoRsp.proto b/proto/GetHomeExchangeWoodInfoRsp.proto index c3e58762..0ebb5ffa 100644 --- a/proto/GetHomeExchangeWoodInfoRsp.proto +++ b/proto/GetHomeExchangeWoodInfoRsp.proto @@ -8,9 +8,9 @@ option java_package = "emu.grasscutter.net.proto"; message GetHomeExchangeWoodInfoRsp { // Name: FOLINBPAHGO message HomeExchangeWoodInfo { - uint32 KLNKMDGAOJI = 14; + uint32 exchangedCount = 14; uint32 wood_id = 8; - uint32 NMOCBJLDBGH = 9; + uint32 exchangeLimit = 9; fixed32 next_refresh_time = 1; } diff --git a/proto/GetPlayerTokenReq.proto b/proto/GetPlayerTokenReq.proto index e7ca6ded..623f5096 100644 --- a/proto/GetPlayerTokenReq.proto +++ b/proto/GetPlayerTokenReq.proto @@ -7,7 +7,7 @@ option java_package = "emu.grasscutter.net.proto"; // Name: MOPMEMHOLIK message GetPlayerTokenReq { uint32 KDIHPMJOCPG = 7; - string HKNHLNJCCLP = 5; + string client_ip_str = 5; uint32 platform_type = 3; string account_token = 12; uint32 JGDGPILDCHJ = 576; @@ -23,7 +23,7 @@ message GetPlayerTokenReq { string OOABKBBNBKL = 963; uint32 key_id = 970; uint32 CIJNPHDIOND = 2; - string AAEIDEMEKFF = 9; + string country_code = 9; uint32 CJHEEAGCFJG = 10; string IDMEOEHPCGF = 11; string client_rand_key = 831; diff --git a/proto/GetPlayerTokenRsp.proto b/proto/GetPlayerTokenRsp.proto index 9279dd87..793f6a6b 100644 --- a/proto/GetPlayerTokenRsp.proto +++ b/proto/GetPlayerTokenRsp.proto @@ -10,9 +10,9 @@ message GetPlayerTokenRsp { string birthday = 1258; string msg = 11; string sign = 907; - bytes JLOPICGGPBP = 9; - uint32 CIJNPHDIOND = 12; - uint32 KDIHPMJOCPG = 834; + bytes extra_bin_data = 9; + uint32 account_type = 12; // CIJNPHDIOND + uint32 blackUidEndTime = 834; // KDIHPMJOCPG uint32 platform_type = 1; uint32 channel_id = 1156; int32 retcode = 10; @@ -20,14 +20,14 @@ message GetPlayerTokenRsp { uint32 IEPOFPNOOKD = 1572; string token = 15; uint32 key_id = 1470; - uint32 LFPHHMGKIIP = 1474; + uint32 reg_platform = 1474; // LFPHHMGKIIP string server_rand_key = 1291; bool MPKKNNFFINM = 1058; bool is_proficient_player = 14; uint32 tag = 1489; uint32 uid = 13; uint64 secret_key_seed = 5; - string AAEIDEMEKFF = 446; + string country_code = 446; StopServerInfo stop_server = 1928; bool is_guest = 2; uint32 JJNLKCNPOLA = 7; @@ -35,9 +35,9 @@ message GetPlayerTokenRsp { uint32 FGAKKMHIKHF = 6; string client_version_random_key = 238; string secret_key = 3; - bytes MFPGIGPEFBK = 8; + bytes security_cmd_buffer = 8; repeated uint32 finish_collection_id_list = 785; - string psn_id = 1146; - string HKNHLNJCCLP = 265; + string psn_id = 1146; + string client_ip_str = 265; } diff --git a/proto/GetScenePointRsp.proto b/proto/GetScenePointRsp.proto index 16883eda..3a2f615d 100644 --- a/proto/GetScenePointRsp.proto +++ b/proto/GetScenePointRsp.proto @@ -7,16 +7,16 @@ option java_package = "emu.grasscutter.net.proto"; // Name: GKBGCPGCPAE message GetScenePointRsp { uint32 scene_id = 3; - repeated uint32 JECOFNNDAJP = 9; - repeated uint32 ELNACLNNKIO = 14; - uint32 belong_uid = 4; - repeated uint32 GNNBFLNNODN = 11; - repeated uint32 OLIIBIKADBB = 2; - repeated uint32 CBNONONIPKH = 1; - repeated uint32 MLBGHEBJAOH = 7; + repeated uint32 notInteractDungeonEntryList = 9; // JECOFNNDAJP + repeated uint32 toBeExploreDungeonEntryList = 14; // ELNACLNNKIO + uint32 belong_uid = 4; + repeated uint32 hide_point_list = 11; // GNNBFLNNODN + repeated uint32 locked_point_list = 2; // OLIIBIKADBB + repeated uint32 notExploredDungeonEntryList = 1; // CBNONONIPKH + repeated uint32 unlockAreaList = 7; // MLBGHEBJAOH bool BJLCFHHIGJD = 10; - repeated uint32 BHLFAJLFEGC = 13; - repeated uint32 MNOLEGHOAOB = 8; + repeated uint32 unhide_point_list = 13; // BHLFAJLFEGC + repeated uint32 groupUnlimitPointList = 8; // MNOLEGHOAOB int32 retcode = 6; repeated uint32 unlocked_point_list = 12; } diff --git a/proto/HomeBasicInfo.proto b/proto/HomeBasicInfo.proto index ce5cb83e..bfa007e7 100644 --- a/proto/HomeBasicInfo.proto +++ b/proto/HomeBasicInfo.proto @@ -9,10 +9,10 @@ message HomeBasicInfo { HomeLimitedShopInfo limited_shop_info = 2; uint64 exp = 11; string owner_nick_name = 9; - uint32 OCBCKIIJNFD = 5; - uint32 KJEBPOOEKJG = 3; + uint32 cur_room_scene_id = 5; + uint32 home_owner_uid = 3; uint32 level = 15; bool is_in_edit_mode = 12; - uint32 DHJNNKOAPEA = 1; + uint32 cur_module_id = 1; } diff --git a/proto/HomeBlockArrangementInfo.proto b/proto/HomeBlockArrangementInfo.proto index 584510ce..a3f135d4 100644 --- a/proto/HomeBlockArrangementInfo.proto +++ b/proto/HomeBlockArrangementInfo.proto @@ -25,7 +25,7 @@ message HomeBlockArrangementInfo { repeated HomeFurnitureCustomSuiteData furniture_custom_suite_list = 12; repeated HomeNpcData deploy_npc_list = 9; uint32 block_id = 10; - repeated HomeFurnitureData NOLOJAIDCGA = 13; - repeated HomeFurnitureData CIKCBEBJEIK = 8; + repeated HomeFurnitureData persistentFurnitureList = 13; // NOLOJAIDCGA + repeated HomeFurnitureData deployFurniureList = 8; // CIKCBEBJEIK } diff --git a/proto/HomeMarkPointSceneData.proto b/proto/HomeMarkPointSceneData.proto index 3429a106..265c94d9 100644 --- a/proto/HomeMarkPointSceneData.proto +++ b/proto/HomeMarkPointSceneData.proto @@ -7,9 +7,9 @@ import "Vector.proto"; // Name: KDHIILONFMA message HomeMarkPointSceneData { - Vector PEIAJDDGMIG = 6; + Vector teapot_spirit_pos = 6; uint32 module_id = 5; - Vector IPPBNCILPHJ = 3; + Vector safe_point_pos = 3; repeated HomeMarkPointFurnitureData furniture_list = 2; uint32 scene_id = 8; } diff --git a/proto/HomeResource.proto b/proto/HomeResource.proto index 7d072804..cbc2a36b 100644 --- a/proto/HomeResource.proto +++ b/proto/HomeResource.proto @@ -6,7 +6,7 @@ option java_package = "emu.grasscutter.net.proto"; // Name: LDMGBIGBOLN message HomeResource { fixed32 next_refresh_time = 9; - uint32 GBBFEOLGIPA = 13; - uint32 ELNCBCIJMJJ = 10; + uint32 store_limit = 13; + uint32 store_value = 10; } diff --git a/proto/HomeSceneArrangementInfo.proto b/proto/HomeSceneArrangementInfo.proto index e8434370..bcdda7dd 100644 --- a/proto/HomeSceneArrangementInfo.proto +++ b/proto/HomeSceneArrangementInfo.proto @@ -13,11 +13,11 @@ message HomeSceneArrangementInfo { uint32 comfort_value = 5; repeated HomeBlockArrangementInfo block_arrangement_info_list = 15; uint32 scene_id = 9; - Vector FGMCFDMLGEB = 13; + Vector djinn_pos = 13; // FGMCFDMLGEB bool is_set_born_pos = 11; HomeFurnitureData main_house = 4; uint32 bgm_id = 6; - Vector PCIJFOPGEDO = 3; + Vector born_rot = 3; // PCIJFOPGEDO Vector born_pos = 2; repeated HomeFurnitureData NIHPFMMOMDA = 8; } diff --git a/proto/InvestigationMonster.proto b/proto/InvestigationMonster.proto index 42303fe2..78268a54 100644 --- a/proto/InvestigationMonster.proto +++ b/proto/InvestigationMonster.proto @@ -15,12 +15,12 @@ message InvestigationMonster { bool is_area_locked = 8; uint32 city_id = 5; - uint32 CBBFLPAGFOI = 10; + uint32 refresh_interval = 10; // CBBFLPAGFOI uint32 next_refresh_time = 1; WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 12; bool is_alive = 14; uint32 level = 13; - uint32 MGMCKOOBFBJ = 9; + uint32 boss_chest_num = 9; // MGMCKOOBFBJ uint32 DHMMIBILNEE = 11; Vector pos = 2; uint32 group_id = 1212; @@ -29,6 +29,6 @@ message InvestigationMonster { uint32 resin = 3; uint32 monster_id = 518; LockState lock_state = 4; - uint32 HKBNEBOAMDI = 15; + uint32 max_boss_chest_num = 15; } diff --git a/proto/McoinExchangeHcoinReq.proto b/proto/McoinExchangeHcoinReq.proto index 4df05d28..79a17bc1 100644 --- a/proto/McoinExchangeHcoinReq.proto +++ b/proto/McoinExchangeHcoinReq.proto @@ -6,7 +6,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 637 // Name: GPEJPBJAFHM message McoinExchangeHcoinReq { - uint32 PBPMGONFBPF = 12; - uint32 MLKHDJPCJLG = 13; + uint32 mcoin_cost = 12; // PBPMGONFBPF + uint32 hcoin = 13; // MLKHDJPCJLG } diff --git a/proto/McoinExchangeHcoinRsp.proto b/proto/McoinExchangeHcoinRsp.proto index 942a32cb..4cc99cad 100644 --- a/proto/McoinExchangeHcoinRsp.proto +++ b/proto/McoinExchangeHcoinRsp.proto @@ -7,7 +7,7 @@ option java_package = "emu.grasscutter.net.proto"; // Name: JMPCEHHBLGI message McoinExchangeHcoinRsp { int32 retcode = 1; - uint32 MLKHDJPCJLG = 11; - uint32 PBPMGONFBPF = 3; + uint32 hcoin = 11; // MLKHDJPCJLG + uint32 mcoin_cost = 3; // PBPMGONFBPF } diff --git a/proto/ParentQuest.proto b/proto/ParentQuest.proto index a70d0ee0..79b8ece9 100644 --- a/proto/ParentQuest.proto +++ b/proto/ParentQuest.proto @@ -15,8 +15,8 @@ message ParentQuest { ParentQuestRandomInfo random_info = 14; map time_var_map = 5; repeated InferencePageInfo inference_page_list = 13; - uint32 PGAAFEALHLK = 9; - uint32 NJNBCLGFCIN = 12; + uint32 quest_var_seq = 9; + uint32 parent_quest_state = 12; repeated int32 quest_var = 8; bool is_finished = 11; uint32 parent_quest_id = 7; diff --git a/proto/PersonalLineAllDataRsp.proto b/proto/PersonalLineAllDataRsp.proto index dff032d2..b68295b1 100644 --- a/proto/PersonalLineAllDataRsp.proto +++ b/proto/PersonalLineAllDataRsp.proto @@ -9,8 +9,8 @@ import "LockedPersonallineData.proto"; message PersonalLineAllDataRsp { uint32 legendary_key_count = 14; uint32 cur_finished_daily_task_count = 6; - repeated uint32 OIJBKBOLJIL = 3; - repeated uint32 DIHALBEEOPO = 10; + repeated uint32 can_be_unlocked_personal_line_list = 3; // OIJBKBOLJIL + repeated uint32 ongoing_personal_line_list = 10; // DIHALBEEOPO int32 retcode = 2; repeated LockedPersonallineData locked_personal_line_list = 1; } diff --git a/proto/PlayerCookReq.proto b/proto/PlayerCookReq.proto index e9933381..84097ca8 100644 --- a/proto/PlayerCookReq.proto +++ b/proto/PlayerCookReq.proto @@ -6,9 +6,9 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 150 // Name: IMAKIKFJHOM message PlayerCookReq { - uint32 AIBLNBAFJOL = 13; + uint32 qte_quality = 13; // AIBLNBAFJOL uint32 assist_avatar = 1; - uint32 EHPKNEPMOAO = 6; + uint32 cook_count = 6; // EHPKNEPMOAO uint32 recipe_id = 7; } diff --git a/proto/PlayerCookRsp.proto b/proto/PlayerCookRsp.proto index e33128a4..7f6042f5 100644 --- a/proto/PlayerCookRsp.proto +++ b/proto/PlayerCookRsp.proto @@ -8,9 +8,9 @@ import "ItemParam.proto"; // CmdId: 148 // Name: GJBLIANJAOC message PlayerCookRsp { - uint32 AIBLNBAFJOL = 2; + uint32 qte_quality = 2; // AIBLNBAFJOL int32 retcode = 12; - uint32 EHPKNEPMOAO = 14; + uint32 cook_count = 14; // EHPKNEPMOAO repeated ItemParam item_list = 8; repeated ItemParam extral_item_list = 15; CookRecipeData recipe_data = 9; diff --git a/proto/PlayerEyePointStateNotify.proto b/proto/PlayerEyePointStateNotify.proto index 1c296c84..2250fc78 100644 --- a/proto/PlayerEyePointStateNotify.proto +++ b/proto/PlayerEyePointStateNotify.proto @@ -9,14 +9,14 @@ import "Vector.proto"; // CmdId: 3222 // Name: CDIJDIKAMLC message PlayerEyePointStateNotify { - bool EBMNNMLGDFM = 13; - uint32 BMCPCINJEAI = 5; - uint32 JEJEJCACLMD = 1; - uint32 DAJKMINBALI = 14; + bool EBMNNMLGDFM = 13; // EBMNNMLGDFM + uint32 region_config_id = 5; // BMCPCINJEAI + uint32 region_group_id = 1; // JEJEJCACLMD + uint32 region_shape = 14; // DAJKMINBALI Vector eye_point_pos = 7; - bool EMOONDLNHJK = 6; + bool EMOONDLNHJK = 6; // EMOONDLNHJK int32 fix_lod_level = 9; - uint32 KLHMJNPKGJP = 4; + uint32 region_entity_id = 4; // KLHMJNPKGJP oneof region_size { float sphere_radius = 1292; Vector cubic_size = 362; diff --git a/proto/PlayerHomeCompInfo.proto b/proto/PlayerHomeCompInfo.proto index 5afb4771..e2b8d720 100644 --- a/proto/PlayerHomeCompInfo.proto +++ b/proto/PlayerHomeCompInfo.proto @@ -7,8 +7,8 @@ import "FriendEnterHomeOption.proto"; // Name: MBGAMHAPMHK message PlayerHomeCompInfo { repeated uint32 seen_module_id_list = 4; - repeated uint32 BPAOEFJJFPI = 5; - repeated uint32 CKMGNKPLJPI = 2; + repeated uint32 unlocked_module_id_list = 5; + repeated uint32 levelup_reward_got_level_list = 2; FriendEnterHomeOption friend_enter_home_option = 11; } diff --git a/proto/PlayerLoginReq.proto b/proto/PlayerLoginReq.proto index 4f138e97..fc529f69 100644 --- a/proto/PlayerLoginReq.proto +++ b/proto/PlayerLoginReq.proto @@ -20,35 +20,35 @@ message PlayerLoginReq { uint32 language_type = 7; uint32 CJHEEAGCFJG = 2015; uint32 FGAKKMHIKHF = 829; - string FIALIJNFLDH = 2; + string system_version = 2; string DOAPGNNFLBJ = 1352; string account_uid = 4; uint32 target_uid = 14; - string KCODJEPOJPE = 254; - string AAEIDEMEKFF = 936; + string security_library_md5 = 254; + string country_code = 936; uint32 FIDMBJJPBEH = 832; - string ADMEMLCIHBA = 1953; - string PKCPAMFKKPC = 11; + string checksum = 1953; + string device_info = 11; bytes JLOPICGGPBP = 978; - string IOBMOHHHGNB = 823; + string checksum_client_version = 823; uint32 ECJMGOCEABB = 1650; - string ENNPHCJEFFC = 3; + string client_version = 3; // ENNPHCJEFFC bruh finally got it right string psn_id = 1125; bool is_editor = 10; - bytes JDKDCMJLHHM = 922; + bytes environment_error_code = 922; string platform = 1; uint32 channel_id = 913; bool is_transfer = 1382; - string PAGIGLAOJIC = 1519; - string GEKKFJHGJFB = 9; + string client_verison_hash = 1519; + string device_name = 9; uint32 FMOKLFNAOOK = 1173; uint32 tag = 1897; uint32 CIJNPHDIOND = 5; uint32 client_data_version = 1098; string DABNCDNACJK = 587; - string EMACJCPNKAB = 13; + string device_uuid = 13; uint32 platform_type = 15; - bytes GHKJJPJKKBI = 1959; + bytes security_cmd_reply = 1959; uint32 LFPHHMGKIIP = 1187; string birthday = 1256; } diff --git a/proto/PlayerLoginRsp.proto b/proto/PlayerLoginRsp.proto index c91721d5..59556003 100644 --- a/proto/PlayerLoginRsp.proto +++ b/proto/PlayerLoginRsp.proto @@ -11,13 +11,13 @@ import "ShortAbilityHashPair.proto"; // Name: DKIPBAAHKJM message PlayerLoginRsp { int32 ability_hash_code = 4; - bytes LBMEAGDOILF = 858; - string AAEIDEMEKFF = 286; + bytes sc_info = 858; + string country_code = 286; // AAEIDEMEKFF repeated ShortAbilityHashPair short_ability_hash_map = 401; string client_version_suffix = 309; - string CLDKNBOLOEN = 1149; + string clientSilenceMd5 = 1149; bool is_data_need_relogin = 1063; - bool HKINPODGHHH = 2; + bool is_use_ability_hash = 2; // HKINPODGHHH ResVersionConfig res_version_config = 1241; bool HKHOCPFCPAM = 242; uint32 DCFPMMCBEAD = 6; @@ -29,15 +29,15 @@ message PlayerLoginRsp { string client_silence_version_suffix = 889; ResVersionConfig next_res_version_config = 670; bool FCJHOMPHEON = 741; - string EHDGCMPILDC = 1152; + string register_cps = 1152; int32 retcode = 5; string game_biz = 3; bool BMLPDBNDAIJ = 15; - bool FLEDDLEFFLK = 1257; + bool is_sc_open = 1257; // FLEDDLEFFLK uint64 login_rand = 1; string birthday = 1129; bool is_audit = 461; - string KJJAIPPKFCI = 625; + string clientMd5 = 625; bool BJLCFHHIGJD = 8; uint32 client_silence_data_version = 9; uint32 FMOKLFNAOOK = 892; diff --git a/proto/ProudSkillExtraLevelNotify.proto b/proto/ProudSkillExtraLevelNotify.proto index e6f7f4ab..11cf37c6 100644 --- a/proto/ProudSkillExtraLevelNotify.proto +++ b/proto/ProudSkillExtraLevelNotify.proto @@ -7,8 +7,8 @@ option java_package = "emu.grasscutter.net.proto"; // Name: FHFLCAHNFCP message ProudSkillExtraLevelNotify { uint64 avatar_guid = 15; - uint32 CBAGHCLLOCO = 10; - uint32 KPPFFPBNNAC = 3; - uint32 LDLMAGLNLEA = 4; + uint32 extra_level = 10; // CBAGHCLLOCO + uint32 talent_type = 3; // KPPFFPBNNAC + uint32 talent_index = 4; // LDLMAGLNLEA } diff --git a/proto/QueryCodexMonsterBeKilledNumRsp.proto b/proto/QueryCodexMonsterBeKilledNumRsp.proto index d0fcd8b7..ca0fd8eb 100644 --- a/proto/QueryCodexMonsterBeKilledNumRsp.proto +++ b/proto/QueryCodexMonsterBeKilledNumRsp.proto @@ -6,8 +6,8 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4208 // Name: GEEINFDPFHF message QueryCodexMonsterBeKilledNumRsp { - repeated uint32 EKCLLDCMJLB = 12; - repeated uint32 CJFGLJIGKNL = 7; + repeated uint32 be_killed_num_list = 12; // EKCLLDCMJLB + repeated uint32 be_captured_num_list = 7; // CJFGLJIGKNL int32 retcode = 4; repeated uint32 codex_id_list = 15; } diff --git a/proto/ReliquaryUpgradeRsp.proto b/proto/ReliquaryUpgradeRsp.proto index c57e8687..0d877995 100644 --- a/proto/ReliquaryUpgradeRsp.proto +++ b/proto/ReliquaryUpgradeRsp.proto @@ -6,11 +6,11 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 639 // Name: NNBKFFLOCOE message ReliquaryUpgradeRsp { - repeated uint32 FPGACFGKCCK = 11; + repeated uint32 cur_append_prop_list = 11; // FPGACFGKCCK uint64 target_reliquary_guid = 8; uint32 power_up_rate = 5; uint32 cur_level = 15; - repeated uint32 PHGKJLPHCBI = 3; + repeated uint32 old_append_prop_list = 3; // PHGKJLPHCBI uint32 old_level = 4; int32 retcode = 12; } diff --git a/proto/ResinChangeNotify.proto b/proto/ResinChangeNotify.proto index 6a1efe9e..7f67f619 100644 --- a/proto/ResinChangeNotify.proto +++ b/proto/ResinChangeNotify.proto @@ -6,8 +6,8 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 688 // Name: LFGMKMAGMCE message ResinChangeNotify { - uint32 MBEMEOGMKNM = 4; - uint32 LADLACBKFMK = 8; + uint32 next_add_timestamp = 4; + uint32 cur_buy_count = 8; uint32 cur_value = 6; } diff --git a/proto/RogueStageInfo.proto b/proto/RogueStageInfo.proto index 9b631c89..c58de81b 100644 --- a/proto/RogueStageInfo.proto +++ b/proto/RogueStageInfo.proto @@ -10,7 +10,7 @@ message RogueStageInfo { uint32 EIMBKPHMPEH = 3; uint32 IPDPBFFPPBG = 1489; uint32 NFAGHAIMDKI = 15; - bool AJFBLDPHGDD = 12; + bool isExplored = 12; uint32 NILFBNCBADF = 658; bool NHKJHKLOPDP = 14; uint32 cur_level = 10; diff --git a/proto/ScenePointUnlockNotify.proto b/proto/ScenePointUnlockNotify.proto index 37395bc1..71f86666 100644 --- a/proto/ScenePointUnlockNotify.proto +++ b/proto/ScenePointUnlockNotify.proto @@ -6,9 +6,9 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 282 // Name: HIPLJNBHKLG message ScenePointUnlockNotify { - repeated uint32 GNNBFLNNODN = 6; - repeated uint32 ELNACLNNKIO = 9; - repeated uint32 CBNONONIPKH = 2; + repeated uint32 unhide_point_list = 6; // GNNBFLNNODN + repeated uint32 locked_point_list = 9; // ELNACLNNKIO + repeated uint32 hide_point_list = 2; // CBNONONIPKH uint32 scene_id = 3; repeated uint32 point_list = 7; } diff --git a/proto/SceneTeamAvatar.proto b/proto/SceneTeamAvatar.proto index a96a0e0b..33e5d6c2 100644 --- a/proto/SceneTeamAvatar.proto +++ b/proto/SceneTeamAvatar.proto @@ -16,7 +16,7 @@ message SceneTeamAvatar { bool is_on_scene = 10; uint64 weapon_guid = 1; repeated ServerBuff server_buff_list = 7; - bool FMFEBGBJAMB = 11; + bool is_reconnect = 11; uint32 entity_id = 13; AbilitySyncStateInfo weapon_ability_info = 3; AbilityControlBlock ability_control_block = 9; diff --git a/proto/ServerCondMeetQuestListUpdateNotify.proto b/proto/ServerCondMeetQuestListUpdateNotify.proto index abae8185..116960be 100644 --- a/proto/ServerCondMeetQuestListUpdateNotify.proto +++ b/proto/ServerCondMeetQuestListUpdateNotify.proto @@ -6,7 +6,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 470 // Name: MMPFLFGLFFC message ServerCondMeetQuestListUpdateNotify { - repeated uint32 GNFJHCIHOBE = 9; - repeated uint32 EOMIKDEBBGN = 5; + repeated uint32 add_quest_id_list = 9; //GNFJHCIHOBE + repeated uint32 del_quest_id_list = 5; //EOMIKDEBBGN } diff --git a/proto/ShopGoods.proto b/proto/ShopGoods.proto index 0a0723d2..92606a71 100644 --- a/proto/ShopGoods.proto +++ b/proto/ShopGoods.proto @@ -6,25 +6,26 @@ import "ItemParam.proto"; // Name: NMLPHHIHIOK message ShopGoods { - uint32 OLFIOBININC = 1; + uint32 goodsId = 1; //ok uint32 EOMGIGFFCLI = 736; - ItemParam goods_item = 7; - uint32 IBKPPFBAOBH = 9; + ItemParam goodsItem = 7; //ok + uint32 maxLevel = 9; //ok uint32 JGCLNJKOALJ = 1201; - uint32 LAKDFDKCMKC = 11; + uint32 scoin = 11; //LAKDFDKCMKC uint32 ONDHAANEFIK = 1493; - uint32 begin_time = 14; - repeated uint32 pre_goods_id_list = 6; + uint32 beginTime = 14; //ok + repeated uint32 preGoodsIdList = 6; //ok uint32 IAKCJHEJHOG = 15; - uint32 LBPDCMBFNEC = 2; - uint32 bought_num = 3; + uint32 mcoin = 2; //ok + uint32 boughtNum = 3; //ok uint32 GNENHCFPFCP = 688; - uint32 BKONLAFGBFC = 10; - uint32 end_time = 4; - uint32 MLKHDJPCJLG = 12; - repeated ItemParam cost_item_list = 13; + uint32 buyLimit = 10; //ok? was BKONLAFGBFC + uint32 endTime = 4; //ok + uint32 hcoin = 12; //ok + repeated ItemParam costItemList = 13; //ok uint32 HLDEGIEBMBI = 617; - uint32 LDBIHGCDGNP = 8; - uint32 next_refresh_time = 5; + uint32 minLevel = 8; //ok + uint32 nextRefreshTime = 5; //ok } + diff --git a/proto/GHMNCNNHLAI.proto b/proto/SkipPlayerGameTimeReq.proto similarity index 86% rename from proto/GHMNCNNHLAI.proto rename to proto/SkipPlayerGameTimeReq.proto index c2cbcb28..d19d43a6 100644 --- a/proto/GHMNCNNHLAI.proto +++ b/proto/SkipPlayerGameTimeReq.proto @@ -5,7 +5,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 123 // Name: GHMNCNNHLAI -message GHMNCNNHLAI { +message SkipPlayerGameTimeReq { bool is_force_set = 6; uint32 game_time = 5; uint32 client_game_time = 14; diff --git a/proto/DFPBHODHPKM.proto b/proto/SkipPlayerGameTimeRsp.proto similarity index 85% rename from proto/DFPBHODHPKM.proto rename to proto/SkipPlayerGameTimeRsp.proto index 4333a004..eecc213a 100644 --- a/proto/DFPBHODHPKM.proto +++ b/proto/SkipPlayerGameTimeRsp.proto @@ -5,7 +5,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 130 // Name: DFPBHODHPKM -message DFPBHODHPKM { +message SkipPlayerGameTimeRsp { uint32 game_time = 9; uint32 client_game_time = 1; int32 retcode = 12; diff --git a/proto/TakeFurnitureMakeRsp.proto b/proto/TakeFurnitureMakeRsp.proto index c32afa05..baa0dbf3 100644 --- a/proto/TakeFurnitureMakeRsp.proto +++ b/proto/TakeFurnitureMakeRsp.proto @@ -10,8 +10,8 @@ import "ItemParam.proto"; message TakeFurnitureMakeRsp { FurnitureMakeSlot furniture_make_slot = 11; uint32 make_id = 7; - repeated ItemParam MDJJBOAANKF = 4; + repeated ItemParam OutputItemList = 4; // MDJJBOAANKF int32 retcode = 10; - repeated ItemParam BNCLNGJLJIA = 2; + repeated ItemParam BNCLNGJLJIA = 2; // BNCLNGJLJIA } diff --git a/proto/TowerAllDataRsp.proto b/proto/TowerAllDataRsp.proto index f6e23eb2..15bfff82 100644 --- a/proto/TowerAllDataRsp.proto +++ b/proto/TowerAllDataRsp.proto @@ -9,22 +9,22 @@ import "TowerMonthlyBrief.proto"; // CmdId: 2492 // Name: MPFPLNBLIKB message TowerAllDataRsp { - uint32 DPKOCIDIHEI = 10; + uint32 tower_schedule_id = 10; bool is_finished_entrance_floor = 4; - map OAFKGDGFFEO = 1; - uint32 AJKNPOGBLDG = 6; + map floor_open_time_map = 1; + uint32 AJKNPOGBLDG = 6; // not used bool is_first_interact = 11; - uint32 EDGJPPKNHJE = 5; - int32 retcode = 13; - uint32 PHCNCLHJFBM = 8; - uint32 KPJMJMPPPGK = 12; - uint32 NKMMGNAGOOA = 15; + uint32 next_schedule_change_time = 5; + int32 retcode = 13; + uint32 PHCNCLHJFBM = 8; // not used + uint32 KPJMJMPPPGK = 12; // not used + uint32 valid_tower_record_num = 15; //NKMMGNAGOOA TowerMonthlyBrief last_schedule_monthly_brief = 1890; repeated TowerFloorRecord tower_floor_record_list = 2; TowerMonthlyBrief monthly_brief = 7; - map OJGBCIONMOL = 3; - uint32 GMMJNDFMHAM = 9; - uint32 MDANKJCGMIN = 1783; + map skip_floor_granted_reward_item_map = 3; + uint32 GMMJNDFMHAM = 9; // GMMJNDFMHAM + uint32 schedule_start_time = 1783; TowerCurLevelRecord cur_level_record = 14; } diff --git a/proto/TowerBriefDataNotify.proto b/proto/TowerBriefDataNotify.proto index 3e34e50c..a6d3f7ab 100644 --- a/proto/TowerBriefDataNotify.proto +++ b/proto/TowerBriefDataNotify.proto @@ -6,12 +6,12 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2490 // Name: DOOOMKLOHOB message TowerBriefDataNotify { - uint32 MDANKJCGMIN = 4; - uint32 EBEDFHGAGEA = 14; - uint32 DPKOCIDIHEI = 1; - uint32 EDGJPPKNHJE = 8; + uint32 schedule_start_time = 4; + uint32 total_star_num = 14; + uint32 tower_schedule_id = 1; + uint32 next_schedule_change_time = 8; bool is_finished_entrance_floor = 11; - uint32 HNOACOEEGMH = 6; - uint32 IHAJGIFPGAI = 5; + uint32 last_floor_index = 6; + uint32 last_level_index = 5; } diff --git a/proto/TowerCurLevelRecord.proto b/proto/TowerCurLevelRecord.proto index d613dfeb..c8f36368 100644 --- a/proto/TowerCurLevelRecord.proto +++ b/proto/TowerCurLevelRecord.proto @@ -10,7 +10,7 @@ message TowerCurLevelRecord { repeated TowerTeam tower_team_list = 14; bool is_upper_part = 1; repeated uint32 buff_id_list = 13; - uint32 NDMAOJGHOGG = 5; - uint32 FHLJPMEJNAJ = 6; + uint32 cur_floor_id = 5; // NDMAOJGHOGG + uint32 cur_level_index = 6; // FHLJPMEJNAJ } diff --git a/proto/TowerLevelEndNotify.proto b/proto/TowerLevelEndNotify.proto index 5675214e..7b3760f8 100644 --- a/proto/TowerLevelEndNotify.proto +++ b/proto/TowerLevelEndNotify.proto @@ -7,10 +7,17 @@ import "ItemParam.proto"; // CmdId: 2481 // Name: KGDJCGBBNBK message TowerLevelEndNotify { - uint32 NFPEACBMIHL = 9; + + enum ContinueStateType { + CONTINUE_STATE_TYPE_CAN_NOT_CONTINUE = 0; + CONTINUE_STATE_TYPE_CAN_ENTER_NEXT_LEVEL = 1; + CONTINUE_STATE_TYPE_CAN_ENTER_NEXT_FLOOR = 2; + } + + uint32 next_floor_id = 9; // NFPEACBMIHL bool is_success = 11; repeated ItemParam reward_item_list = 1; - uint32 NMFAPIENEMG = 2; + uint32 continue_state = 2; // NMFAPIENEMG repeated uint32 finished_star_cond_list = 6; } diff --git a/proto/TowerLevelStarCondData.proto b/proto/TowerLevelStarCondData.proto index ef681cc8..1d7d028d 100644 --- a/proto/TowerLevelStarCondData.proto +++ b/proto/TowerLevelStarCondData.proto @@ -5,9 +5,9 @@ option java_package = "emu.grasscutter.net.proto"; // Name: GFLKMONOFNG message TowerLevelStarCondData { - uint32 KIGONGLABHC = 2; - uint32 DLEMDNGLGAP = 4; - bool FGBFALDMDAB = 3; - bool KPLBFMBGPAP = 9; + uint32 star_cond_index = 2; // KIGONGLABHC + uint32 cond_value = 4; // DLEMDNGLGAP + bool FGBFALDMDAB = 3; // FGBFALDMDAB + bool KPLBFMBGPAP = 9; // KPLBFMBGPAP } diff --git a/proto/TowerMonthlyBrief.proto b/proto/TowerMonthlyBrief.proto index 736d0932..caabaa61 100644 --- a/proto/TowerMonthlyBrief.proto +++ b/proto/TowerMonthlyBrief.proto @@ -5,9 +5,9 @@ option java_package = "emu.grasscutter.net.proto"; // Name: PFEKDHGCBPP message TowerMonthlyBrief { - uint32 DPKOCIDIHEI = 12; - uint32 PLMIFICPLGM = 2; - uint32 HNOGBBLDHMH = 9; - uint32 IJHGFNOICOH = 1; + uint32 towerScheduleId = 12; + uint32 bestLevelIndex = 2; + uint32 bestFloorIndex = 9; + uint32 totalStarCount = 1; } diff --git a/proto/TrialAvatarActivityRewardDetailInfo.proto b/proto/TrialAvatarActivityRewardDetailInfo.proto index 21db64e2..237dd1ff 100644 --- a/proto/TrialAvatarActivityRewardDetailInfo.proto +++ b/proto/TrialAvatarActivityRewardDetailInfo.proto @@ -6,8 +6,8 @@ option java_package = "emu.grasscutter.net.proto"; // Name: HKIDINMGFBN message TrialAvatarActivityRewardDetailInfo { uint32 reward_id = 8; - bool AOLLLBPODHH = 7; - bool ODMFBOGNBNK = 5; + bool received_reward = 7; // AOLLLBPODHH + bool passed_dungeon = 5; // ODMFBOGNBNK uint32 trial_avatar_index_id = 1; } diff --git a/proto/VehicleLocationInfo.proto b/proto/VehicleLocationInfo.proto index d9802214..6afb883f 100644 --- a/proto/VehicleLocationInfo.proto +++ b/proto/VehicleLocationInfo.proto @@ -12,7 +12,7 @@ message VehicleLocationInfo { Vector pos = 13; Vector rot = 14; uint32 owner_uid = 1; - float KCCDNGMKBOB = 11; - float MILGENBLEAK = 7; + float cur_hp = 11; //KCCDNGMKBOB + float max_hp = 7; //MILGENBLEAK } diff --git a/proto/WeaponAwakenRsp.proto b/proto/WeaponAwakenRsp.proto index 99e59dd7..072198d2 100644 --- a/proto/WeaponAwakenRsp.proto +++ b/proto/WeaponAwakenRsp.proto @@ -6,9 +6,9 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 670 // Name: BODKGGEKPHH message WeaponAwakenRsp { - map MCLMGECDMHI = 11; + map old_affix_level_map = 11; // MCLMGECDMHI int32 retcode = 9; - map KKDIFJGIAMN = 14; + map cur_affix_level_map = 14; // KKDIFJGIAMN uint32 target_weapon_awaken_level = 4; uint64 avatar_guid = 7; uint64 target_weapon_guid = 13; diff --git a/proto/WeaponPromoteRsp.proto b/proto/WeaponPromoteRsp.proto index 1a2d92cd..589e474e 100644 --- a/proto/WeaponPromoteRsp.proto +++ b/proto/WeaponPromoteRsp.proto @@ -7,8 +7,8 @@ option java_package = "emu.grasscutter.net.proto"; // Name: AGLHKLJCGPJ message WeaponPromoteRsp { uint64 target_weapon_guid = 4; - uint32 BDLCGNNPHLJ = 3; - uint32 AKLAKDIDLBE = 9; + uint32 old_promote_level = 3; // BDLCGNNPHLJ + uint32 cur_promote_level = 9; // AKLAKDIDLBE int32 retcode = 6; } diff --git a/proto/WidgetCoolDownNotify.proto b/proto/WidgetCoolDownNotify.proto index 4e726dff..7a32b9e1 100644 --- a/proto/WidgetCoolDownNotify.proto +++ b/proto/WidgetCoolDownNotify.proto @@ -7,7 +7,7 @@ import "WidgetCoolDownData.proto"; // CmdId: 4286 // Name: ABEOGNPCKPI message WidgetCoolDownNotify { - repeated WidgetCoolDownData PJIEGBPGGGA = 15; - repeated WidgetCoolDownData PDHMECJOMAB = 2; + repeated WidgetCoolDownData normal_cool_down_data_list = 15; // PJIEGBPGGGA + repeated WidgetCoolDownData group_cool_down_data_list = 2; // PDHMECJOMAB } diff --git a/proto/WorldOwnerDailyTaskNotify.proto b/proto/WorldOwnerDailyTaskNotify.proto index 7306033e..500d0897 100644 --- a/proto/WorldOwnerDailyTaskNotify.proto +++ b/proto/WorldOwnerDailyTaskNotify.proto @@ -7,8 +7,8 @@ import "DailyTaskInfo.proto"; // CmdId: 140 // Name: OHLMKKDBBCL message WorldOwnerDailyTaskNotify { - uint32 IPPGLLBIHHJ = 10; + uint32 finished_daily_task_num = 10; // IPPGLLBIHHJ repeated DailyTaskInfo task_list = 14; - uint32 JJHMPHKOHIC = 6; + uint32 filter_city_id = 6; // JJHMPHKOHIC }