From e56e41357062f635632565a8e2e7c88cec50a1d0 Mon Sep 17 00:00:00 2001 From: Akbar Yahya Date: Wed, 1 Mar 2023 05:44:50 +0800 Subject: [PATCH] update proto 3.5: can at least log in (part 6) --- proto/ActivityInfo.proto | 6 +-- proto/AddNoGachaAvatarCardNotify.proto | 4 +- proto/AiSyncInfo.proto | 5 +-- proto/AllWidgetDataNotify.proto | 4 +- proto/AvatarSkillChangeNotify.proto | 6 +-- proto/AvatarSkillUpgradeRsp.proto | 6 +-- proto/AvatarUpgradeRsp.proto | 8 ++-- proto/CPBMIAMDLPE.proto | 11 ----- proto/CardProductRewardNotify.proto | 4 +- proto/ChapterStateNotify.proto | 20 ++++----- proto/ChildQuest.proto | 9 ++-- proto/CombineRsp.proto | 8 ++-- proto/CompoundDataNotify.proto | 4 +- proto/DailyDungeonEntryInfo.proto | 4 +- proto/DestroyMaterialReq.proto | 4 +- proto/DoGachaReq.proto | 8 ++-- proto/DoGachaRsp.proto | 40 +++++++++--------- proto/DungeonChallengeFinishNotify.proto | 4 +- proto/EntityFightPropChangeReasonNotify.proto | 8 ++-- proto/EvtAvatarStandUpNotify.proto | 4 +- proto/ForgeQueueManipulateRsp.proto | 6 +-- proto/GFDBMHNEOFL.proto | 39 ----------------- proto/GachaWishReq.proto | 4 +- proto/GachaWishRsp.proto | 10 ++--- proto/GetCompoundDataRsp.proto | 4 +- proto/GetPlayerTokenRsp.proto | 2 +- proto/HLDDAIOAHPB.proto | 13 ------ proto/MapMarkFromType.proto | 7 ++-- proto/ParentQuest.proto | 12 +++--- proto/ShopGoods.proto | 42 +++++++++---------- 30 files changed, 119 insertions(+), 187 deletions(-) delete mode 100644 proto/CPBMIAMDLPE.proto delete mode 100644 proto/GFDBMHNEOFL.proto delete mode 100644 proto/HLDDAIOAHPB.proto diff --git a/proto/ActivityInfo.proto b/proto/ActivityInfo.proto index 1e8cf3a0..e23280fd 100644 --- a/proto/ActivityInfo.proto +++ b/proto/ActivityInfo.proto @@ -82,11 +82,11 @@ message ActivityInfo { bool FLFGIDFALEK = 15; uint32 LPOCNCICJHM = 485; map activity_coin_map = 703; - repeated uint32 PAGIONJOCJN = 2; + repeated uint32 meetCondList = 2; uint32 end_time = 4; bool GLOONPBGOHM = 1331; repeated ActivityPushTipsData activity_push_tips_data_list = 1827; - repeated uint32 LGCJBENHFOB = 13; + repeated uint32 expireCondList = 13; bool is_finished = 6; repeated uint32 EOPFKDBBOII = 894; repeated ActivityWatcherInfo watcher_info_list = 8; @@ -97,7 +97,7 @@ message ActivityInfo { bool OEBHLKFBCOG = 696; bool LGKOJCGDGBH = 1736; uint32 begin_time = 9; - repeated uint32 DDBJAKPEPLC = 778; + repeated uint32 takenRewardList = 778; uint32 first_day_start_time = 1677; uint32 cur_score = 1005; bool EFJOLIOFLBG = 514; diff --git a/proto/AddNoGachaAvatarCardNotify.proto b/proto/AddNoGachaAvatarCardNotify.proto index d09638fc..3904eabd 100644 --- a/proto/AddNoGachaAvatarCardNotify.proto +++ b/proto/AddNoGachaAvatarCardNotify.proto @@ -8,10 +8,10 @@ import "AddNoGachaAvatarCardTransferItem.proto"; // CmdId: 1787 message AddNoGachaAvatarCardNotify { uint32 reason = 3; - uint32 AIGPMLAPMBL = 14; + uint32 initial_level = 14; uint32 item_id = 15; uint32 avatar_id = 1; - uint32 KNGMKKHPDBJ = 4; + uint32 initial_promote_level = 4; bool is_transfer_to_item = 9; repeated AddNoGachaAvatarCardTransferItem transfer_item_list = 6; } diff --git a/proto/AiSyncInfo.proto b/proto/AiSyncInfo.proto index 4888ea3a..ec68daa7 100644 --- a/proto/AiSyncInfo.proto +++ b/proto/AiSyncInfo.proto @@ -2,11 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - // Name: FCJLAGHOIFC message AiSyncInfo { uint32 entity_id = 10; - bool CJIBIGJNKKE = 6; - bool OOJFENIJJDB = 8; + bool is_self_killing = 6; + bool has_path_to_target = 8; } diff --git a/proto/AllWidgetDataNotify.proto b/proto/AllWidgetDataNotify.proto index f1ffabd6..36742590 100644 --- a/proto/AllWidgetDataNotify.proto +++ b/proto/AllWidgetDataNotify.proto @@ -14,12 +14,12 @@ import "WidgetSlotData.proto"; // Name: OMFAFJLJDPM // CmdId: 4300 message AllWidgetDataNotify { - repeated WidgetCoolDownData LCFJGCFMBPH = 7; + repeated WidgetCoolDownData coolDownGroupDataList = 7; LunchBoxData lunch_box_data = 10; repeated OneoffGatherPointDetectorData oneoff_gather_point_detector_data_list = 9; repeated ClientCollectorData client_collector_data_list = 12; WeatherWizardData weather_wizard_data = 15; - repeated WidgetCoolDownData PNKCMCMHCPL = 13; + repeated WidgetCoolDownData normalCoolDownDataList = 13; repeated WidgetSlotData slot_list = 4; uint32 next_anchor_point_usable_time = 8; SkyCrystalDetectorData sky_crystal_detector_data = 3; diff --git a/proto/AvatarSkillChangeNotify.proto b/proto/AvatarSkillChangeNotify.proto index 06a811da..1d73c4ad 100644 --- a/proto/AvatarSkillChangeNotify.proto +++ b/proto/AvatarSkillChangeNotify.proto @@ -6,11 +6,11 @@ option java_package = "emu.grasscutter.net.proto"; // Name: KLNBJHKJCIN // CmdId: 1042 message AvatarSkillChangeNotify { - uint32 PJNELCLHMOH = 10; + uint32 avatarSkillId = 10; uint64 avatar_guid = 9; uint32 entity_id = 8; - uint32 MFNMHANCIMP = 3; - uint32 OCEFCGKBPPE = 14; + uint32 curLevel = 3; + uint32 oldLevel = 14; uint32 skill_depot_id = 4; } diff --git a/proto/AvatarSkillUpgradeRsp.proto b/proto/AvatarSkillUpgradeRsp.proto index bb29bba8..985e5758 100644 --- a/proto/AvatarSkillUpgradeRsp.proto +++ b/proto/AvatarSkillUpgradeRsp.proto @@ -6,10 +6,10 @@ option java_package = "emu.grasscutter.net.proto"; // Name: IFLPKKOCJCM // CmdId: 1091 message AvatarSkillUpgradeRsp { - uint32 MFNMHANCIMP = 12; + uint32 avatarSkillId = 12; uint64 avatar_guid = 3; - uint32 PJNELCLHMOH = 7; - uint32 OCEFCGKBPPE = 5; + uint32 oldLevel = 7; + uint32 curLevel = 5; int32 retcode = 15; } diff --git a/proto/AvatarUpgradeRsp.proto b/proto/AvatarUpgradeRsp.proto index b5d70693..6fbd6361 100644 --- a/proto/AvatarUpgradeRsp.proto +++ b/proto/AvatarUpgradeRsp.proto @@ -6,11 +6,11 @@ option java_package = "emu.grasscutter.net.proto"; // Name: FDBHCBMNCAI // CmdId: 1741 message AvatarUpgradeRsp { - uint32 MFNMHANCIMP = 3; - uint32 PJNELCLHMOH = 15; + uint32 oldLevel = 3; + uint32 curLevel = 15; int32 retcode = 1; uint64 avatar_guid = 13; - map GEKBLKPMJCG = 7; - map AFEDLAOGFOC = 12; + map oldFightPropMap = 7; + map curFightPropMap = 12; } diff --git a/proto/CPBMIAMDLPE.proto b/proto/CPBMIAMDLPE.proto deleted file mode 100644 index 4aa42c2a..00000000 --- a/proto/CPBMIAMDLPE.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - -// Name: CPBMIAMDLPE -enum CPBMIAMDLPE { - CPBMIAMDLPE_LFCBMJINCBF = 0; - CPBMIAMDLPE_GMAKOJPAOJC = 1; -} - diff --git a/proto/CardProductRewardNotify.proto b/proto/CardProductRewardNotify.proto index 7b7c6af7..b0b80bf7 100644 --- a/proto/CardProductRewardNotify.proto +++ b/proto/CardProductRewardNotify.proto @@ -6,8 +6,8 @@ option java_package = "emu.grasscutter.net.proto"; // Name: PKOMPHLMLED // CmdId: 4146 message CardProductRewardNotify { - uint32 MIBMBPJHBBM = 2; - uint32 LLBAKMPCPGI = 6; + uint32 hcoin = 2; + uint32 remainDays = 6; string product_id = 15; } diff --git a/proto/ChapterStateNotify.proto b/proto/ChapterStateNotify.proto index e25070dd..4680ea4c 100644 --- a/proto/ChapterStateNotify.proto +++ b/proto/ChapterStateNotify.proto @@ -2,26 +2,26 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "HLDDAIOAHPB.proto"; +import "ChapterState.proto"; // Name: EGGHDNJDFIM // CmdId: 427 message ChapterStateNotify { // Name: POAIPEHKEHE - message POAIPEHKEHE { - bool OOLKODOMBMM = 12; - uint32 PJDJCBIINIC = 11; + message NeedPlayerLevel { + bool configNeedPlayerLevel = 12; + uint32 isLimit = 11; } // Name: OKNHDJOIJFI - message OKNHDJOIJFI { - bool OOLKODOMBMM = 10; - uint32 LENAHOJKKFP = 3; + message NeedBeginTime { + bool configNeedBeginTime = 10; + uint32 isLimit = 3; } - OKNHDJOIJFI JFOHACAIDHE = 14; + NeedBeginTime needBeginTime = 14; uint32 chapter_id = 7; - HLDDAIOAHPB FIMLGAGLJPO = 10; - POAIPEHKEHE HIJBMEKPPKJ = 8; + ChapterState chapterState = 10; + NeedPlayerLevel needPlayerLevel = 8; } diff --git a/proto/ChildQuest.proto b/proto/ChildQuest.proto index 7bd9ff91..24d5c5bc 100644 --- a/proto/ChildQuest.proto +++ b/proto/ChildQuest.proto @@ -2,11 +2,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - - - message ChildQuest { - uint32 questId = 5; - uint32 questConfigId = 10; - uint32 state = 12; + uint32 state = 1; + uint32 questConfigId = 14; + uint32 quest_id = 8; } diff --git a/proto/CombineRsp.proto b/proto/CombineRsp.proto index 7334403a..3e3f788e 100644 --- a/proto/CombineRsp.proto +++ b/proto/CombineRsp.proto @@ -7,11 +7,11 @@ import "ItemParam.proto"; // Name: BKPBJLHMEIG // CmdId: 637 message CombineRsp { - repeated ItemParam NOBMIMNDGLA = 9; - repeated ItemParam AKCCLGFBJMD = 13; + repeated ItemParam totalReturnItemList = 9; + repeated ItemParam totalExtraItemList = 13; uint64 avatar_guid = 10; - repeated ItemParam LOCKHJBEGDL = 6; - repeated ItemParam INKENHANDMB = 14; + repeated ItemParam totalRandomItemList = 6; + repeated ItemParam resultItemList = 14; repeated ItemParam cost_item_list = 5; uint32 combine_count = 1; int32 retcode = 7; diff --git a/proto/CompoundDataNotify.proto b/proto/CompoundDataNotify.proto index 7e6afd40..292e5ce1 100644 --- a/proto/CompoundDataNotify.proto +++ b/proto/CompoundDataNotify.proto @@ -7,7 +7,7 @@ import "CompoundQueueData.proto"; // Name: IDHHJMJOKKD // CmdId: 118 message CompoundDataNotify { - repeated uint32 unlock_compound_list = 5; - repeated CompoundQueueData compound_que_data_list = 3; + repeated uint32 unlockCompoundList = 5; + repeated CompoundQueueData compoundQueueDataList = 3; } diff --git a/proto/DailyDungeonEntryInfo.proto b/proto/DailyDungeonEntryInfo.proto index bdff3323..3fd0c85d 100644 --- a/proto/DailyDungeonEntryInfo.proto +++ b/proto/DailyDungeonEntryInfo.proto @@ -7,8 +7,8 @@ import "DungeonEntryInfo.proto"; // Name: ILBGCAPNDLF message DailyDungeonEntryInfo { uint32 recommend_dungeon_id = 3; - uint32 GGGEMNHNCNJ = 1; - uint32 MNDEGGLANGF = 14; + uint32 dungeonEntryConfigId = 1; + uint32 dungeonEntryId = 14; DungeonEntryInfo recommend_dungeon_entry_info = 7; } diff --git a/proto/DestroyMaterialReq.proto b/proto/DestroyMaterialReq.proto index 56c15f86..3b0e1496 100644 --- a/proto/DestroyMaterialReq.proto +++ b/proto/DestroyMaterialReq.proto @@ -2,11 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "MaterilaInfo.proto"; +import "MaterialInfo.proto"; // Name: NNCOOJDHINJ // CmdId: 608 message DestroyMaterialReq { - repeated MaterilaInfo material_list = 12; + repeated MaterialInfo material_list = 12; } diff --git a/proto/DoGachaReq.proto b/proto/DoGachaReq.proto index 0a88fd13..95916ea8 100644 --- a/proto/DoGachaReq.proto +++ b/proto/DoGachaReq.proto @@ -6,10 +6,10 @@ option java_package = "emu.grasscutter.net.proto"; // Name: KBMLDGNEKHA // CmdId: 1554 message DoGachaReq { - uint32 PKCLGOCJPLN = 3; - uint32 DGIFMDIADJF = 6; - uint32 NMKGGDOKHLF = 12; - uint32 HKJAAPBGNEI = 5; + uint32 gachaScheduleId = 3; + uint32 gachaTimes = 6; + uint32 gachaRandom = 12; + uint32 gachaType = 5; string gacha_tag = 14; } diff --git a/proto/DoGachaRsp.proto b/proto/DoGachaRsp.proto index acafa9ae..3c5332a9 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 +// Name: LEFDKOLFJKL (3.4) // CmdId: 1564 message DoGachaRsp { - uint32 DNGKJJJHNEN = 4; - uint32 OPHLINLNOEA = 1898; - uint32 HKJAAPBGNEI = 13; - uint32 NMKGGDOKHLF = 2; - bool HNAFDALMKFN = 312; - uint32 BCKMNIBIPHO = 1; - uint32 KJHBJPGBOFP = 11; - uint32 DGIFMDIADJF = 9; - uint32 LMLCPMOOKKA = 15; - repeated GachaItem gacha_item_list = 10; - uint32 LJJKNKCHHFM = 7; - uint32 EAMKGBGKNMO = 5; - uint32 AINLBCOKANA = 12; - uint32 NOKMFFEIDNH = 1918; - int32 retcode = 14; - uint32 MGFKNHHNMAE = 3; - bool HCCENOGKOOG = 1938; - uint32 GNIDAANOBDP = 6; - uint32 FLDFHFNHNFC = 8; + uint32 leftGachaTimes = 7; + uint32 newGachaRandom = 9; + uint32 gachaType = 13; + uint32 gachaTimesLimit = 4; + uint32 costItemNum = 8; + repeated GachaItem gachaItemList = 3; + uint32 wishProgress = 12; + uint32 dailyGachaTimes = 112; + uint32 tenCostItemId = 5; + uint32 wishItemId = 10; + uint32 curScheduleDailyGachaTimes = 475; + uint32 tenCostItemNum = 11; + int32 retcode = 14; + uint32 gachaTimes = 15; + bool Unk3300_HBILIAEIHNK = 1849; + bool Unk3300_OHFMHIHJHPJ = 397; + uint32 gachaScheduleId = 2; + uint32 wishMaxProgress = 1; + uint32 costItemId = 6; } diff --git a/proto/DungeonChallengeFinishNotify.proto b/proto/DungeonChallengeFinishNotify.proto index 034c87c3..37e2fc7a 100644 --- a/proto/DungeonChallengeFinishNotify.proto +++ b/proto/DungeonChallengeFinishNotify.proto @@ -12,10 +12,10 @@ import "StrengthenPointData.proto"; // Name: CHPLAGEPIEC // CmdId: 956 message DungeonChallengeFinishNotify { - uint32 GIDCANHMHNG = 1; + uint32 challengeRecordType = 1; uint32 challenge_index = 11; ChallengeFinishType finish_type = 10; - uint32 LLGLNCOOMPM = 15; + uint32 currentValue = 15; bool is_success = 4; map strengthen_point_data_map = 6; uint32 time_cost = 3; diff --git a/proto/EntityFightPropChangeReasonNotify.proto b/proto/EntityFightPropChangeReasonNotify.proto index 04f50097..69453026 100644 --- a/proto/EntityFightPropChangeReasonNotify.proto +++ b/proto/EntityFightPropChangeReasonNotify.proto @@ -2,8 +2,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "CPBMIAMDLPE.proto"; -import "GFDBMHNEOFL.proto"; +import "ChangeHpReason.proto"; +import "ChangeEnergyReason.proto"; import "PropChangeReason.proto"; // Name: CGLFHNCCBKJ @@ -11,8 +11,8 @@ import "PropChangeReason.proto"; message EntityFightPropChangeReasonNotify { repeated uint32 param_list = 12; uint32 prop_type = 9; - CPBMIAMDLPE FHLNGJNGPNN = 14; - GFDBMHNEOFL KAKKINHPKPN = 10; + ChangeHpReason changeHpReason = 14; + ChangeEnergyReason changeEnergyReason = 10; PropChangeReason reason = 11; float prop_delta = 15; uint32 entity_id = 6; diff --git a/proto/EvtAvatarStandUpNotify.proto b/proto/EvtAvatarStandUpNotify.proto index e8a0abd1..227d91c0 100644 --- a/proto/EvtAvatarStandUpNotify.proto +++ b/proto/EvtAvatarStandUpNotify.proto @@ -8,7 +8,7 @@ option java_package = "emu.grasscutter.net.proto"; message EvtAvatarStandUpNotify { uint64 chair_id = 5; uint32 entity_id = 4; - int32 HKCNKFCDGIP = 7; - int32 DBKDLMNLNKM = 1; + int32 performId = 7; + int32 direction = 1; } diff --git a/proto/ForgeQueueManipulateRsp.proto b/proto/ForgeQueueManipulateRsp.proto index e466d570..36d1e0b1 100644 --- a/proto/ForgeQueueManipulateRsp.proto +++ b/proto/ForgeQueueManipulateRsp.proto @@ -9,9 +9,9 @@ import "ItemParam.proto"; // CmdId: 688 message ForgeQueueManipulateRsp { int32 retcode = 4; - repeated ItemParam LJGHMOMAFGD = 13; + repeated ItemParam extraOutputItemList = 13; ForgeQueueManipulateType manipulate_type = 8; - repeated ItemParam PODPGGGOFGP = 3; - repeated ItemParam CBLILOJFLPO = 11; + repeated ItemParam returnItemList = 3; + repeated ItemParam outputItemList = 11; } diff --git a/proto/GFDBMHNEOFL.proto b/proto/GFDBMHNEOFL.proto deleted file mode 100644 index 796b862c..00000000 --- a/proto/GFDBMHNEOFL.proto +++ /dev/null @@ -1,39 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - -// Name: GFDBMHNEOFL -enum GFDBMHNEOFL { - GFDBMHNEOFL_FACMHLCLLKF = 0; - GFDBMHNEOFL_OOHFKLLKMNG = 1; - GFDBMHNEOFL_EAMKILHABNJ = 2; - GFDBMHNEOFL_KEGIIGBAEAJ = 3; - GFDBMHNEOFL_NNCGHENPFPJ = 4; - GFDBMHNEOFL_JBOMCLLEKJL = 5; - GFDBMHNEOFL_FAHPOIFJCAG = 6; - GFDBMHNEOFL_LIHBFKJMJMD = 7; - GFDBMHNEOFL_AMCDBOEDEFI = 8; - GFDBMHNEOFL_CNKHLBBNHDD = 9; - GFDBMHNEOFL_JBALMLPMBGF = 10; - GFDBMHNEOFL_JFLKFBCEMGL = 11; - GFDBMHNEOFL_NONDNBOBGOJ = 12; - GFDBMHNEOFL_LPKIKOLFALO = 13; - GFDBMHNEOFL_NPMOGBPADIF = 14; - GFDBMHNEOFL_PDGNPLMPGEH = 15; - GFDBMHNEOFL_KJIDKLPNMCF = 16; - GFDBMHNEOFL_GDFBCJELGKJ = 17; - GFDBMHNEOFL_GOKHGACJBNM = 18; - GFDBMHNEOFL_CHKJLBFICDF = 19; - GFDBMHNEOFL_DCCLKMDCFEB = 51; - GFDBMHNEOFL_LJPDMOGCBIH = 101; - GFDBMHNEOFL_BAHPKAJHAOH = 102; - GFDBMHNEOFL_EENLJFHJPMF = 103; - GFDBMHNEOFL_PHKAEPJOAKK = 104; - GFDBMHNEOFL_CDJKCLFEONL = 105; - GFDBMHNEOFL_FIADIEHLMGH = 106; - GFDBMHNEOFL_GIEMLFKFCAP = 107; - GFDBMHNEOFL_EFKLKMBIMHK = 108; - GFDBMHNEOFL_NDKAOAHDIMN = 109; -} - diff --git a/proto/GachaWishReq.proto b/proto/GachaWishReq.proto index 9413d917..1e7d15e5 100644 --- a/proto/GachaWishReq.proto +++ b/proto/GachaWishReq.proto @@ -6,8 +6,8 @@ option java_package = "emu.grasscutter.net.proto"; // Name: HEEOPFJGOKN // CmdId: 1514 message GachaWishReq { - uint32 NMKGGDOKHLF = 9; + uint32 gachaScheduleId = 9; uint32 item_id = 11; - uint32 DGIFMDIADJF = 5; + uint32 gachaType = 5; } diff --git a/proto/GachaWishRsp.proto b/proto/GachaWishRsp.proto index a3bfb6a8..d2d8e5ca 100644 --- a/proto/GachaWishRsp.proto +++ b/proto/GachaWishRsp.proto @@ -6,11 +6,11 @@ option java_package = "emu.grasscutter.net.proto"; // Name: KCCCENPGEHL // CmdId: 1534 message GachaWishRsp { - uint32 DNGKJJJHNEN = 3; - uint32 DGIFMDIADJF = 10; - uint32 KJHBJPGBOFP = 8; - uint32 NMKGGDOKHLF = 5; + uint32 wishProgress = 3; + uint32 gachaScheduleId = 10; + uint32 wishMaxProgress = 8; + uint32 gachaType = 5; int32 retcode = 13; - uint32 LJJKNKCHHFM = 9; + uint32 wishItemId = 9; } diff --git a/proto/GetCompoundDataRsp.proto b/proto/GetCompoundDataRsp.proto index ab49fd18..3996a209 100644 --- a/proto/GetCompoundDataRsp.proto +++ b/proto/GetCompoundDataRsp.proto @@ -7,8 +7,8 @@ import "CompoundQueueData.proto"; // Name: KFNFMKJEDPG // CmdId: 105 message GetCompoundDataRsp { - repeated CompoundQueueData compound_que_data_list = 14; - repeated uint32 unlock_compound_list = 13; + repeated CompoundQueueData compoundQueueDataList = 14; + repeated uint32 unlockCompoundList = 13; int32 retcode = 2; } diff --git a/proto/GetPlayerTokenRsp.proto b/proto/GetPlayerTokenRsp.proto index 8023e88f..7cdb906f 100644 --- a/proto/GetPlayerTokenRsp.proto +++ b/proto/GetPlayerTokenRsp.proto @@ -34,7 +34,7 @@ message GetPlayerTokenRsp { string secret_key = 7; string account_uid = 3; uint32 BGELCCHCJDG = 1043; - uint32 LBCGKJHALNG = 12; + uint32 blackUidEndTime = 12; string client_ip_str = 1563; uint32 reg_platform = 751; string birthday = 1398; diff --git a/proto/HLDDAIOAHPB.proto b/proto/HLDDAIOAHPB.proto deleted file mode 100644 index 4f6453b8..00000000 --- a/proto/HLDDAIOAHPB.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - -// Name: HLDDAIOAHPB -enum HLDDAIOAHPB { - HLDDAIOAHPB_MLBFMJIBJEP = 0; - HLDDAIOAHPB_LELADOBHILG = 1; - HLDDAIOAHPB_HMCFGEMMPNJ = 2; - HLDDAIOAHPB_KPACNJFMKHM = 3; -} - diff --git a/proto/MapMarkFromType.proto b/proto/MapMarkFromType.proto index cef6146f..ede42420 100644 --- a/proto/MapMarkFromType.proto +++ b/proto/MapMarkFromType.proto @@ -2,11 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - // Name: NPBCGNLAONB enum MapMarkFromType { - MAP_MARK_FROM_TYPE_NOE = 0; - MAP_MARK_FROM_TYPE_MONSTER = 1; - MAP_MARK_FROM_TYPE_QUEST = 2; + MAP_MARK_FROM_TYPE_NONE = 0; + MAP_MARK_FROM_TYPE_MONSTER = 1; + MAP_MARK_FROM_TYPE_QUEST = 2; } diff --git a/proto/ParentQuest.proto b/proto/ParentQuest.proto index e572de08..e7966461 100644 --- a/proto/ParentQuest.proto +++ b/proto/ParentQuest.proto @@ -2,22 +2,22 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "DDGEINCPPIK.proto"; +import "ParentQuestRandomInfo.proto"; import "InferencePageInfo.proto"; -import "JLADMBEDMHP.proto"; +import "ChildQuest.proto"; // Name: NMIGKDMCKHK message ParentQuest { bool is_random = 1; - repeated DDGEINCPPIK AAGHMGIMKJM = 13; + repeated ParentQuestRandomInfo randomInfo = 13; repeated int32 quest_var = 2; repeated InferencePageInfo inference_page_list = 4; - uint32 DOCNJADOIPJ = 5; - uint32 FLPFBJMELEB = 9; + uint32 parentQuestState = 5; + uint32 questVarSeq = 9; uint64 video_key = 6; map time_var_map = 14; bool is_finished = 8; uint32 parent_quest_id = 11; - JLADMBEDMHP DODJBLHPEAD = 3; + ChildQuest childQuestList = 3; } diff --git a/proto/ShopGoods.proto b/proto/ShopGoods.proto index 1c18f886..4a74d718 100644 --- a/proto/ShopGoods.proto +++ b/proto/ShopGoods.proto @@ -4,27 +4,27 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; -// Name: EFLDHGLFIDD +// Name: EFLDHGLFIDD (3.4) message ShopGoods { - uint32 OCIGJMBPIMN = 7; - uint32 JAFFFHILNCD = 1817; - ItemParam goods_item = 8; - uint32 end_time = 12; - uint32 JPCBEPKDBGA = 14; - repeated uint32 pre_goods_id_list = 3; - uint32 ALOPKNFLFBE = 570; - uint32 goodsId = 4; - uint32 GOMAIIJPDKD = 9; - uint32 HBAEGHNDCKB = 11; - uint32 KKINAOMJKAD = 505; - uint32 FGACANHEBMH = 6; - uint32 begin_time = 5; - uint32 next_refresh_time = 10; - repeated ItemParam cost_item_list = 1; - uint32 LMOPLEOOIJM = 1467; - uint32 LLJPJOEMPFE = 15; - uint32 MIBMBPJHBBM = 2; - uint32 LLCOFLCEKDB = 1344; - uint32 CABPCJFGBLJ = 13; + uint32 Unk3300_MBGOMHNBHMG = 655; + uint32 maxLevel = 3; + uint32 hcoin = 13; + uint32 secondarySheetId = 363; + uint32 scoin = 11; + uint32 goodsId = 2; + uint32 buyLimit = 10; + repeated uint32 preGoodsIdList = 12; + ItemParam goodsItem = 6; + repeated ItemParam costItemList = 7; + uint32 singleLimit = 424; + uint32 nextRefreshTime = 1; + uint32 Unk3300_NJCPAJBCEPH = 182; + uint32 boughtNum = 4; + uint32 Unk3300_OMKIFIMDGDN = 636; + uint32 minLevel = 14; + uint32 endTime = 15; + uint32 beginTime = 8; + uint32 disableType = 9; + uint32 mcoin = 5; }