From 58b54d047a04b6a86f65026781c24990599339d1 Mon Sep 17 00:00:00 2001 From: Akbar Yahya Date: Mon, 12 Dec 2022 17:47:14 +0800 Subject: [PATCH] sync fix5 --- op.js | 19 +++++-------------- proto/ActivityInfo.proto | 4 ++-- proto/AttackHitEffectResult.proto | 2 +- proto/AttackResult.proto | 18 +++++++++--------- proto/AvatarEnterSceneInfo.proto | 4 ++-- proto/AvatarTeamResonanceInfo.proto | 4 ++-- proto/AvatarUpgradeRsp.proto | 4 ++-- proto/BartenderActivityDetailInfo.proto | 4 ++-- proto/BattlePassProduct.proto | 6 +++--- proto/BattlePassSchedule.proto | 10 +++++----- proto/CheckAddItemExceedLimitNotify.proto | 4 ++-- proto/ClientCollectorData.proto | 4 ++-- proto/CodexDataFullNotify.proto | 4 ++-- proto/CombineRsp.proto | 2 +- proto/CompoundQueueData.proto | 6 +++--- proto/DoGachaRsp.proto | 12 ++++++------ proto/DungeonEntryInfo.proto | 4 ++-- proto/EvtAvatarStandUpNotify.proto | 4 ++-- proto/ForgeQueueData.proto | 10 +++++----- proto/ForgeQueueManipulateRsp.proto | 4 ++-- proto/FurnitureMakeData.proto | 4 ++-- proto/GachaInfo.proto | 17 +++++++++-------- proto/GachaWishRsp.proto | 6 +++--- proto/GetPlayerTokenReq.proto | 2 +- proto/GetPlayerTokenRsp.proto | 2 +- proto/HitCollision.proto | 4 ++-- proto/HomeLimitedShopGoods.proto | 6 +++--- proto/HomeMarkPointSceneData.proto | 4 ++-- proto/InferenceWordInfo.proto | 6 +++--- proto/InvestigationMonster.proto | 8 ++++---- proto/ParentQuest.proto | 4 ++-- proto/PersonalLineAllDataRsp.proto | 4 ++-- proto/PlayerEnterSceneNotify.proto | 8 ++++---- proto/PlayerHomeCompInfo.proto | 4 ++-- proto/PlayerLoginReq.proto | 2 +- proto/QueryCodexMonsterBeKilledNumRsp.proto | 4 ++-- proto/ResinChangeNotify.proto | 4 ++-- proto/RogueStageInfo.proto | 6 +++--- proto/SceneTeamAvatar.proto | 10 +++++----- .../ServerCondMeetQuestListUpdateNotify.proto | 4 ++-- proto/ShopGoods.proto | 14 +++++++------- proto/TakeFurnitureMakeRsp.proto | 4 ++-- proto/TowerAllDataRsp.proto | 4 ++-- proto/TowerMonthlyBrief.proto | 6 +++--- proto/TrackingIOInfo.proto | 4 ++-- .../TrialAvatarActivityRewardDetailInfo.proto | 4 ++-- proto/VehicleLocationInfo.proto | 4 ++-- proto/WorldOwnerDailyTaskNotify.proto | 4 ++-- 48 files changed, 137 insertions(+), 145 deletions(-) diff --git a/op.js b/op.js index e2341691..20d6ded4 100644 --- a/op.js +++ b/op.js @@ -715,21 +715,12 @@ function scan_gc() { //console.log(g_todump); } -//scan_gc(); // 1 scene proto gc -//clean_proto_gen(); // 5 clean proto -//fix_packet(false); -//cmdid_to_op(); // 6. update cmd op -//update_cmdid_gc(); // 4 update cmd gc -//get_cmdid_gc(); // 3 get cmd gc -//get_cmdid_json(); // 2 update cmd json -//check_gen(); - // Update GC Proto -//get_cmdid_gc(); // 1. get cmd old gc -//get_cmdid_json(); // 2. get last cmdid.csv to json +// get_cmdid_gc(); // 1. get cmd old gc +// get_cmdid_json(); // 2. get last cmdid.csv to json // now we have cmdid_gc.json and cmdid.json -//update_cmdid_gc(); // 3. update gc cmdid (mode by id) -//cmdid_to_op(); // 4. update op +// update_cmdid_gc(); // 3. update gc cmdid (mode by id) +// 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/ActivityInfo.proto b/proto/ActivityInfo.proto index 9c4ba4f0..4f16f74a 100644 --- a/proto/ActivityInfo.proto +++ b/proto/ActivityInfo.proto @@ -98,11 +98,11 @@ message ActivityInfo { repeated ActivityPushTipsData activity_push_tips_data_list = 1867; uint32 activity_id = 13; repeated uint32 taken_reward_list = 1889; - uint32 Unk3300_GCEAKEMMJEA = 697; + uint32 selected_avatar_reward_id = 697; map activity_coin_map = 36; uint32 first_day_start_time = 786; bool Unk3300_ABJKLALKLDG = 1486; - uint32 Unk3300_DMILOONBELH = 3; + uint32 activity_type = 3; bool Unk3300_CBCEHLJJOGI = 1375; uint32 begin_time = 1; bool Unk3300_MDBDPIBEGGH = 12; diff --git a/proto/AttackHitEffectResult.proto b/proto/AttackHitEffectResult.proto index 229779f8..1ba2fd7b 100644 --- a/proto/AttackHitEffectResult.proto +++ b/proto/AttackHitEffectResult.proto @@ -21,7 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; message AttackHitEffectResult { float Unk3300_DABGDGLAIKL = 13; - float Unk3300_JDEFHMKICPF = 10; + float hit_halt_time_scale = 10; float Unk3300_ECHOFBLGIIO = 9; uint32 Unk3300_LCKECJCKKJK = 8; uint32 Unk3300_KLNGDAMMFIF = 1; diff --git a/proto/AttackResult.proto b/proto/AttackResult.proto index cb6c23e7..5fdf9ea4 100644 --- a/proto/AttackResult.proto +++ b/proto/AttackResult.proto @@ -25,34 +25,34 @@ import "Vector.proto"; option java_package = "emu.grasscutter.net.proto"; message AttackResult { - uint32 Unk3300_CJFKCNCGJLB = 2; + uint32 defense_id = 2; uint32 attacker_id = 1; - uint32 Unk3300_GGABJNLLEAJ = 1870; + uint32 target_type = 1870; float Unk3300_HGJOKFPHMJJ = 803; bool Unk3300_DOMAOPGPHMD = 454; uint32 element_type = 12; uint32 Unk3300_BALCPHMFIBC = 1438; float damage = 10; uint32 Unk3300_HEIMDHBPFNF = 1115; - uint32 Unk3300_HNKLIODEJAB = 645; + uint32 critical_rand = 645; uint32 Unk3300_ABJJNNNKGBB = 1742; uint32 Unk3300_KPKAECBFABP = 2012; AttackHitEffectResult hit_eff_result = 8; - uint32 Unk3300_EIGMFDMKADE = 14; + uint32 endure_break = 14; AbilityIdentifier ability_identifier = 7; uint32 Unk3300_IPPHJMMELIG = 3; - uint32 Unk3300_EBCNAAJAONF = 1782; - float Unk3300_MEFFADEPHBM = 1932; + uint32 attack_timestamp_ms = 1782; + float damage_shield = 1932; uint32 Unk3300_PIGBELICMMD = 1484; - bool Unk3300_PJPCBIACFJK = 633; + bool is_resist_text = 633; int32 hit_retreat_angle_compat = 5; HitCollision hit_collision = 15; bool Unk3300_MGIMJGMIPLD = 732; - bool Unk3300_GBKCGDPAJIE = 6; + bool is_crit = 6; Vector resolved_dir = 11; float Unk3300_MPKAMIMDKOE = 28; string anim_event_id = 4; uint32 Unk3300_GBPJCELJKJA = 1844; uint32 Unk3300_JMJHGJCAOBH = 914; - float Unk3300_FJJLKJBOBAC = 775; + float element_durability_attenuation = 775; } diff --git a/proto/AvatarEnterSceneInfo.proto b/proto/AvatarEnterSceneInfo.proto index fb99618a..6d4730cc 100644 --- a/proto/AvatarEnterSceneInfo.proto +++ b/proto/AvatarEnterSceneInfo.proto @@ -27,8 +27,8 @@ message AvatarEnterSceneInfo { uint64 avatar_guid = 9; uint32 avatar_entity_id = 13; repeated ServerBuff server_buff_list = 7; - AbilitySyncStateInfo Unk3300_EMAGOKCPPKN = 6; + AbilitySyncStateInfo weapon_ability_info = 6; repeated uint32 buff_id_list = 8; - AbilitySyncStateInfo Unk3300_FCDDPFADNAI = 1; + AbilitySyncStateInfo avatar_ability_info = 1; uint64 weapon_guid = 15; } diff --git a/proto/AvatarTeamResonanceInfo.proto b/proto/AvatarTeamResonanceInfo.proto index e46ddb41..1b6211df 100644 --- a/proto/AvatarTeamResonanceInfo.proto +++ b/proto/AvatarTeamResonanceInfo.proto @@ -22,6 +22,6 @@ option java_package = "emu.grasscutter.net.proto"; message AvatarTeamResonanceInfo { uint64 avatar_guid = 9; uint32 entity_id = 8; - repeated uint32 Unk3300_MBJEEEEEJCE = 15; - repeated uint32 Unk3300_LPAKGGBBDNJ = 13; + repeated uint32 add_team_resonance_id_list = 15; + repeated uint32 del_team_resonance_id_list = 13; } diff --git a/proto/AvatarUpgradeRsp.proto b/proto/AvatarUpgradeRsp.proto index f53b1b56..889bc1dc 100644 --- a/proto/AvatarUpgradeRsp.proto +++ b/proto/AvatarUpgradeRsp.proto @@ -31,7 +31,7 @@ message AvatarUpgradeRsp { int32 retcode = 8; uint64 avatar_guid = 14; uint32 cur_level = 9; - map Unk3300_OIMPFCDCDGA = 13; - map Unk3300_BFNHHNKOLBH = 6; + map cur_fight_prop_map = 13; + map old_fight_prop_map = 6; uint32 old_level = 12; } diff --git a/proto/BartenderActivityDetailInfo.proto b/proto/BartenderActivityDetailInfo.proto index de9d57ba..0ff45278 100644 --- a/proto/BartenderActivityDetailInfo.proto +++ b/proto/BartenderActivityDetailInfo.proto @@ -25,8 +25,8 @@ option java_package = "emu.grasscutter.net.proto"; message BartenderActivityDetailInfo { bool is_content_closed = 15; repeated BartenderLevelInfo unlock_level_list = 10; - repeated uint32 Unk3300_BPCBOANPBHF = 3; - repeated uint32 Unk3300_OGPLCBFDHCF = 6; + repeated uint32 unlock_item_list = 3; + repeated uint32 unlock_formula_list = 6; repeated BartenderTaskInfo unlock_task_list = 5; bool is_develop_module_open = 9; } diff --git a/proto/BattlePassProduct.proto b/proto/BattlePassProduct.proto index cdf1dc2c..4221499e 100644 --- a/proto/BattlePassProduct.proto +++ b/proto/BattlePassProduct.proto @@ -20,7 +20,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; message BattlePassProduct { - string Unk3300_AOMGCJOGGED = 12; - string Unk3300_NHOAGMGNEIM = 9; - string Unk3300_NIEBADLADMK = 7; + string extra_product_id = 12; + string normal_product_id = 9; + string upgrade_product_id = 7; } diff --git a/proto/BattlePassSchedule.proto b/proto/BattlePassSchedule.proto index 6a66f597..f2e2b32b 100644 --- a/proto/BattlePassSchedule.proto +++ b/proto/BattlePassSchedule.proto @@ -26,12 +26,12 @@ option java_package = "emu.grasscutter.net.proto"; message BattlePassSchedule { uint32 schedule_id = 5; - uint32 Unk3300_MAAJDKMIODC = 2; + uint32 point = 2; uint32 level = 7; - bool Unk3300_KODFJENCJLE = 8; - uint32 Unk3300_ELMNFBOLEOA = 14; - bool Unk3300_KALOGHHMJJE = 12; - uint32 Unk3300_FILCIPPAHHL = 4; + bool is_extra_paid_reward_taken = 8; + uint32 cur_cycle_points = 14; + bool is_viewed = 12; + uint32 paid_platform_flags = 4; BattlePassCycle cur_cycle = 11; uint32 begin_time = 1; BattlePassUnlockStatus unlock_status = 15; diff --git a/proto/CheckAddItemExceedLimitNotify.proto b/proto/CheckAddItemExceedLimitNotify.proto index a4abc9a0..dc1b1ab9 100644 --- a/proto/CheckAddItemExceedLimitNotify.proto +++ b/proto/CheckAddItemExceedLimitNotify.proto @@ -35,8 +35,8 @@ message CheckAddItemExceedLimitNotify { ITEM_EXCEED_LIMIT_MSG_TYPE_DIALOG_NONBLOCK = 3; } - repeated uint32 Unk3300_PKJMEJKAPBI = 4; - repeated uint32 Unk3300_GPDPCJLHBDE = 11; + repeated uint32 exceeded_item_list = 4; + repeated uint32 exceeded_item_type_list = 11; uint32 reason = 9; bool is_drop = 14; ItemExceedLimitMsgType msg_type = 6; diff --git a/proto/ClientCollectorData.proto b/proto/ClientCollectorData.proto index ff6a65d3..0c7a24e9 100644 --- a/proto/ClientCollectorData.proto +++ b/proto/ClientCollectorData.proto @@ -20,7 +20,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; message ClientCollectorData { - uint32 Unk3300_PPAOJCGAAEA = 2; - uint32 Unk3300_MFCHJHPJALD = 3; + uint32 max_points = 2; + uint32 curr_points = 3; uint32 material_id = 9; } diff --git a/proto/CodexDataFullNotify.proto b/proto/CodexDataFullNotify.proto index d595f3a0..848d2474 100644 --- a/proto/CodexDataFullNotify.proto +++ b/proto/CodexDataFullNotify.proto @@ -31,7 +31,7 @@ message CodexDataFullNotify { // } repeated CodexTypeData type_data_list = 14; - uint32 Unk3300_ODPDLGEKIEM = 4; - uint32 Unk3300_DCMJLCIFCEH = 13; + uint32 last_read_pushtips_codex_id = 4; + uint32 last_read_pushtips_type_id = 13; repeated uint32 recent_viewed_pushtips_list = 1; } diff --git a/proto/CombineRsp.proto b/proto/CombineRsp.proto index ac5ee9cf..3d50ff3a 100644 --- a/proto/CombineRsp.proto +++ b/proto/CombineRsp.proto @@ -38,5 +38,5 @@ message CombineRsp { uint32 combine_id = 10; repeated ItemParam cost_item_list = 15; int32 retcode = 1; - repeated ItemParam Unk3300_FLHNPFGNNBM = 4; + repeated ItemParam result_item_list = 4; } diff --git a/proto/CompoundQueueData.proto b/proto/CompoundQueueData.proto index 19493310..c47e0e22 100644 --- a/proto/CompoundQueueData.proto +++ b/proto/CompoundQueueData.proto @@ -20,8 +20,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; message CompoundQueueData { - uint32 Unk3300_NCEHJAAHOKM = 5; - uint32 Unk3300_COMIGCMIPLE = 14; - uint32 Unk3300_JHJNOPCPPAD = 10; + uint32 wait_count = 5; + uint32 output_time = 14; + uint32 output_count = 10; uint32 compound_id = 12; } diff --git a/proto/DoGachaRsp.proto b/proto/DoGachaRsp.proto index b347a1e8..1b076ca0 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_OPGAHAGHEP - uint32 gacha_times_limit = 1; - uint32 wish_max_progress = 5; + uint32 Unk3300_OPGAHAGHEPF = 6; + uint32 Unk3300_NMOKGFGDFFC = 1; + uint32 Unk3300_BLLMPAJNCPI = 5; uint32 gacha_times = 4; - uint32 wish_item_id = 15; - uint32 new_gacha_random = 12; //Unk3300_KEIJFMKAKDH + uint32 Unk3300_GLPMIEMBGGL = 15; + uint32 Unk3300_KEIJFMKAKDH = 12; uint32 ten_cost_item_id = 13; uint32 cost_item_num = 8; uint32 ten_cost_item_num = 2; - uint32 wish_progress = 1550; + uint32 Unk3300_HLANONBCBLM = 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 91b1c87b..d6b257b2 100644 --- a/proto/DungeonEntryInfo.proto +++ b/proto/DungeonEntryInfo.proto @@ -23,12 +23,12 @@ option java_package = "emu.grasscutter.net.proto"; message DungeonEntryInfo { uint32 end_time = 14; - uint32 Unk3300_KNKFCOKMECI = 9; + uint32 max_boss_chest_num = 9; bool is_passed = 13; WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 6; uint32 dungeon_id = 8; uint32 Unk3300_IDMPGPKMMEH = 5; uint32 next_refresh_time = 10; - uint32 Unk3300_ONLALCCKIEE = 3; + uint32 next_boss_chest_refresh_time = 3; uint32 start_time = 11; } diff --git a/proto/EvtAvatarStandUpNotify.proto b/proto/EvtAvatarStandUpNotify.proto index 1bd882dd..3f7e85e1 100644 --- a/proto/EvtAvatarStandUpNotify.proto +++ b/proto/EvtAvatarStandUpNotify.proto @@ -29,8 +29,8 @@ message EvtAvatarStandUpNotify { // IS_ALLOW_CLIENT = 1; // } - int32 Unk3300_EBPACPNPKKJ = 13; + int32 direction = 13; uint64 chair_id = 3; uint32 entity_id = 5; - int32 Unk3300_IMNGNLLMEFJ = 11; + int32 perform_id = 11; } diff --git a/proto/ForgeQueueData.proto b/proto/ForgeQueueData.proto index 947c2b00..d58dd0b3 100644 --- a/proto/ForgeQueueData.proto +++ b/proto/ForgeQueueData.proto @@ -20,11 +20,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; message ForgeQueueData { - uint32 Unk3300_KDIPLNBHGDH = 1; + uint32 next_finish_timestamp = 1; uint32 forge_id = 5; - uint32 Unk3300_GJEECHKDEBD = 7; - uint32 Unk3300_OOOJNABGHOM = 4; - uint32 Unk3300_PJCKFNNIMNM = 15; + uint32 finish_count = 7; + uint32 queue_id = 4; + uint32 total_finish_timestamp = 15; uint32 avatar_id = 12; - uint32 Unk3300_PJKHPCIMAID = 3; + uint32 unfinish_count = 3; } diff --git a/proto/ForgeQueueManipulateRsp.proto b/proto/ForgeQueueManipulateRsp.proto index 9a6eaebc..f93483d2 100644 --- a/proto/ForgeQueueManipulateRsp.proto +++ b/proto/ForgeQueueManipulateRsp.proto @@ -33,7 +33,7 @@ message ForgeQueueManipulateRsp { repeated ItemParam extra_output_item_list = 3; ForgeQueueManipulateType manipulate_type = 12; - repeated ItemParam Unk3300_JDHFPCBOGFH = 4; - repeated ItemParam Unk3300_EOLDJAMHDHM = 14; + repeated ItemParam return_item_list = 4; + repeated ItemParam output_item_list = 14; int32 retcode = 11; } diff --git a/proto/FurnitureMakeData.proto b/proto/FurnitureMakeData.proto index 925a5c1b..63ed084c 100644 --- a/proto/FurnitureMakeData.proto +++ b/proto/FurnitureMakeData.proto @@ -24,6 +24,6 @@ message FurnitureMakeData { uint32 avatar_id = 5; uint32 make_id = 10; uint32 index = 6; - uint32 Unk3300_GDIBLADMJIC = 8; - uint32 Unk3300_GBDHFLEFJLG = 7; + uint32 dur_time = 8; + fixed32 accelerate_time = 7; } diff --git a/proto/GachaInfo.proto b/proto/GachaInfo.proto index 93b3a2ea..b4fe0a29 100644 --- a/proto/GachaInfo.proto +++ b/proto/GachaInfo.proto @@ -1,3 +1,4 @@ +// Proto has been converted from Sorapointa to Grasscutter format // Sorapointa - A server software re-implementation for a certain anime game, and avoid sorapointa. // Copyright (C) 2022 Sorapointa Team // @@ -23,28 +24,28 @@ option java_package = "emu.grasscutter.net.proto"; message GachaInfo { uint32 left_gacha_times = 5; uint32 gacha_type = 7; - uint32 gacha_times_limit = 954; //gachatimeslimit + uint32 Unk3300_NMOKGFGDFFC = 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_up_5_item_list = 476; - uint32 wish_item_id = 10; //weapon epitomised + repeated uint32 display_up5_item_list = 476; + uint32 Unk3300_GLPMIEMBGGL = 10; string gacha_preview_prefab_path = 4; string title_textmap = 114; - uint32 wish_progress = 245; // + uint32 Unk3300_HLANONBCBLM = 245; uint32 end_time = 2; - repeated uint32 display_up_4_item_list = 540; + repeated uint32 display_up4_item_list = 540; uint32 ten_cost_item_num = 13; - uint32 wish_max_progress = 1275; // + uint32 Unk3300_BLLMPAJNCPI = 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 Unk3300_KEIJFMKAKDH = 1580; string gacha_record_url_oversea = 1259; repeated GachaUpInfo gacha_up_info_list = 1585; uint32 cost_item_id = 3; string gacha_prefab_path = 11; -} \ No newline at end of file +} diff --git a/proto/GachaWishRsp.proto b/proto/GachaWishRsp.proto index ee0e0884..d6b09c7c 100644 --- a/proto/GachaWishRsp.proto +++ b/proto/GachaWishRsp.proto @@ -28,10 +28,10 @@ message GachaWishRsp { // ENET_IS_RELIABLE = 1; // } - uint32 wish_item_id = 6; - uint32 wish_progress = 15; // + uint32 Unk3300_NMOKGFGDFFC = 6; + uint32 Unk3300_KEIJFMKAKDH = 15; uint32 gacha_schedule_id = 11; int32 retcode = 13; - uint32 wish_max_progress = 10; // + uint32 Unk3300_BLLMPAJNCPI = 10; uint32 gacha_type = 8; } diff --git a/proto/GetPlayerTokenReq.proto b/proto/GetPlayerTokenReq.proto index 22bf9abe..b605249f 100644 --- a/proto/GetPlayerTokenReq.proto +++ b/proto/GetPlayerTokenReq.proto @@ -48,5 +48,5 @@ message GetPlayerTokenReq { string account_token = 9; string country_code = 11; string birthday = 292; - uint32 Unk3300_IADFJHNFKIB = 7; + uint32 sub_channel_id = 7; } diff --git a/proto/GetPlayerTokenRsp.proto b/proto/GetPlayerTokenRsp.proto index 05769cbd..2248045b 100644 --- a/proto/GetPlayerTokenRsp.proto +++ b/proto/GetPlayerTokenRsp.proto @@ -47,7 +47,7 @@ message GetPlayerTokenRsp { string birthday = 1847; uint32 tag = 1099; string client_ip_str = 1382; - uint32 Unk3300_IADFJHNFKIB = 1038; + uint32 sub_channel_id = 1038; int32 retcode = 2; string client_version_random_key = 1152; string psn_id = 242; diff --git a/proto/HitCollision.proto b/proto/HitCollision.proto index 54689537..f0775f41 100644 --- a/proto/HitCollision.proto +++ b/proto/HitCollision.proto @@ -25,8 +25,8 @@ option java_package = "emu.grasscutter.net.proto"; message HitCollision { int32 hit_box_index = 8; HitColliderType hit_collider_type = 5; - float Unk3300_LNHIOLFMGCN = 7; + float attackee_hit_entity_angle = 7; Vector hit_dir = 3; Vector hit_point = 14; - float Unk3300_OJHBMLIAPJN = 10; + float attackee_hit_force_angle = 10; } diff --git a/proto/HomeLimitedShopGoods.proto b/proto/HomeLimitedShopGoods.proto index 411f2ebb..b662cc17 100644 --- a/proto/HomeLimitedShopGoods.proto +++ b/proto/HomeLimitedShopGoods.proto @@ -22,9 +22,9 @@ import "ItemParam.proto"; option java_package = "emu.grasscutter.net.proto"; message HomeLimitedShopGoods { - uint32 Unk3300_EHKFICBACKC = 8; - uint32 Unk3300_OODCCOAIGHI = 10; - uint32 Unk3300_DBJCMMBHBNI = 12; + uint32 buy_limit = 8; + uint32 disable_type = 10; + uint32 goods_id = 12; uint32 bought_num = 5; ItemParam goods_item = 2; repeated ItemParam cost_item_list = 4; diff --git a/proto/HomeMarkPointSceneData.proto b/proto/HomeMarkPointSceneData.proto index 54b7fe73..1da45b84 100644 --- a/proto/HomeMarkPointSceneData.proto +++ b/proto/HomeMarkPointSceneData.proto @@ -23,9 +23,9 @@ import "Vector.proto"; option java_package = "emu.grasscutter.net.proto"; message HomeMarkPointSceneData { - Vector Unk3300_ONJJJEPFKJI = 9; + Vector teapot_spirit_pos = 9; uint32 scene_id = 6; - Vector Unk3300_HFNOINGPMJP = 11; + Vector safe_point_pos = 11; uint32 module_id = 8; repeated HomeMarkPointFurnitureData furniture_list = 13; } diff --git a/proto/InferenceWordInfo.proto b/proto/InferenceWordInfo.proto index a15c9674..098c8d5c 100644 --- a/proto/InferenceWordInfo.proto +++ b/proto/InferenceWordInfo.proto @@ -20,9 +20,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; message InferenceWordInfo { - bool Unk3300_BFOGKOHIEEJ = 12; + bool is_submit = 12; uint32 unlock_by_word_id = 11; - bool Unk3300_PKBCAOHGNLM = 10; + bool is_associate = 10; uint32 word_id = 2; - bool Unk3300_JPHLECOIGKF = 3; + bool is_interpret = 3; } diff --git a/proto/InvestigationMonster.proto b/proto/InvestigationMonster.proto index 3677b7f8..bccb00c0 100644 --- a/proto/InvestigationMonster.proto +++ b/proto/InvestigationMonster.proto @@ -34,15 +34,15 @@ message InvestigationMonster { uint32 next_refresh_time = 8; uint32 city_id = 14; uint32 group_id = 1735; - uint32 Unk3300_ONLALCCKIEE = 1; + uint32 next_boss_chest_refresh_time = 1; WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 3; - uint32 Unk3300_DKKOBDIEKPP = 6; + uint32 boss_chest_num = 6; uint32 id = 9; uint32 monster_id = 562; LockState lock_state = 4; - uint32 Unk3300_JHLEHEOOGGB = 10; + uint32 refresh_interval = 10; bool is_area_locked = 5; uint32 level = 2; - uint32 Unk3300_KNKFCOKMECI = 11; + uint32 max_boss_chest_num = 11; uint32 resin = 15; } diff --git a/proto/ParentQuest.proto b/proto/ParentQuest.proto index 980ffa95..45070b18 100644 --- a/proto/ParentQuest.proto +++ b/proto/ParentQuest.proto @@ -27,12 +27,12 @@ message ParentQuest { repeated InferencePageInfo inference_page_list = 5; repeated int32 quest_var = 7; uint64 video_key = 11; - uint32 Unk3300_BOMOHKDHMNH = 15; + uint32 parent_quest_state = 15; ParentQuestRandomInfo random_info = 9; uint32 parent_quest_id = 3; bool is_random = 12; repeated ChildQuest child_quest_list = 8; bool is_finished = 1; map time_var_map = 2; - uint32 Unk3300_PCIHJLPPHNJ = 14; + uint32 quest_var_seq = 14; } diff --git a/proto/PersonalLineAllDataRsp.proto b/proto/PersonalLineAllDataRsp.proto index c4fdd282..8b0147df 100644 --- a/proto/PersonalLineAllDataRsp.proto +++ b/proto/PersonalLineAllDataRsp.proto @@ -33,7 +33,7 @@ message PersonalLineAllDataRsp { uint32 cur_finished_daily_task_count = 12; repeated LockedPersonallineData locked_personal_line_list = 10; int32 retcode = 2; - repeated uint32 Unk3300_BHLEGLEICFJ = 1; - repeated uint32 Unk3300_BGCIGNEGBIN = 6; + repeated uint32 can_be_unlocked_personal_line_list = 1; + repeated uint32 ongoing_personal_line_list = 6; uint32 legendary_key_count = 5; } diff --git a/proto/PlayerEnterSceneNotify.proto b/proto/PlayerEnterSceneNotify.proto index 37599cf1..5632fd5e 100644 --- a/proto/PlayerEnterSceneNotify.proto +++ b/proto/PlayerEnterSceneNotify.proto @@ -31,12 +31,12 @@ message PlayerEnterSceneNotify { // ENET_IS_RELIABLE = 1; // } - uint32 Unk3300_LIDGFMDDOOM = 1224; - bool Unk3300_LFFBNEBMAAG = 32; + uint32 world_type = 1224; + bool is_skip_ui = 32; uint32 world_level = 4; Vector pos = 1; - bool Unk3300_OKMNOFOHKOB = 3; - uint32 Unk3300_LLHABHMLNAH = 13; + bool is_first_login_enter_scene = 3; + uint32 prev_scene_id = 13; uint32 enter_scene_token = 6; uint32 dungeon_id = 2; uint32 scene_id = 11; diff --git a/proto/PlayerHomeCompInfo.proto b/proto/PlayerHomeCompInfo.proto index 11f4a6aa..b2c1b108 100644 --- a/proto/PlayerHomeCompInfo.proto +++ b/proto/PlayerHomeCompInfo.proto @@ -24,6 +24,6 @@ option java_package = "emu.grasscutter.net.proto"; message PlayerHomeCompInfo { FriendEnterHomeOption friend_enter_home_option = 13; repeated uint32 seen_module_id_list = 5; - repeated uint32 Unk3300_PBEFIJCEKMH = 2; - repeated uint32 Unk3300_JJPCFPAKFLM = 11; + repeated uint32 unlocked_module_id_list = 2; + repeated uint32 levelup_reward_got_level_list = 11; } diff --git a/proto/PlayerLoginReq.proto b/proto/PlayerLoginReq.proto index 06a5601c..5a6bd6c3 100644 --- a/proto/PlayerLoginReq.proto +++ b/proto/PlayerLoginReq.proto @@ -50,7 +50,7 @@ message PlayerLoginReq { uint32 tag = 525; string account_uid = 14; string device_info = 15; - uint32 Unk3300_IADFJHNFKIB = 1458; + uint32 sub_channel_id = 1458; bool is_editor = 1; string token = 8; uint32 reg_platform = 424; diff --git a/proto/QueryCodexMonsterBeKilledNumRsp.proto b/proto/QueryCodexMonsterBeKilledNumRsp.proto index 55170a13..faaa21dc 100644 --- a/proto/QueryCodexMonsterBeKilledNumRsp.proto +++ b/proto/QueryCodexMonsterBeKilledNumRsp.proto @@ -28,8 +28,8 @@ message QueryCodexMonsterBeKilledNumRsp { // ENET_IS_RELIABLE = 1; // } - repeated uint32 Unk3300_ALELNLIODAO = 11; - repeated uint32 Unk3300_INHAGEELNNC = 5; + repeated uint32 be_killed_num_list = 11; + repeated uint32 be_captured_num_list = 5; int32 retcode = 2; repeated uint32 codex_id_list = 10; } diff --git a/proto/ResinChangeNotify.proto b/proto/ResinChangeNotify.proto index 863222ed..41d1f1a0 100644 --- a/proto/ResinChangeNotify.proto +++ b/proto/ResinChangeNotify.proto @@ -28,7 +28,7 @@ message ResinChangeNotify { // ENET_IS_RELIABLE = 1; // } - uint32 Unk3300_KGLIHGLNAJK = 11; - uint32 Unk3300_DADMLCPIHKJ = 13; + uint32 cur_buy_count = 11; + uint32 next_add_timestamp = 13; uint32 cur_value = 10; } diff --git a/proto/RogueStageInfo.proto b/proto/RogueStageInfo.proto index 526aa6e2..d29dd246 100644 --- a/proto/RogueStageInfo.proto +++ b/proto/RogueStageInfo.proto @@ -28,13 +28,13 @@ message RogueStageInfo { uint32 Unk3300_GGHMFKNHPAJ = 2; RogueShowAvatarTeamInfo avatar_team = 8; bool is_taken_reward = 9; - bool Unk3300_HMCJOLLKMMB = 14; + bool is_explored = 14; repeated RoguelikeRuneRecord rune_record_list = 5; bool Unk3300_HMAELBBOFDN = 6; - uint32 Unk3300_CMMGKMMMOAL = 3; + uint32 coin_c_num = 3; bool is_open = 13; uint32 stage_id = 7; - uint32 Unk3300_DABPFCPCNCB = 4; + uint32 max_passed_level = 4; uint32 cur_level = 12; uint32 Unk3300_OHHBEPOICLI = 1; uint32 Unk3300_HPKFHLLCJBM = 275; diff --git a/proto/SceneTeamAvatar.proto b/proto/SceneTeamAvatar.proto index 64f6ac3f..a6c3d0b6 100644 --- a/proto/SceneTeamAvatar.proto +++ b/proto/SceneTeamAvatar.proto @@ -30,17 +30,17 @@ message SceneTeamAvatar { SceneAvatarInfo scene_avatar_info = 14; AvatarInfo avatar_info = 15; uint32 entity_id = 10; - AbilitySyncStateInfo Unk3300_EMAGOKCPPKN = 6; + AbilitySyncStateInfo weapon_ability_info = 6; AbilityControlBlock ability_control_block = 2; - bool Unk3300_ONCNAJBJGKM = 8; - AbilitySyncStateInfo Unk3300_FCDDPFADNAI = 4; + bool is_reconnect = 8; + AbilitySyncStateInfo avatar_ability_info = 4; uint64 weapon_guid = 12; uint32 player_uid = 1; SceneEntityInfo scene_entity_info = 11; uint32 weapon_entity_id = 5; uint32 scene_id = 9; - bool Unk3300_ILECHHKDIEM = 625; + bool is_on_scene = 625; uint64 avatar_guid = 3; - bool Unk3300_GENGJLPJCCN = 13; + bool is_player_cur_avatar = 13; repeated ServerBuff server_buff_list = 7; } diff --git a/proto/ServerCondMeetQuestListUpdateNotify.proto b/proto/ServerCondMeetQuestListUpdateNotify.proto index 2b3ff3b8..fb7275d4 100644 --- a/proto/ServerCondMeetQuestListUpdateNotify.proto +++ b/proto/ServerCondMeetQuestListUpdateNotify.proto @@ -28,6 +28,6 @@ message ServerCondMeetQuestListUpdateNotify { // ENET_IS_RELIABLE = 1; // } - repeated uint32 Unk3300_MGBDKFMBGBO = 10; - repeated uint32 Unk3300_HIEMKEJOFPO = 4; + repeated uint32 add_quest_id_list = 10; + repeated uint32 del_quest_id_list = 4; } diff --git a/proto/ShopGoods.proto b/proto/ShopGoods.proto index 464387f1..59f4bb8f 100644 --- a/proto/ShopGoods.proto +++ b/proto/ShopGoods.proto @@ -27,19 +27,19 @@ message ShopGoods { repeated ItemParam cost_item_list = 7; uint32 bought_num = 14; repeated uint32 pre_goods_id_list = 9; - uint32 Unk3300_DFEDKIOCOBL = 5; + uint32 min_level = 5; uint32 Unk3300_NMOPAGJFHOO = 11; uint32 hcoin = 6; uint32 end_time = 3; uint32 next_refresh_time = 10; - uint32 Unk3300_DBJCMMBHBNI = 13; + uint32 goods_id = 13; uint32 Unk3300_OMKIFIMDGDN = 1037; - uint32 Unk3300_EHKFICBACKC = 8; + uint32 buy_limit = 8; uint32 Unk3300_MBGOMHNBHMG = 777; - uint32 Unk3300_KKKNKNOLICI = 2; - uint32 Unk3300_CEOMHBNDAOP = 1; - uint32 Unk3300_MICPGJCIAPE = 1770; + uint32 scoin = 2; + uint32 max_level = 1; + uint32 single_limit = 1770; uint32 Unk3300_NJCPAJBCEPH = 505; uint32 begin_time = 12; - uint32 Unk3300_OODCCOAIGHI = 4; + uint32 disable_type = 4; } diff --git a/proto/TakeFurnitureMakeRsp.proto b/proto/TakeFurnitureMakeRsp.proto index ef5044de..8f89292b 100644 --- a/proto/TakeFurnitureMakeRsp.proto +++ b/proto/TakeFurnitureMakeRsp.proto @@ -32,8 +32,8 @@ message TakeFurnitureMakeRsp { // } int32 retcode = 15; - repeated ItemParam Unk3300_JDHFPCBOGFH = 5; + repeated ItemParam return_item_list = 5; FurnitureMakeSlot furniture_make_slot = 14; - repeated ItemParam Unk3300_EOLDJAMHDHM = 10; + repeated ItemParam output_item_list = 10; uint32 make_id = 3; } diff --git a/proto/TowerAllDataRsp.proto b/proto/TowerAllDataRsp.proto index be24b386..e847030a 100644 --- a/proto/TowerAllDataRsp.proto +++ b/proto/TowerAllDataRsp.proto @@ -40,7 +40,7 @@ message TowerAllDataRsp { uint32 schedule_start_time = 610; int32 retcode = 11; uint32 Unk3300_OHCHCJGJIDK = 4; - uint32 Unk3300_BBHKBDDFPFE = 2; + uint32 valid_tower_record_num = 2; TowerMonthlyBrief last_schedule_monthly_brief = 1245; TowerCurLevelRecord cur_level_record = 12; repeated TowerFloorRecord tower_floor_record_list = 13; @@ -48,5 +48,5 @@ message TowerAllDataRsp { uint32 Unk3300_LEKODCFPINJ = 7; map Unk3300_PJPEEJACFJH = 3; bool is_finished_entrance_floor = 15; - map Unk3300_GNINCLBMMDJ = 14; + map floor_open_time_map = 14; } diff --git a/proto/TowerMonthlyBrief.proto b/proto/TowerMonthlyBrief.proto index be31f565..23234cd3 100644 --- a/proto/TowerMonthlyBrief.proto +++ b/proto/TowerMonthlyBrief.proto @@ -20,8 +20,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; message TowerMonthlyBrief { - uint32 Unk3300_AIFHPHDGEIE = 3; - uint32 Unk3300_CPNOLKAKHEJ = 6; - uint32 Unk3300_LEMOMFLHBLA = 9; + uint32 best_floor_index = 3; + uint32 total_star_count = 6; + uint32 best_level_index = 9; uint32 tower_schedule_id = 13; } diff --git a/proto/TrackingIOInfo.proto b/proto/TrackingIOInfo.proto index 074ce671..e0bd4edb 100644 --- a/proto/TrackingIOInfo.proto +++ b/proto/TrackingIOInfo.proto @@ -20,10 +20,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; message TrackingIOInfo { - string Unk3300_KGGPDKGDELG = 10; + string client_tz = 10; string Unk3300_PIBFPDAMJLE = 12; string Unk3300_NMDNLHLAKAM = 7; - string Unk3300_GEJJKDLGFPH = 5; + string rydevicetype = 5; string Unk3300_CNPIGDOEJPB = 2; string Unk3300_CCOGBICMHKG = 9; string Unk3300_DJHKHEFPCDK = 1; diff --git a/proto/TrialAvatarActivityRewardDetailInfo.proto b/proto/TrialAvatarActivityRewardDetailInfo.proto index 8aaa4edc..a678e27a 100644 --- a/proto/TrialAvatarActivityRewardDetailInfo.proto +++ b/proto/TrialAvatarActivityRewardDetailInfo.proto @@ -21,7 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; message TrialAvatarActivityRewardDetailInfo { uint32 trial_avatar_index_id = 4; - bool Unk3300_IFEPGCKHODL = 14; - bool Unk3300_NEJLGBBFDPH = 5; + bool received_reward = 14; + bool passed_dungeon = 5; uint32 reward_id = 11; } diff --git a/proto/VehicleLocationInfo.proto b/proto/VehicleLocationInfo.proto index 67a0b502..ed326cb6 100644 --- a/proto/VehicleLocationInfo.proto +++ b/proto/VehicleLocationInfo.proto @@ -25,9 +25,9 @@ message VehicleLocationInfo { Vector rot = 5; uint32 owner_uid = 11; repeated uint32 uid_list = 4; - float Unk3300_MLICEAKLOIH = 2; + float cur_hp = 2; Vector pos = 9; uint32 gadget_id = 1; uint32 entity_id = 14; - float Unk3300_MNNMOCIIEAJ = 15; + float max_hp = 15; } diff --git a/proto/WorldOwnerDailyTaskNotify.proto b/proto/WorldOwnerDailyTaskNotify.proto index 7af2c396..f49f873d 100644 --- a/proto/WorldOwnerDailyTaskNotify.proto +++ b/proto/WorldOwnerDailyTaskNotify.proto @@ -31,7 +31,7 @@ message WorldOwnerDailyTaskNotify { // IS_ALLOW_CLIENT = 1; // } - uint32 Unk3300_FJOJFPPPOFP = 4; + uint32 filter_city_id = 4; repeated DailyTaskInfo task_list = 2; - uint32 Unk3300_NADIOIJGPHE = 9; + uint32 finished_daily_task_num = 9; }