diff --git a/op.js b/op.js index 20d6ded4..ff216658 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/AbilityIdentifier.proto b/proto/AbilityIdentifier.proto index 730232f1..821d9d2e 100644 --- a/proto/AbilityIdentifier.proto +++ b/proto/AbilityIdentifier.proto @@ -21,9 +21,9 @@ option java_package = "emu.grasscutter.net.proto"; message AbilityIdentifier { uint32 instanced_ability_id = 4; - uint32 Unk3300_IHCKJKLCICI = 10; + uint32 modifier_owner_id = 10; bool is_serverbuff_modifier = 14; int32 local_id = 7; - uint32 Unk3300_OOOLELPBDHJ = 1; + uint32 ability_caster_id = 1; uint32 instanced_modifier_id = 5; } diff --git a/proto/ActivityInfo.proto b/proto/ActivityInfo.proto index 4f16f74a..b6504130 100644 --- a/proto/ActivityInfo.proto +++ b/proto/ActivityInfo.proto @@ -90,7 +90,7 @@ message ActivityInfo { bool is_finished = 8; uint32 cur_score = 1268; uint32 schedule_id = 7; - uint32 Unk3300_JAEALAIOOID = 1870; + uint32 score_limit = 1870; bool Unk3300_ICNJJKDHPCH = 14; repeated uint32 Unk3300_BGNIBLKCPCA = 11; bool Unk3300_NEPKLLBJFKK = 1645; diff --git a/proto/AttackHitEffectResult.proto b/proto/AttackHitEffectResult.proto index 1ba2fd7b..c14a07bf 100644 --- a/proto/AttackHitEffectResult.proto +++ b/proto/AttackHitEffectResult.proto @@ -20,10 +20,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; message AttackHitEffectResult { - float Unk3300_DABGDGLAIKL = 13; + float air_strength = 13; float hit_halt_time_scale = 10; - float Unk3300_ECHOFBLGIIO = 9; + float hit_halt_time = 9; uint32 Unk3300_LCKECJCKKJK = 8; uint32 Unk3300_KLNGDAMMFIF = 1; - float Unk3300_MNGCOAIGGAL = 3; + float retreat_strength = 3; } diff --git a/proto/AttackResult.proto b/proto/AttackResult.proto index 5fdf9ea4..b242b1fb 100644 --- a/proto/AttackResult.proto +++ b/proto/AttackResult.proto @@ -28,29 +28,29 @@ message AttackResult { uint32 defense_id = 2; uint32 attacker_id = 1; uint32 target_type = 1870; - float Unk3300_HGJOKFPHMJJ = 803; + float endure_delta = 803; bool Unk3300_DOMAOPGPHMD = 454; uint32 element_type = 12; uint32 Unk3300_BALCPHMFIBC = 1438; float damage = 10; - uint32 Unk3300_HEIMDHBPFNF = 1115; + uint32 hashed_anim_event_id = 1115; uint32 critical_rand = 645; uint32 Unk3300_ABJJNNNKGBB = 1742; uint32 Unk3300_KPKAECBFABP = 2012; AttackHitEffectResult hit_eff_result = 8; uint32 endure_break = 14; AbilityIdentifier ability_identifier = 7; - uint32 Unk3300_IPPHJMMELIG = 3; + uint32 hit_pos_type = 3; uint32 attack_timestamp_ms = 1782; float damage_shield = 1932; - uint32 Unk3300_PIGBELICMMD = 1484; + uint32 attack_count = 1484; bool is_resist_text = 633; int32 hit_retreat_angle_compat = 5; HitCollision hit_collision = 15; bool Unk3300_MGIMJGMIPLD = 732; bool is_crit = 6; Vector resolved_dir = 11; - float Unk3300_MPKAMIMDKOE = 28; + float element_amplify_rate = 28; string anim_event_id = 4; uint32 Unk3300_GBPJCELJKJA = 1844; uint32 Unk3300_JMJHGJCAOBH = 914; diff --git a/proto/DoGachaRsp.proto b/proto/DoGachaRsp.proto index b969a46c..e263d103 100644 --- a/proto/DoGachaRsp.proto +++ b/proto/DoGachaRsp.proto @@ -35,16 +35,16 @@ message DoGachaRsp { repeated GachaItem gacha_item_list = 9; bool Unk3300_HBILIAEIHNK = 1887; uint32 gacha_type = 10; - uint32 Unk3300_OPGAHAGHEP = 6; // Unk3300_OPGAHAGHEPF - uint32 gacha_times_limit = 1; // Unk3300_NMOKGFGDFFC - uint32 wish_max_progress = 5; // Unk3300_BLLMPAJNCPI + uint32 new_gacha_random = 6; + uint32 wish_progress = 1; + uint32 wish_max_progress = 5; uint32 gacha_times = 4; - uint32 wish_item_id = 15; // Unk3300_GLPMIEMBGGL - uint32 new_gacha_random = 12; // Unk3300_KEIJFMKAKDH + uint32 gacha_times_limit = 15; + uint32 wish_item_id = 12; uint32 ten_cost_item_id = 13; uint32 cost_item_num = 8; uint32 ten_cost_item_num = 2; - uint32 wish_progress = 1550; // Unk3300_HLANONBCBLM + uint32 cur_schedule_daily_gacha_times = 1550; uint32 cost_item_id = 7; uint32 gacha_schedule_id = 14; uint32 daily_gacha_times = 467; diff --git a/proto/DungeonEntryInfo.proto b/proto/DungeonEntryInfo.proto index d6b257b2..8625b030 100644 --- a/proto/DungeonEntryInfo.proto +++ b/proto/DungeonEntryInfo.proto @@ -27,7 +27,7 @@ message DungeonEntryInfo { bool is_passed = 13; WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 6; uint32 dungeon_id = 8; - uint32 Unk3300_IDMPGPKMMEH = 5; + uint32 left_times = 5; uint32 next_refresh_time = 10; uint32 next_boss_chest_refresh_time = 3; uint32 start_time = 11; diff --git a/proto/GachaInfo.proto b/proto/GachaInfo.proto index b4e930b0..308bffd3 100644 --- a/proto/GachaInfo.proto +++ b/proto/GachaInfo.proto @@ -24,26 +24,26 @@ option java_package = "emu.grasscutter.net.proto"; message GachaInfo { uint32 left_gacha_times = 5; uint32 gacha_type = 7; - uint32 gacha_times_limit = 954; // Unk3300_NMOKGFGDFFC + uint32 wish_progress = 954; string gacha_prob_url_oversea = 1532; string gacha_record_url = 15; string gacha_prob_url = 1; uint32 begin_time = 14; uint32 schedule_id = 8; repeated uint32 display_up5_item_list = 476; - uint32 wish_item_id = 10; //weapon epitomised Unk3300_GLPMIEMBGGL + uint32 gacha_times_limit = 10; string gacha_preview_prefab_path = 4; string title_textmap = 114; - uint32 wish_progress = 245; // Unk3300_HLANONBCBLM + uint32 cur_schedule_daily_gacha_times = 245; uint32 end_time = 2; repeated uint32 display_up4_item_list = 540; uint32 ten_cost_item_num = 13; - uint32 wish_max_progress = 1275; //Unk3300_BLLMPAJNCPI + uint32 wish_max_progress = 1275; uint32 ten_cost_item_id = 9; uint32 gacha_sort_id = 6; bool is_new_wish = 967; uint32 cost_item_num = 12; - uint32 Unk3300_KEIJFMKAKDH = 1580; + uint32 wish_item_id = 1580; string gacha_record_url_oversea = 1259; repeated GachaUpInfo gacha_up_info_list = 1585; uint32 cost_item_id = 3; diff --git a/proto/GachaItem.proto b/proto/GachaItem.proto index 6197f2e4..7e6735d3 100644 --- a/proto/GachaItem.proto +++ b/proto/GachaItem.proto @@ -23,9 +23,9 @@ import "ItemParam.proto"; option java_package = "emu.grasscutter.net.proto"; message GachaItem { - bool Unk3300_BGIOJBJFMFL = 8; + bool is_flash_card = 8; repeated GachaTransferItem transfer_items = 6; - bool Unk3300_JNOOHBNJFIE = 13; + bool is_gacha_item_new = 13; ItemParam gacha_item = 5; repeated ItemParam token_item_list = 10; } diff --git a/proto/GachaWishRsp.proto b/proto/GachaWishRsp.proto index bbfa1abd..9110c6c2 100644 --- a/proto/GachaWishRsp.proto +++ b/proto/GachaWishRsp.proto @@ -28,10 +28,10 @@ message GachaWishRsp { // ENET_IS_RELIABLE = 1; // } - uint32 wish_item_id = 6; // Unk3300_NMOKGFGDFFC - uint32 wish_progress = 15; // Unk3300_KEIJFMKAKDH + uint32 wish_progress = 6; + uint32 wish_item_id = 15; uint32 gacha_schedule_id = 11; int32 retcode = 13; - uint32 wish_max_progress = 10; // Unk3300_BLLMPAJNCPI + uint32 wish_max_progress = 10; uint32 gacha_type = 8; } diff --git a/proto/HomeBlockArrangementInfo.proto b/proto/HomeBlockArrangementInfo.proto index 192af54d..7d640262 100644 --- a/proto/HomeBlockArrangementInfo.proto +++ b/proto/HomeBlockArrangementInfo.proto @@ -30,7 +30,7 @@ import "WeekendDjinnInfo.proto"; option java_package = "emu.grasscutter.net.proto"; message HomeBlockArrangementInfo { - repeated HomeFurnitureData Unk3300_GMMAIDIJOJM = 10; + repeated HomeFurnitureData deploy_furniure_list = 10; repeated HomeAnimalData deploy_animal_list = 7; repeated HomeFurnitureSuiteData furniture_suite_list = 3; repeated WeekendDjinnInfo weekend_djinn_info_list = 5; @@ -41,6 +41,6 @@ message HomeBlockArrangementInfo { repeated HomeFurnitureGroupData furniture_group_list = 8; repeated HomeBlockFieldData field_list = 13; uint32 comfort_value = 9; - repeated HomeFurnitureData Unk3300_DEIECJCAFLN = 12; + repeated HomeFurnitureData persistent_furniture_list = 12; repeated HomeFurnitureCustomSuiteData furniture_custom_suite_list = 4; } diff --git a/proto/PlayerCookReq.proto b/proto/PlayerCookReq.proto index 3cf126cd..39ca8659 100644 --- a/proto/PlayerCookReq.proto +++ b/proto/PlayerCookReq.proto @@ -30,7 +30,7 @@ message PlayerCookReq { // } uint32 recipe_id = 1; - uint32 Unk3300_NDPHNNOFEBL = 5; - uint32 Unk3300_JPICLIDLIEC = 7; + uint32 qte_quality = 5; + uint32 cook_count = 7; uint32 assist_avatar = 12; } diff --git a/proto/PlayerCookRsp.proto b/proto/PlayerCookRsp.proto index 2640c3a0..fa59d97a 100644 --- a/proto/PlayerCookRsp.proto +++ b/proto/PlayerCookRsp.proto @@ -34,7 +34,7 @@ message PlayerCookRsp { int32 retcode = 4; CookRecipeData recipe_data = 12; repeated ItemParam item_list = 5; - uint32 Unk3300_NDPHNNOFEBL = 1; + uint32 qte_quality = 1; repeated ItemParam extra_item_list = 3; - uint32 Unk3300_JPICLIDLIEC = 11; + uint32 cook_count = 11; } diff --git a/proto/ReliquaryPromoteRsp.proto b/proto/ReliquaryPromoteRsp.proto index 12b5512f..e48585e3 100644 --- a/proto/ReliquaryPromoteRsp.proto +++ b/proto/ReliquaryPromoteRsp.proto @@ -28,10 +28,10 @@ message ReliquaryPromoteRsp { // ENET_IS_RELIABLE = 1; // } - repeated uint32 Unk3300_IALPGNADFKA = 8; - uint32 Unk3300_GGFCIPAKKDP = 9; - repeated uint32 Unk3300_MGELABLMFOE = 13; + repeated uint32 old_append_prop_list = 8; + uint32 old_promote_level = 9; + repeated uint32 cur_append_prop_list = 13; int32 retcode = 10; uint64 target_reliquary_guid = 6; - uint32 Unk3300_MBEBIACJNBB = 4; + uint32 cur_promote_level = 4; } diff --git a/proto/ReliquaryUpgradeRsp.proto b/proto/ReliquaryUpgradeRsp.proto index f4323f2a..5b0b8091 100644 --- a/proto/ReliquaryUpgradeRsp.proto +++ b/proto/ReliquaryUpgradeRsp.proto @@ -28,11 +28,11 @@ message ReliquaryUpgradeRsp { // ENET_IS_RELIABLE = 1; // } - repeated uint32 Unk3300_MGELABLMFOE = 13; + repeated uint32 cur_append_prop_list = 13; int32 retcode = 11; uint64 target_reliquary_guid = 14; uint32 cur_level = 2; uint32 old_level = 6; - repeated uint32 Unk3300_IALPGNADFKA = 10; + repeated uint32 old_append_prop_list = 10; uint32 power_up_rate = 1; } diff --git a/proto/RogueStageInfo.proto b/proto/RogueStageInfo.proto index d29dd246..6639cdbf 100644 --- a/proto/RogueStageInfo.proto +++ b/proto/RogueStageInfo.proto @@ -30,7 +30,7 @@ message RogueStageInfo { bool is_taken_reward = 9; bool is_explored = 14; repeated RoguelikeRuneRecord rune_record_list = 5; - bool Unk3300_HMAELBBOFDN = 6; + bool is_in_combat = 6; uint32 coin_c_num = 3; bool is_open = 13; uint32 stage_id = 7; diff --git a/proto/ShopGoods.proto b/proto/ShopGoods.proto index 59f4bb8f..2dd22ad6 100644 --- a/proto/ShopGoods.proto +++ b/proto/ShopGoods.proto @@ -28,7 +28,7 @@ message ShopGoods { uint32 bought_num = 14; repeated uint32 pre_goods_id_list = 9; uint32 min_level = 5; - uint32 Unk3300_NMOPAGJFHOO = 11; + uint32 mcoin = 11; uint32 hcoin = 6; uint32 end_time = 3; uint32 next_refresh_time = 10; diff --git a/proto/StoreWeightLimitNotify.proto b/proto/StoreWeightLimitNotify.proto index 3d3c999d..ae902f97 100644 --- a/proto/StoreWeightLimitNotify.proto +++ b/proto/StoreWeightLimitNotify.proto @@ -31,9 +31,9 @@ message StoreWeightLimitNotify { // } uint32 reliquary_count_limit = 14; - uint32 Unk3300_NIKMCBLHFNJ = 10; - uint32 Unk3300_OONMFCGDMMF = 5; - uint32 Unk3300_JGPODDEKAPB = 1; + uint32 furniture_count_limit = 10; + uint32 material_count_limit = 5; + uint32 weapon_count_limit = 1; uint32 weight_limit = 8; StoreType store_type = 9; } diff --git a/proto/TowerAllDataRsp.proto b/proto/TowerAllDataRsp.proto index e847030a..049d9689 100644 --- a/proto/TowerAllDataRsp.proto +++ b/proto/TowerAllDataRsp.proto @@ -46,7 +46,7 @@ message TowerAllDataRsp { repeated TowerFloorRecord tower_floor_record_list = 13; TowerMonthlyBrief monthly_brief = 9; uint32 Unk3300_LEKODCFPINJ = 7; - map Unk3300_PJPEEJACFJH = 3; + map skip_floor_granted_reward_item_map = 3; bool is_finished_entrance_floor = 15; map floor_open_time_map = 14; } diff --git a/proto/TowerCurLevelRecord.proto b/proto/TowerCurLevelRecord.proto index b141de44..20460480 100644 --- a/proto/TowerCurLevelRecord.proto +++ b/proto/TowerCurLevelRecord.proto @@ -24,8 +24,8 @@ option java_package = "emu.grasscutter.net.proto"; message TowerCurLevelRecord { repeated uint32 buff_id_list = 14; bool is_upper_part = 4; - uint32 Unk3300_KPGBPDIJJJJ = 6; + uint32 cur_level_index = 6; bool is_empty = 1; repeated TowerTeam tower_team_list = 8; - uint32 Unk3300_PMHCLPFPHBJ = 9; + uint32 cur_floor_id = 9; } diff --git a/proto/TowerLevelEndNotify.proto b/proto/TowerLevelEndNotify.proto index 2b1982b3..0cf22e8c 100644 --- a/proto/TowerLevelEndNotify.proto +++ b/proto/TowerLevelEndNotify.proto @@ -36,9 +36,9 @@ message TowerLevelEndNotify { CONTINUE_STATE_TYPE_CAN_ENTER_NEXT_FLOOR = 2; } - uint32 Unk3300_BOPIBKGAMID = 2; + uint32 continue_state = 2; repeated uint32 finished_star_cond_list = 6; - uint32 Unk3300_AHBGPMBHPMO = 4; + uint32 next_floor_id = 4; bool is_success = 15; repeated ItemParam reward_item_list = 10; } diff --git a/proto/TowerLevelStarCondData.proto b/proto/TowerLevelStarCondData.proto index 0d87a8bd..bd07e63f 100644 --- a/proto/TowerLevelStarCondData.proto +++ b/proto/TowerLevelStarCondData.proto @@ -23,5 +23,5 @@ message TowerLevelStarCondData { bool Unk3300_KBCFDFOAJMM = 14; bool Unk3300_CPBCNACKAAK = 5; uint32 Unk3300_JGOLBFMJBCL = 11; - uint32 Unk3300_MGHNDJAACME = 12; + uint32 cond_value = 12; } diff --git a/proto/WeaponAwakenRsp.proto b/proto/WeaponAwakenRsp.proto index 73303809..18faa1b4 100644 --- a/proto/WeaponAwakenRsp.proto +++ b/proto/WeaponAwakenRsp.proto @@ -28,10 +28,10 @@ message WeaponAwakenRsp { // ENET_IS_RELIABLE = 1; // } - map Unk3300_IKJALGGLHOM = 3; + map cur_affix_level_map = 3; uint64 avatar_guid = 8; int32 retcode = 9; uint64 target_weapon_guid = 14; - map Unk3300_AMMAMKJDEMG = 15; + map old_affix_level_map = 15; uint32 target_weapon_awaken_level = 2; } diff --git a/proto/WeaponPromoteRsp.proto b/proto/WeaponPromoteRsp.proto index d1fbe379..a2675f1c 100644 --- a/proto/WeaponPromoteRsp.proto +++ b/proto/WeaponPromoteRsp.proto @@ -28,8 +28,8 @@ message WeaponPromoteRsp { // ENET_IS_RELIABLE = 1; // } - uint32 Unk3300_GGFCIPAKKDP = 4; + uint32 old_promote_level = 4; uint64 target_weapon_guid = 11; - uint32 Unk3300_MBEBIACJNBB = 5; + uint32 cur_promote_level = 5; int32 retcode = 8; }