diff --git a/op.js b/op.js index ff216658..20d6ded4 100644 --- a/op.js +++ b/op.js @@ -723,4 +723,4 @@ function scan_gc() { // cmdid_to_op(); // 4. update op // npx prettier --write PacketOpcodes.java // scan_gc(); // 5. scan gc -clean_proto_gen(); // 6. clean proto \ No newline at end of file +// clean_proto_gen(); // 6. clean proto \ No newline at end of file diff --git a/proto/AbilityMetaModifierChange.proto b/proto/AbilityMetaModifierChange.proto index a9f56551..6a2f5140 100644 --- a/proto/AbilityMetaModifierChange.proto +++ b/proto/AbilityMetaModifierChange.proto @@ -28,9 +28,9 @@ message AbilityMetaModifierChange { AbilityAttachedModifier attached_instanced_modifier = 3; bool is_attached_parent_ability = 5; repeated ModifierProperty properties = 14; - bool Unk3300_NOPKODKOHJK = 12; + bool is_mute_remote = 12; int32 modifier_local_id = 2; - bool Unk3300_PBNENPBMNCI = 8; + bool is_durability_zero = 8; AbilityString parent_ability_name = 13; uint32 server_buff_uid = 9; uint32 apply_entity_id = 7; diff --git a/proto/ActivityInfo.proto b/proto/ActivityInfo.proto index b6504130..f5177363 100644 --- a/proto/ActivityInfo.proto +++ b/proto/ActivityInfo.proto @@ -92,7 +92,7 @@ message ActivityInfo { uint32 schedule_id = 7; uint32 score_limit = 1870; bool Unk3300_ICNJJKDHPCH = 14; - repeated uint32 Unk3300_BGNIBLKCPCA = 11; + repeated uint32 meet_cond_list = 11; bool Unk3300_NEPKLLBJFKK = 1645; repeated ActivityWatcherInfo watcher_info_list = 6; repeated ActivityPushTipsData activity_push_tips_data_list = 1867; @@ -108,7 +108,7 @@ message ActivityInfo { bool Unk3300_MDBDPIBEGGH = 12; map wish_gift_num_map = 939; uint32 end_time = 10; - repeated uint32 Unk3300_HKKNIHNBHAE = 5; + repeated uint32 expire_cond_list = 5; oneof detail { SeaLampActivityDetailInfo sam_lamp_info = 2; CrucibleActivityDetailInfo crucible_info = 15; diff --git a/proto/BrickBreakerDetailInfo.proto b/proto/BrickBreakerDetailInfo.proto index 044f16fb..aed91b49 100644 --- a/proto/BrickBreakerDetailInfo.proto +++ b/proto/BrickBreakerDetailInfo.proto @@ -24,7 +24,7 @@ option java_package = "emu.grasscutter.net.proto"; message BrickBreakerDetailInfo { repeated BrickBreakerActivityStageInfo stage_info_list = 13; - repeated BrickBreakerLevelInfo Unk3300_AIEGOACOINO = 9; - repeated BrickBreakerLevelInfo Unk3300_BCHEELFPNCD = 11; + repeated BrickBreakerLevelInfo dungeon_level_info_list = 9; + repeated BrickBreakerLevelInfo world_level_info_list = 11; map skill_info_map = 1; } diff --git a/proto/CombineRsp.proto b/proto/CombineRsp.proto index 3d50ff3a..2cc59506 100644 --- a/proto/CombineRsp.proto +++ b/proto/CombineRsp.proto @@ -30,9 +30,9 @@ message CombineRsp { // ENET_IS_RELIABLE = 1; // } - repeated ItemParam Unk3300_IAMGGFHOMEC = 11; - repeated ItemParam Unk3300_BAKPEKIFJOA = 13; - repeated ItemParam Unk3300_CDAFJDFHLKI = 6; + repeated ItemParam total_return_item_list = 11; + repeated ItemParam total_extra_item_list = 13; + repeated ItemParam total_random_item_list = 6; uint64 avatar_guid = 7; uint32 combine_count = 2; uint32 combine_id = 10; diff --git a/proto/GetAuthkeyReq.proto b/proto/GetAuthkeyReq.proto index 77a10d05..9e48e371 100644 --- a/proto/GetAuthkeyReq.proto +++ b/proto/GetAuthkeyReq.proto @@ -29,7 +29,7 @@ message GetAuthkeyReq { // IS_ALLOW_CLIENT = 1; // } - uint32 Unk3300_FGBHHPOKCJH = 6; + uint32 sign_type = 6; string auth_appid = 13; - uint32 Unk3300_DODLFCNOAMB = 15; + uint32 authkey_ver = 15; } diff --git a/proto/GetAuthkeyRsp.proto b/proto/GetAuthkeyRsp.proto index adb2c60b..678d8139 100644 --- a/proto/GetAuthkeyRsp.proto +++ b/proto/GetAuthkeyRsp.proto @@ -30,8 +30,8 @@ message GetAuthkeyRsp { int32 retcode = 8; string authkey = 6; - uint32 Unk3300_DODLFCNOAMB = 13; - uint32 Unk3300_FGBHHPOKCJH = 3; + uint32 authkey_ver = 13; + uint32 sign_type = 3; string auth_appid = 7; string game_biz = 1; } diff --git a/proto/GetPlayerTokenReq.proto b/proto/GetPlayerTokenReq.proto index b605249f..dd0c44b8 100644 --- a/proto/GetPlayerTokenReq.proto +++ b/proto/GetPlayerTokenReq.proto @@ -30,7 +30,7 @@ message GetPlayerTokenReq { // } uint32 uid = 10; - uint32 Unk3300_DILMOPPLPEM = 1735; + uint32 cloud_client_ip = 1735; uint32 platform_type = 2; bool is_guest = 14; string online_id = 12; diff --git a/proto/GetPlayerTokenRsp.proto b/proto/GetPlayerTokenRsp.proto index 2248045b..3e7ccb94 100644 --- a/proto/GetPlayerTokenRsp.proto +++ b/proto/GetPlayerTokenRsp.proto @@ -31,7 +31,7 @@ message GetPlayerTokenRsp { // } bytes security_cmd_buffer = 6; - uint32 Unk3300_PIPLDEAPMMN = 7; + uint32 gm_uid = 7; bool is_guest = 11; bool Unk3300_AJBBIPFMBEL = 126; uint32 key_id = 134; @@ -43,7 +43,7 @@ message GetPlayerTokenRsp { uint64 secret_key_seed = 3; string token = 13; string server_rand_key = 1188; - uint32 Unk3300_DILMOPPLPEM = 1670; + uint32 cloud_client_ip = 1670; string birthday = 1847; uint32 tag = 1099; string client_ip_str = 1382; @@ -55,7 +55,7 @@ message GetPlayerTokenRsp { uint32 platform_type = 10; uint32 reg_platform = 646; StopServerInfo stop_server = 1897; - uint32 Unk3300_FHPCJMIILPA = 12; + uint32 black_uid_end_time = 12; bool Unk3300_CFBHAHOHDKC = 746; string account_uid = 1; repeated uint32 finish_collection_id_list = 1766; diff --git a/proto/HideAndSeekActivityDetailInfo.proto b/proto/HideAndSeekActivityDetailInfo.proto index 8cf95301..1ece3b84 100644 --- a/proto/HideAndSeekActivityDetailInfo.proto +++ b/proto/HideAndSeekActivityDetailInfo.proto @@ -22,9 +22,9 @@ import "HideAndSeekMapInfo.proto"; option java_package = "emu.grasscutter.net.proto"; message HideAndSeekActivityDetailInfo { - repeated uint32 Unk3300_JBKIAGNADEN = 6; + repeated uint32 chosen_hunter_skill_list = 6; repeated HideAndSeekMapInfo open_map_info_list = 13; - repeated uint32 Unk3300_FPCDPLNJKKN = 2; - repeated uint32 Unk3300_CMLGPPDANNN = 15; - repeated uint32 Unk3300_HHJPAALNMNK = 4; + repeated uint32 chosen_hider_skill_list = 2; + repeated uint32 chosen_map_list = 15; + repeated uint32 unlock_map_list = 4; } diff --git a/proto/PlayerLoginReq.proto b/proto/PlayerLoginReq.proto index 5a6bd6c3..612ebd1b 100644 --- a/proto/PlayerLoginReq.proto +++ b/proto/PlayerLoginReq.proto @@ -58,7 +58,7 @@ message PlayerLoginReq { uint32 Unk3300_OOBHAIIIPHH = 85; uint32 Unk3300_NDLANBEIGEG = 1320; string country_code = 104; - uint32 Unk3300_PIPLDEAPMMN = 1790; + uint32 gm_uid = 1790; TrackingIOInfo tracking_io_info = 1713; bool is_transfer = 624; string security_library_version = 828; diff --git a/proto/ProudSkillExtraLevelNotify.proto b/proto/ProudSkillExtraLevelNotify.proto index 2e4408b5..c7cd57d7 100644 --- a/proto/ProudSkillExtraLevelNotify.proto +++ b/proto/ProudSkillExtraLevelNotify.proto @@ -29,7 +29,7 @@ message ProudSkillExtraLevelNotify { // } uint64 avatar_guid = 13; - uint32 Unk3300_ODIOPLHJHAE = 4; - uint32 Unk3300_LKNFMODMEIA = 8; - uint32 Unk3300_IPDBADAAHBA = 2; + uint32 extra_level = 4; + uint32 talent_type = 8; + uint32 talent_index = 2; } diff --git a/proto/SeaLampActivityDetailInfo.proto b/proto/SeaLampActivityDetailInfo.proto index e9661740..8eba1087 100644 --- a/proto/SeaLampActivityDetailInfo.proto +++ b/proto/SeaLampActivityDetailInfo.proto @@ -22,9 +22,9 @@ option java_package = "emu.grasscutter.net.proto"; message SeaLampActivityDetailInfo { repeated uint32 Unk3300_ODBFFAIIPMB = 2; uint32 days = 6; - uint32 Unk3300_DGMGNJLHFMB = 8; + uint32 factor = 8; uint32 progress = 5; repeated uint32 Unk3300_FGHDJJCLNFN = 14; - uint32 Unk3300_GBCCJMBPBBI = 11; + uint32 contribution = 11; uint32 phase_id = 3; } diff --git a/proto/ShopGoods.proto b/proto/ShopGoods.proto index 2dd22ad6..b044bd4c 100644 --- a/proto/ShopGoods.proto +++ b/proto/ShopGoods.proto @@ -22,7 +22,7 @@ import "ItemParam.proto"; option java_package = "emu.grasscutter.net.proto"; message ShopGoods { - uint32 Unk3300_PBMKNPCNBCK = 1003; + uint32 secondary_sheet_id = 1003; ItemParam goods_item = 15; repeated ItemParam cost_item_list = 7; uint32 bought_num = 14;