From bf356562149159c9547692a1173e9bb010175f5c Mon Sep 17 00:00:00 2001 From: Akbar Yahya Date: Sat, 15 Apr 2023 23:14:00 +0800 Subject: [PATCH] sync hiro part-1 --- proto/DataResVersionNotify.proto | 27 ++++++++++++++++ proto/DoGachaReq.proto | 10 +++--- proto/DoGachaRsp.proto | 42 ++++++++++++------------- proto/GachaInfo.proto | 54 ++++++++++++++++---------------- proto/GachaOpenWishNotify.proto | 12 +++++++ proto/GachaWishReq.proto | 4 +-- proto/GachaWishRsp.proto | 12 +++---- proto/GetPlayerTokenReq.proto | 4 +-- proto/GetPlayerTokenRsp.proto | 22 ++++++------- proto/PlayerLoginRsp.proto | 14 ++++----- 10 files changed, 120 insertions(+), 81 deletions(-) create mode 100644 proto/DataResVersionNotify.proto create mode 100644 proto/GachaOpenWishNotify.proto diff --git a/proto/DataResVersionNotify.proto b/proto/DataResVersionNotify.proto new file mode 100644 index 00000000..be35c646 --- /dev/null +++ b/proto/DataResVersionNotify.proto @@ -0,0 +1,27 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "ResVersionConfig.proto"; + +// CmdId: 118 +// Name: AKGLNBEFBAE +message DataResVersionNotify { + // Name: NIAIEPJFONE + enum DataResVersionOpType { + OP_TYPE_NONE = 0; + OP_TYPE_RELOGIN = 1; + OP_TYPE_MP_RELOGIN = 2; + } + + 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 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 4d2169b9..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 gachaType = 5; // PAHELCJNHAH - uint32 gachaRandom = 6; // AOLMBNPLFEO - string gacha_tag = 1; - uint32 gachaScheduleId = 12; // KJPOJHMDBNE - uint32 gachaTimes = 2; // EJKJHLLCHMC + 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 88207556..ce89d8f4 100644 --- a/proto/DoGachaRsp.proto +++ b/proto/DoGachaRsp.proto @@ -4,27 +4,27 @@ option java_package = "emu.grasscutter.net.proto"; import "GachaItem.proto"; -// Name: LEFDKOLFJKL (3.5, help) -// CmdId: 1564 +// CmdId: 1576 +// Name: BIMBGHFINGO message DoGachaRsp { - uint32 tenCostItemId = 4; // DNGKJJJHNEN - uint32 dailyGachaTimes = 1898; //OPHLINLNOEA - uint32 gachaTimes = 13; // HKJAAPBGNEI - uint32 gachaScheduleId = 2; //NMKGGDOKHLF - bool HNAFDALMKFN = 312; - uint32 costItemId = 1; // BCKMNIBIPHO - uint32 wishMaxProgress = 11; // KJHBJPGBOFP - uint32 gachaType = 9; //DGIFMDIADJF - uint32 tenCostItemNum = 15; //LMLCPMOOKKA - repeated GachaItem gacha_item_list = 10; - uint32 wishProgress = 7; //LJJKNKCHHFM - uint32 newGachaRandom = 5; //EAMKGBGKNMO - uint32 wishItemId = 12; //AINLBCOKANA - uint32 curScheduleDailyGachaTimes = 1918; //NOKMFFEIDNH - int32 retcode = 14; - uint32 leftGachaTimes = 3; //MGFKNHHNMAE - bool HCCENOGKOOG = 1938; - uint32 costItemNum = 6; //GNIDAANOBDP - uint32 gachaTimesLimit = 8; //FLDFHFNHNFC + bool HFEKPDOKLDK = 823; // HFEKPDOKLDK + uint32 gachaType = 7; + uint32 dailyGachaTimes = 5; // KDFPKENAIOJ + bool PKOIBFIOLAO = 651; // PKOIBFIOLAO + uint32 newGachaRandom = 8; // DKCIEKFPMCG + repeated GachaItem gacha_item_list = 4; + int32 retcode = 10; + uint32 gachaTimes = 9; + uint32 costItemId = 1; // JICLMBKMGCG + uint32 wishMaxProgress = 845; // PELOHDIKFAM + uint32 tenCostItemId = 14; // FBIDPNFLBJL + uint32 tenCostItemNum = 3; // EAGFIDHCDPD + uint32 wishProgress = 15; // BIPHOPJBNHC + uint32 gachaScheduleId = 2; + uint32 wishItemId = 12; // KKDFKKEMEBA + uint32 curScheduleDailyGachaTimes = 965; // PKPENDLDPKI + uint32 leftGachaTimes = 11; // FIHHLGMNIDM + uint32 costItemNum = 6; // OKKJEHDBIHK + uint32 gachaTimesLimit = 13; // FBILBJNNIKE } diff --git a/proto/GachaInfo.proto b/proto/GachaInfo.proto index b15c38ca..8c8c8fdc 100644 --- a/proto/GachaInfo.proto +++ b/proto/GachaInfo.proto @@ -4,33 +4,33 @@ option java_package = "emu.grasscutter.net.proto"; import "GachaUpInfo.proto"; -// Name: LIBILADMDKG (3.5, help) +// Name: INCDGNIDDAE message GachaInfo { - bool is_new_wish = 1693; - uint32 gachaTimesLimit = 4; // FLDFHFNHNFC - repeated GachaUpInfo gacha_up_info_list = 1953; - uint32 wishMaxProgress = 911; // KJHBJPGBOFP - uint32 leftGachaTimes = 10; // MGFKNHHNMAE - string gachaProbUrl = 8; // ABKGLLAGAIN - uint32 gachaType = 15; // DGIFMDIADJF - string gachaPrefabPath = 5; // JENKDDLIKBK - uint32 gachaSortId = 11; // MJPPIKFJBBF - uint32 curScheduleDailyGachaTimes = 1245; // NOKMFFEIDNH - uint32 costItemNum = 7; // GNIDAANOBDP - repeated uint32 displayUp5ItemList = 1564; // GLGFIGNCBPL - string gachaProbUrlOversea = 1128; // NBGBMJJAICB - string gachaPreviewPrefabPath = 12; // LCHOOLMEHIN - uint32 schedule_id = 2; - string gachaRecordUrl = 1; // CINCAKDODOD - uint32 end_time = 3; - repeated uint32 displayUp4ItemList = 446; // IIGOCJAHJDO - uint32 wishItemId = 9; // AINLBCOKANA - uint32 tenCostItemId = 1298; // DNGKJJJHNEN - string titleTextmap = 67; // ANPADHPPJNE - uint32 costItemId = 14; // BCKMNIBIPHO - uint32 tenCostItemNum = 13; // LMLCPMOOKKA - uint32 begin_time = 6; - string gachaRecordUrlOversea = 1718; // FGJKAIDJJEH - uint32 wishProgress = 1755; // LJJKNKCHHFM + uint32 tenCostItemId = 578; // FBILBJNNIKE + uint32 wishMaxProgress = 9; // BIPHOPJBNHC + uint32 leftGachaTimes = 7; // FBIDPNFLBJL + string gachaProbUrl = 3; // OMGFPIJPPGH + uint32 gachaTimesLimit = 316; // PELOHDIKFAM + uint32 begin_time = 1; + uint32 gachaSortId = 4; // DINELKJLAPI + uint32 end_time = 10; + uint32 curScheduleDailyGachaTimes = 12; // JICLMBKMGCG + string gachaPrefabPath = 908; // PEFGGCAMAJE + uint32 costItemNum = 11; // OKKJEHDBIHK + uint32 schedule_id = 13; + uint32 wishItemId = 2003; // KKDFKKEMEBA + string gachaProbUrlOversea = 883; // JAHGGIJLMCD + string gachaPreviewPrefabPath = 15; // FGLBHLDAFAM + repeated GachaUpInfo gacha_up_info_list = 771; + string gachaRecordUrl = 8; // LAMBGJLFDCN + string titleTextmap = 1371; // AMGOIFHFKIE + repeated uint32 displayUp5ItemList = 793; + bool is_new_wish = 1748; + uint32 gachaType = 6; + uint32 costItemId = 5; // DKCIEKFPMCG + uint32 tenCostItemNum = 14; // EAGFIDHCDPD + uint32 wishProgress = 1986; // KDFPKENAIOJ + repeated uint32 displayUp4ItemList = 565; // LIBFHKDFHLG + string gachaRecordUrlOversea = 2; } diff --git a/proto/GachaOpenWishNotify.proto b/proto/GachaOpenWishNotify.proto new file mode 100644 index 00000000..de4f0db5 --- /dev/null +++ b/proto/GachaOpenWishNotify.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +// CmdId: 1541 +// Name: EHEPDPEIEHP +message GachaOpenWishNotify { + uint32 gachaScheduleId = 14; + uint32 gachaType = 2; +} + diff --git a/proto/GachaWishReq.proto b/proto/GachaWishReq.proto index 8f4c7dfe..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 gachaScheduleId = 14; // KJPOJHMDBNE - uint32 gachaType = 3; // AOLMBNPLFEO + uint32 gachaScheduleId = 14; + uint32 gachaType = 3; } diff --git a/proto/GachaWishRsp.proto b/proto/GachaWishRsp.proto index 1c6e28ab..a58175d9 100644 --- a/proto/GachaWishRsp.proto +++ b/proto/GachaWishRsp.proto @@ -4,13 +4,13 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1556 -// Name: AEEFJKOLIKC (3.5, help) +// Name: AEEFJKOLIKC message GachaWishRsp { - uint32 wishMaxProgress = 4; // KKDFKKEMEBA - uint32 wishProgress = 15; // KJPOJHMDBNE - uint32 gachaType = 14; // FBILBJNNIKE - uint32 gachaScheduleId = 6; // KDFPKENAIOJ + uint32 wishItemId = 4; // KKDFKKEMEBA + uint32 gachaScheduleId = 15; + uint32 wishMaxProgress = 14; // FBILBJNNIKE + uint32 wishProgress = 6; // KDFPKENAIOJ int32 retcode = 1; - uint32 wishItemId = 5; // AOLMBNPLFEO + uint32 gachaType = 5; } 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 5cd2a091..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 security_cmd_buffer = 9; // JLOPICGGPBP - uint32 blackUidEndTime = 12; //CIJNPHDIOND - uint32 reg_platform = 834; // KDIHPMJOCPG + 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,24 +20,24 @@ 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 cloudClientIp = 1058; // MPKKNNFFINM + bool MPKKNNFFINM = 1058; bool is_proficient_player = 14; uint32 tag = 1489; uint32 uid = 13; uint64 secret_key_seed = 5; - string country_code = 446; // AAEIDEMEKFF + string country_code = 446; StopServerInfo stop_server = 1928; bool is_guest = 2; - uint32 JJNLKCNPOLA = 7; // JJNLKCNPOLA + uint32 JJNLKCNPOLA = 7; bool EHGCBOCIJPA = 1881; - uint32 account_type = 6; // FGAKKMHIKHF + 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 client_ip_str = 265; // HKNHLNJCCLP + string psn_id = 1146; + string client_ip_str = 265; } diff --git a/proto/PlayerLoginRsp.proto b/proto/PlayerLoginRsp.proto index 2df5c580..8a3f79ff 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; + bytes sc_info = 858; string country_code = 286; // AAEIDEMEKFF repeated ShortAbilityHashPair short_ability_hash_map = 401; string client_version_suffix = 309; - string client_md5 = 1149; // CLDKNBOLOEN + string client_silence_md5 = 1149; // CLDKNBOLOEN 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,19 +29,19 @@ message PlayerLoginRsp { string client_silence_version_suffix = 889; ResVersionConfig next_res_version_config = 670; bool FCJHOMPHEON = 741; - string client_silence_md5 = 1152; // EHDGCMPILDC + string register_cps = 1152; // EHDGCMPILDC int32 retcode = 5; string game_biz = 3; - bool is_use_ability_hash = 15; // BMLPDBNDAIJ + bool BMLPDBNDAIJ = 15; bool is_sc_open = 1257; // FLEDDLEFFLK uint64 login_rand = 1; string birthday = 1129; bool is_audit = 461; - string register_cps = 625; // KJJAIPPKFCI + string client_md5 = 625; // KJJAIPPKFCI bool BJLCFHHIGJD = 8; uint32 client_silence_data_version = 9; uint32 FMOKLFNAOOK = 892; - bytes scInfo = 7; // JLDGJOPFALG + bytes JLDGJOPFALG = 7; string next_resource_url = 300; uint32 target_uid = 12; map block_info_map = 771;