From 78e8b1bdb36fcfe1c16b42f79e1d453c2f17d95a Mon Sep 17 00:00:00 2001 From: Akbar Yahya Date: Wed, 1 Mar 2023 04:24:57 +0800 Subject: [PATCH] update proto 3.5 (part 4) --- proto/AnnounceData.proto | 10 ++-- proto/AvatarSkillUpgradeReq.proto | 6 +-- proto/CBGLBMMCPPK.proto | 12 ----- proto/CompoundQueueData.proto | 8 +-- proto/CookRecipeData.proto | 4 +- proto/ForgeQueueData.proto | 10 ++-- proto/FurnitureMakeData.proto | 12 ++--- proto/FurnitureMakeSlot.proto | 4 +- proto/GachaInfo.proto | 54 +++++++++---------- proto/GachaItem.proto | 4 +- proto/GetGachaInfoRsp.proto | 8 +-- proto/GetScenePointRsp.proto | 27 +++++----- proto/HomeBasicInfo.proto | 10 ++-- proto/HomeLimitedShopInfo.proto | 14 +++-- proto/HomeLimitedShopInfoNotify.proto | 4 +- proto/HomeLimitedShopInfoRsp.proto | 4 +- proto/HomeMarkPointSceneData.proto | 4 +- proto/HomeResourceNotify.proto | 6 +-- proto/HomeResourceTakeFetterExpRsp.proto | 4 +- proto/HomeSceneArrangementInfo.proto | 10 ++-- proto/ILEIPGLHFAP.proto | 16 ------ proto/InvestigationMonster.proto | 18 +++---- proto/KPHNGIEIKOJ.proto | 13 ----- proto/MIEFECKEOMK.proto | 15 ------ proto/MailData.proto | 26 ++++----- proto/MaterialInfo.proto | 8 ++- proto/MaterilaInfo.proto | 11 ---- proto/McoinExchangeHcoinReq.proto | 4 +- proto/PersonalLineAllDataRsp.proto | 4 +- proto/PlayerCompoundMaterialRsp.proto | 2 +- proto/PlayerCookReq.proto | 8 +-- proto/PlayerCookRsp.proto | 4 +- proto/PlayerHomeCompInfo.proto | 4 +- proto/ProudSkillExtraLevelNotify.proto | 6 +-- proto/QueryCodexMonsterBeKilledNumRsp.proto | 4 +- proto/Quest.proto | 29 +++++----- proto/QuestProgressUpdateNotify.proto | 4 +- proto/ReliquaryUpgradeRsp.proto | 10 ++-- proto/ResinChangeNotify.proto | 4 +- proto/ScenePointUnlockNotify.proto | 4 +- .../ServerCondMeetQuestListUpdateNotify.proto | 4 +- proto/TakeFurnitureMakeRsp.proto | 4 +- proto/TowerAllDataRsp.proto | 36 ++++++------- 43 files changed, 189 insertions(+), 264 deletions(-) delete mode 100644 proto/CBGLBMMCPPK.proto delete mode 100644 proto/ILEIPGLHFAP.proto delete mode 100644 proto/KPHNGIEIKOJ.proto delete mode 100644 proto/MIEFECKEOMK.proto delete mode 100644 proto/MaterilaInfo.proto diff --git a/proto/AnnounceData.proto b/proto/AnnounceData.proto index 80f94053..902bada3 100644 --- a/proto/AnnounceData.proto +++ b/proto/AnnounceData.proto @@ -6,13 +6,13 @@ option java_package = "emu.grasscutter.net.proto"; // Name: NDDGEOMCBEE message AnnounceData { bool is_center_system_last_5_every_minutes = 8; - uint32 HJNFJIEBMEL = 12; + uint32 countDownFrequency = 12; uint32 end_time = 15; uint32 config_id = 11; - string LJCFLKABNFM = 3; - string POMBEEAPGDL = 5; - string MBGAKKMFHFF = 6; - uint32 BLHPFGPJAFE = 7; + string countDownText = 3; + string dungeonConfirmText = 5; + string centerSystemText = 6; + uint32 centerSystemFrequency = 7; uint32 begin_time = 13; } diff --git a/proto/AvatarSkillUpgradeReq.proto b/proto/AvatarSkillUpgradeReq.proto index 32d6a19c..be955a26 100644 --- a/proto/AvatarSkillUpgradeReq.proto +++ b/proto/AvatarSkillUpgradeReq.proto @@ -6,8 +6,8 @@ option java_package = "emu.grasscutter.net.proto"; // Name: HDNOGHLJFHJ // CmdId: 1007 message AvatarSkillUpgradeReq { - uint32 OCEFCGKBPPE = 8; - uint32 MFNMHANCIMP = 4; - uint64 avatar_guid = 9; + uint32 avatarSkillId = 8; + uint32 avatar_guid = 4; + uint64 oldLevel = 9; } diff --git a/proto/CBGLBMMCPPK.proto b/proto/CBGLBMMCPPK.proto deleted file mode 100644 index 60c08c48..00000000 --- a/proto/CBGLBMMCPPK.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - -// Name: CBGLBMMCPPK -message CBGLBMMCPPK { - string title = 1; - string content = 2; - string NBNLJCLPGEA = 3; -} - diff --git a/proto/CompoundQueueData.proto b/proto/CompoundQueueData.proto index c4c14299..2133632e 100644 --- a/proto/CompoundQueueData.proto +++ b/proto/CompoundQueueData.proto @@ -5,9 +5,9 @@ option java_package = "emu.grasscutter.net.proto"; // Name: HKALLDBLCCJ message CompoundQueueData { - uint32 OKEOKOHAJBL = 15; - uint32 OBDIHDNMJJI = 5; - uint32 EMJEOIBIOIG = 11; - uint32 compound_id = 14; + uint32 outputCount = 15; + uint32 compoundId = 5; + uint32 waitCount = 11; + uint32 outputTime = 14; } diff --git a/proto/CookRecipeData.proto b/proto/CookRecipeData.proto index 6d74ecfa..acd23c7b 100644 --- a/proto/CookRecipeData.proto +++ b/proto/CookRecipeData.proto @@ -5,7 +5,7 @@ option java_package = "emu.grasscutter.net.proto"; // Name: PGKMKCDIPCM message CookRecipeData { - uint32 DIIJPMJFNOL = 14; - uint32 EJKLKNPMHMC = 4; + uint32 recipeId = 14; + uint32 proficiency = 4; } diff --git a/proto/ForgeQueueData.proto b/proto/ForgeQueueData.proto index 4f2a50ee..2e5eebe4 100644 --- a/proto/ForgeQueueData.proto +++ b/proto/ForgeQueueData.proto @@ -5,12 +5,12 @@ option java_package = "emu.grasscutter.net.proto"; // Name: DBDNABMNFAO message ForgeQueueData { - uint32 NEGHCLJNONO = 11; + uint32 queueId = 11; uint32 avatar_id = 13; uint32 forge_id = 3; - uint32 IJIGJHCPBIO = 6; - uint32 DPLHKMGEIKA = 5; - uint32 GFMEEGMBJKI = 2; - uint32 KOLFAOPJMFA = 10; + uint32 unfinishCount = 6; + uint32 finishCount = 5; + uint32 nextFinishTimestamp = 2; + uint32 totalFinishTimestamp = 10; } diff --git a/proto/FurnitureMakeData.proto b/proto/FurnitureMakeData.proto index 5e90efe8..cd31b6bb 100644 --- a/proto/FurnitureMakeData.proto +++ b/proto/FurnitureMakeData.proto @@ -3,10 +3,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; message FurnitureMakeData { - uint32 durTime = 5; - uint32 makeId = 6; - fixed32 beginTime = 13; - fixed32 accelerateTime = 9; - uint32 index = 10; - uint32 avatarId = 1; + uint32 avatar_id = 5; + uint32 begin_time = 3; + uint32 durTime = 15; + uint32 accelerateTime = 6; + uint32 index = 12; + uint32 make_id = 4; } diff --git a/proto/FurnitureMakeSlot.proto b/proto/FurnitureMakeSlot.proto index 577a51a2..5dbc1458 100644 --- a/proto/FurnitureMakeSlot.proto +++ b/proto/FurnitureMakeSlot.proto @@ -2,10 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "MIEFECKEOMK.proto"; +import "FurnitureMakeData.proto"; // Name: DIIKFAIPKGG message FurnitureMakeSlot { - repeated MIEFECKEOMK PEIPFAEPBPO = 1; + repeated FurnitureMakeData furnitureMakeDataList = 1; } diff --git a/proto/GachaInfo.proto b/proto/GachaInfo.proto index 10120bd5..25182d99 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 +// Name: LIBILADMDKG (3.3) message GachaInfo { - bool is_new_wish = 1693; - uint32 FLDFHFNHNFC = 4; - repeated GachaUpInfo gacha_up_info_list = 1953; - uint32 KJHBJPGBOFP = 911; - uint32 MGFKNHHNMAE = 10; - string ABKGLLAGAIN = 8; - uint32 DGIFMDIADJF = 15; - string JENKDDLIKBK = 5; - uint32 MJPPIKFJBBF = 11; - uint32 NOKMFFEIDNH = 1245; - uint32 GNIDAANOBDP = 7; - repeated uint32 GLGFIGNCBPL = 1564; - string NBGBMJJAICB = 1128; - string LCHOOLMEHIN = 12; - uint32 schedule_id = 2; - string CINCAKDODOD = 1; - uint32 end_time = 3; - repeated uint32 IIGOCJAHJDO = 446; - uint32 AINLBCOKANA = 9; - uint32 DNGKJJJHNEN = 1298; - string ANPADHPPJNE = 67; - uint32 BCKMNIBIPHO = 14; - uint32 LMLCPMOOKKA = 13; - uint32 begin_time = 6; - string FGJKAIDJJEH = 1718; - uint32 LJJKNKCHHFM = 1755; + string gachaPrefabPath = 9; + uint32 scheduleId = 2; + repeated uint32 displayUp5ItemList = 1851; + uint32 gachaSortId = 6; + repeated uint32 displayUp4ItemList = 279; + bool isNewWish = 869; + uint32 gachaTimesLimit = 11; + uint32 costItemNum = 14; + string gachaRecordUrl = 7; + string titleTextmap = 1228; + repeated GachaUpInfo gachaUpInfoList = 1836; + string gachaPreviewPrefabPath = 8; + uint32 curScheduleDailyGachaTimes = 48; + uint32 gachaType = 1; + uint32 tenCostItemId = 4; + uint32 leftGachaTimes = 12; + string gachaProbUrl = 5; + string gachaProbUrlOversea = 765; + uint32 wishItemId = 309; + uint32 tenCostItemNum = 10; + uint32 wishMaxProgress = 1669; + uint32 costItemId = 13; + uint32 beginTime = 15; + string gachaRecordUrlOversea = 1004; + uint32 wishProgress = 246; + uint32 endTime = 3; } diff --git a/proto/GachaItem.proto b/proto/GachaItem.proto index 12033341..d271c221 100644 --- a/proto/GachaItem.proto +++ b/proto/GachaItem.proto @@ -9,8 +9,8 @@ import "ItemParam.proto"; message GachaItem { repeated ItemParam token_item_list = 13; ItemParam gacha_item = 15; - bool ECDEIIANGJN = 4; + bool isGachaItemNew = 4; repeated GachaTransferItem transfer_items = 7; - bool HFDPDGIDDLB = 10; + bool isFlashCard = 10; } diff --git a/proto/GetGachaInfoRsp.proto b/proto/GetGachaInfoRsp.proto index 73822deb..159c6b26 100644 --- a/proto/GetGachaInfoRsp.proto +++ b/proto/GetGachaInfoRsp.proto @@ -9,9 +9,9 @@ import "GachaInfo.proto"; message GetGachaInfoRsp { repeated GachaInfo gacha_info_list = 6; int32 retcode = 13; - bool HNAFDALMKFN = 11; - bool HCCENOGKOOG = 1; - uint32 PKCLGOCJPLN = 14; - uint32 OPHLINLNOEA = 8; + bool Unk3300_OHFMHIHJHPJ = 11; + bool Unk3300_HBILIAEIHNK = 1; + uint32 gachaRandom = 14; + uint32 dailyGachaTimes = 8; } diff --git a/proto/GetScenePointRsp.proto b/proto/GetScenePointRsp.proto index c619c875..e3e229a3 100644 --- a/proto/GetScenePointRsp.proto +++ b/proto/GetScenePointRsp.proto @@ -3,21 +3,20 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Name: ODCLFBBMOFA +// Name: ODCLFBBMOFA (3.4) // CmdId: 229 message GetScenePointRsp { - repeated uint32 LHGAOJELAMA = 3; - repeated uint32 FKDLJELPPOJ = 13; - int32 retcode = 2; - repeated uint32 hide_point_list = 12; - repeated uint32 LLLIACPHNEH = 7; - uint32 belong_uid = 8; - repeated uint32 KBGDANIJLFK = 11; - repeated uint32 LEAMLBEEBMN = 14; - bool PGBKOMBKBKG = 5; - repeated uint32 JOMDNANCHND = 10; - repeated uint32 HJLALADBFAC = 15; - uint32 scene_id = 6; - repeated uint32 unlocked_point_list = 4; + repeated uint32 lockedPointList = 7; + repeated uint32 notInteractDungeonEntryList = 10; + int32 retcode = 2; + repeated uint32 toBeExploreDungeonEntryList = 13; + uint32 belongUid = 6; + repeated uint32 hidePointList = 3; + repeated uint32 unlockAreaList = 9; + repeated uint32 unlockedPointList = 12; + repeated uint32 notExploredDungeonEntryList = 4; + repeated uint32 unhidePointList = 5; + uint32 sceneId = 14; + repeated uint32 groupUnlimitPointList = 1; } diff --git a/proto/HomeBasicInfo.proto b/proto/HomeBasicInfo.proto index 7b498e50..e946a35d 100644 --- a/proto/HomeBasicInfo.proto +++ b/proto/HomeBasicInfo.proto @@ -2,17 +2,17 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "ILEIPGLHFAP.proto"; +import "HomeLimitedShopInfo.proto"; // Name: KHJDJONHPEI message HomeBasicInfo { uint32 level = 14; uint64 exp = 8; - uint32 FBNCMGADPOF = 3; + uint32 curRoomSceneId = 3; string owner_nick_name = 7; - uint32 PGOLLEEPPFI = 2; - ILEIPGLHFAP AOAKNDCEMKD = 5; - uint32 PGOONNIGDEH = 6; + uint32 curModuleId = 2; + HomeLimitedShopInfo limitedShopInfo = 5; + uint32 homeOwnerUid = 6; bool is_in_edit_mode = 9; } diff --git a/proto/HomeLimitedShopInfo.proto b/proto/HomeLimitedShopInfo.proto index 62c16c46..3a60b551 100644 --- a/proto/HomeLimitedShopInfo.proto +++ b/proto/HomeLimitedShopInfo.proto @@ -2,15 +2,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - - import "Vector.proto"; message HomeLimitedShopInfo { - fixed32 nextGuestOpenTime = 14; - uint32 uid = 4; - Vector djinnRot = 12; - fixed32 nextCloseTime = 2; - Vector djinnPos = 6; - fixed32 nextOpenTime = 15; + uint32 nextGuestOpenTime = 12; + uint32 nextOpenTime = 11; + Vector djinnPos = 1; + uint32 nextCloseTime = 6; + uint32 uid = 14; + Vector djinnRot = 9; } diff --git a/proto/HomeLimitedShopInfoNotify.proto b/proto/HomeLimitedShopInfoNotify.proto index 36b9c42b..839d5b38 100644 --- a/proto/HomeLimitedShopInfoNotify.proto +++ b/proto/HomeLimitedShopInfoNotify.proto @@ -2,11 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "ILEIPGLHFAP.proto"; +import "HomeLimitedShopInfo.proto"; // Name: ELMECFHEBMD // CmdId: 4584 message HomeLimitedShopInfoNotify { - ILEIPGLHFAP GKOFIJJACGA = 11; + HomeLimitedShopInfo shopInfo = 11; } diff --git a/proto/HomeLimitedShopInfoRsp.proto b/proto/HomeLimitedShopInfoRsp.proto index c6657a70..51e10b72 100644 --- a/proto/HomeLimitedShopInfoRsp.proto +++ b/proto/HomeLimitedShopInfoRsp.proto @@ -2,12 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "ILEIPGLHFAP.proto"; +import "HomeLimitedShopInfo.proto"; // Name: PMAGBEFIIEL // CmdId: 4791 message HomeLimitedShopInfoRsp { int32 retcode = 6; - ILEIPGLHFAP GKOFIJJACGA = 10; + HomeLimitedShopInfo shopInfo = 10; } diff --git a/proto/HomeMarkPointSceneData.proto b/proto/HomeMarkPointSceneData.proto index dbfcf176..411ce409 100644 --- a/proto/HomeMarkPointSceneData.proto +++ b/proto/HomeMarkPointSceneData.proto @@ -7,10 +7,10 @@ import "Vector.proto"; // Name: LKEBHBGDDFA message HomeMarkPointSceneData { - Vector CBEFGODKPHB = 14; + Vector safePointPos = 14; uint32 module_id = 8; repeated HomeMarkPointFurnitureData furniture_list = 15; uint32 scene_id = 7; - Vector CNBJHDLMPCK = 6; + Vector teapotSpiritPos = 6; } diff --git a/proto/HomeResourceNotify.proto b/proto/HomeResourceNotify.proto index 0b99828e..706e268c 100644 --- a/proto/HomeResourceNotify.proto +++ b/proto/HomeResourceNotify.proto @@ -2,12 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "FHCMHOPJELB.proto"; +import "HomeResource.proto"; // Name: PEPNHFLKBLG // CmdId: 4753 message HomeResourceNotify { - FHCMHOPJELB DPCGMOMFNCD = 5; - FHCMHOPJELB ONMIIOIPGAI = 14; + HomeResource homeCoin = 5; + HomeResource fetterExp = 14; } diff --git a/proto/HomeResourceTakeFetterExpRsp.proto b/proto/HomeResourceTakeFetterExpRsp.proto index 1d0af326..65a8cef7 100644 --- a/proto/HomeResourceTakeFetterExpRsp.proto +++ b/proto/HomeResourceTakeFetterExpRsp.proto @@ -2,12 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "FHCMHOPJELB.proto"; +import "HomeResource.proto"; // Name: IIGPCKJGACD // CmdId: 4808 message HomeResourceTakeFetterExpRsp { int32 retcode = 2; - FHCMHOPJELB DPCGMOMFNCD = 9; + HomeResource fetterExp = 9; } diff --git a/proto/HomeSceneArrangementInfo.proto b/proto/HomeSceneArrangementInfo.proto index 93913f0c..c89a3046 100644 --- a/proto/HomeSceneArrangementInfo.proto +++ b/proto/HomeSceneArrangementInfo.proto @@ -8,16 +8,16 @@ import "Vector.proto"; // Name: FNABEPABCNG message HomeSceneArrangementInfo { - uint32 FLOONDGBJDK = 4; + uint32 comfortValue = 4; Vector djinnPos = 12; bool is_set_born_pos = 10; - repeated HomeFurnitureData Unk3300_GCHNAMHBPHG = 14; - repeated HomeFurnitureData mainHouse = 8; + repeated HomeFurnitureData Unk3400_CMBCIBBCMOK = 14; + repeated HomeFurnitureData Unk3400_EOHAHHFDAPI = 8; uint32 bgm_id = 11; Vector born_pos = 1; repeated HomeBlockArrangementInfo blockArrangementInfoList = 9; - uint32 OFMABBFOHMO = 3; - HomeFurnitureData Unk3300_HPCHPODNBPH = 15; + uint32 tmpVersion = 3; + HomeFurnitureData mainHouse = 15; uint32 scene_id = 2; Vector bornRot = 7; } diff --git a/proto/ILEIPGLHFAP.proto b/proto/ILEIPGLHFAP.proto deleted file mode 100644 index fd26b313..00000000 --- a/proto/ILEIPGLHFAP.proto +++ /dev/null @@ -1,16 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "Vector.proto"; - -// Name: ILEIPGLHFAP -message ILEIPGLHFAP { - uint32 CLCPIJBAOEA = 12; - uint32 PGENOLMDFEM = 11; - Vector CKJKPEEKOGG = 1; - uint32 NIDABDPMHHF = 6; - uint32 uid = 14; - Vector GMPJFCODOLK = 9; -} - diff --git a/proto/InvestigationMonster.proto b/proto/InvestigationMonster.proto index 9cc29e53..73470f40 100644 --- a/proto/InvestigationMonster.proto +++ b/proto/InvestigationMonster.proto @@ -7,16 +7,14 @@ import "WeeklyBossResinDiscountInfo.proto"; // Name: BIMILKAGLEC message InvestigationMonster { - // Name: HGJIJCEPLEE enum LockState { - LOCK_NONE = 0; - LOCK_QUEST = 1; + LOCK_STATE_NONE = 0; + LOCK_STATE_QUEST = 1; } - - uint32 HFEFHDCOMLB = 13; - bool MFGIMDGKDHH = 14; - uint32 NKADJMFOMGB = 3; - bool ABCENJAFGOF = 11; + uint32 bossChestNum = 13; + bool isAlive = 14; + uint32 maxBossChestNum = 3; + bool isAreaLocked = 11; WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 9; uint32 next_refresh_time = 8; uint32 group_id = 1206; @@ -24,10 +22,10 @@ message InvestigationMonster { uint32 scene_id = 7; uint32 level = 5; LockState lock_state = 10; - uint32 JPBJFFCFINC = 4; + uint32 refreshInterval = 4; uint32 resin = 15; uint32 monster_id = 308; - uint32 HDIBPIICNBB = 1; + uint32 nextBossChestRefreshTime = 1; uint32 city_id = 2; Vector pos = 12; } diff --git a/proto/KPHNGIEIKOJ.proto b/proto/KPHNGIEIKOJ.proto deleted file mode 100644 index a2f71291..00000000 --- a/proto/KPHNGIEIKOJ.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - -// Name: KPHNGIEIKOJ -enum KPHNGIEIKOJ { - KPHNGIEIKOJ_JOLNOJHEEDL = 0; - KPHNGIEIKOJ_BNPBNKKEALF = 1; - KPHNGIEIKOJ_NNIGNPJECFI = 2; - KPHNGIEIKOJ_AKDLLNPOEKA = 3; -} - diff --git a/proto/MIEFECKEOMK.proto b/proto/MIEFECKEOMK.proto deleted file mode 100644 index 4f105ff5..00000000 --- a/proto/MIEFECKEOMK.proto +++ /dev/null @@ -1,15 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - -// Name: MIEFECKEOMK -message MIEFECKEOMK { - uint32 avatar_id = 5; - uint32 begin_time = 3; - uint32 LIECEPODMCI = 15; - uint32 KHGHPIBGLNO = 6; - uint32 index = 12; - uint32 make_id = 4; -} - diff --git a/proto/MailData.proto b/proto/MailData.proto index 9bc252b5..42fb64d7 100644 --- a/proto/MailData.proto +++ b/proto/MailData.proto @@ -2,22 +2,22 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "CBGLBMMCPPK.proto"; -import "KPHNGIEIKOJ.proto"; +import "MailTextContent.proto"; +import "MailCollectState.proto"; import "MailItem.proto"; // Name: HGOBDHKMDHO message MailData { - uint32 FMBALDHPHEL = 1; - CBGLBMMCPPK KHMBDKIONNN = 4; - repeated MailItem item_list = 7; - uint32 ONHBGIHJJHJ = 8; - uint32 expire_time = 9; - uint32 GJNJJOANHLH = 10; - bool is_read = 11; - bool is_attachment_got = 12; - uint32 config_id = 13; - repeated string argument_list = 14; - KPHNGIEIKOJ AOGNLIAECKG = 15; + uint32 mailId = 1; + MailTextContent mailTextContent = 4; + repeated MailItem itemList = 7; + uint32 sendTime = 8; + uint32 expireTime = 9; + uint32 importance = 10; + bool isRead = 11; + bool isAttachmentGot = 12; + uint32 configId = 13; + repeated string argumentList = 14; + MailCollectState collectState = 15; } diff --git a/proto/MaterialInfo.proto b/proto/MaterialInfo.proto index 3de487c8..ca6961c3 100644 --- a/proto/MaterialInfo.proto +++ b/proto/MaterialInfo.proto @@ -2,10 +2,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - - - +// Name: KBJIEJFLEPA message MaterialInfo { - uint32 count = 3; - uint64 guid = 12; + uint32 count = 5; + uint64 guid = 7; } diff --git a/proto/MaterilaInfo.proto b/proto/MaterilaInfo.proto deleted file mode 100644 index 7e9a773e..00000000 --- a/proto/MaterilaInfo.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - -// Name: KBJIEJFLEPA -message MaterilaInfo { - uint32 count = 5; - uint64 guid = 7; -} - diff --git a/proto/McoinExchangeHcoinReq.proto b/proto/McoinExchangeHcoinReq.proto index 63621bb1..3dd8f867 100644 --- a/proto/McoinExchangeHcoinReq.proto +++ b/proto/McoinExchangeHcoinReq.proto @@ -6,7 +6,7 @@ option java_package = "emu.grasscutter.net.proto"; // Name: LIOGDEJCPAJ // CmdId: 643 message McoinExchangeHcoinReq { - uint32 CALAJIHCLCF = 8; - uint32 MIBMBPJHBBM = 6; + uint32 mcoinCost = 8; + uint32 hcoin = 6; } diff --git a/proto/PersonalLineAllDataRsp.proto b/proto/PersonalLineAllDataRsp.proto index 01aeb562..43f4d668 100644 --- a/proto/PersonalLineAllDataRsp.proto +++ b/proto/PersonalLineAllDataRsp.proto @@ -11,7 +11,7 @@ message PersonalLineAllDataRsp { uint32 cur_finished_daily_task_count = 2; uint32 legendary_key_count = 7; int32 retcode = 14; - repeated uint32 LFBFDPFCOGN = 12; - repeated uint32 NEBDFELPDCO = 6; + repeated uint32 ongoingPersonalLineList = 12; + repeated uint32 canBeUnlockedPersonalLineList = 6; } diff --git a/proto/PlayerCompoundMaterialRsp.proto b/proto/PlayerCompoundMaterialRsp.proto index 706e709b..67317c46 100644 --- a/proto/PlayerCompoundMaterialRsp.proto +++ b/proto/PlayerCompoundMaterialRsp.proto @@ -7,7 +7,7 @@ import "CompoundQueueData.proto"; // Name: FLGCALNDKFE // CmdId: 116 message PlayerCompoundMaterialRsp { - CompoundQueueData compound_que_data = 4; + CompoundQueueData compoundQueueData = 4; int32 retcode = 1; } diff --git a/proto/PlayerCookReq.proto b/proto/PlayerCookReq.proto index 29838b4e..464f9981 100644 --- a/proto/PlayerCookReq.proto +++ b/proto/PlayerCookReq.proto @@ -6,9 +6,9 @@ option java_package = "emu.grasscutter.net.proto"; // Name: IFIIKECOADA // CmdId: 184 message PlayerCookReq { - uint32 HHKAPMHMHFI = 9; - uint32 DIIJPMJFNOL = 5; - uint32 IFLJGHHBGMP = 15; - uint32 OMPOMKPPLEH = 3; + uint32 recipeId = 9; + uint32 assistAvatar = 5; + uint32 qteQuality = 15; + uint32 cookCount = 3; } diff --git a/proto/PlayerCookRsp.proto b/proto/PlayerCookRsp.proto index 82185b56..1a770adc 100644 --- a/proto/PlayerCookRsp.proto +++ b/proto/PlayerCookRsp.proto @@ -10,9 +10,9 @@ import "ItemParam.proto"; message PlayerCookRsp { repeated ItemParam extral_item_list = 12; repeated ItemParam item_list = 9; - uint32 HHKAPMHMHFI = 10; + uint32 cookCount = 10; CookRecipeData recipe_data = 11; int32 retcode = 15; - uint32 IFLJGHHBGMP = 6; + uint32 qteQuality = 6; } diff --git a/proto/PlayerHomeCompInfo.proto b/proto/PlayerHomeCompInfo.proto index 708da124..fd47e795 100644 --- a/proto/PlayerHomeCompInfo.proto +++ b/proto/PlayerHomeCompInfo.proto @@ -8,7 +8,7 @@ import "FriendEnterHomeOption.proto"; message PlayerHomeCompInfo { FriendEnterHomeOption friend_enter_home_option = 9; repeated uint32 seen_module_id_list = 5; - repeated uint32 GDJHCPPGIIM = 15; - repeated uint32 LHOLJFDKFHM = 11; + repeated uint32 levelupRewardGotLevelList = 15; + repeated uint32 unlockedModuleIdList = 11; } diff --git a/proto/ProudSkillExtraLevelNotify.proto b/proto/ProudSkillExtraLevelNotify.proto index b3f198cf..2d0c3593 100644 --- a/proto/ProudSkillExtraLevelNotify.proto +++ b/proto/ProudSkillExtraLevelNotify.proto @@ -6,9 +6,9 @@ option java_package = "emu.grasscutter.net.proto"; // Name: FFDMIACPHJJ // CmdId: 1029 message ProudSkillExtraLevelNotify { - uint32 MCIMCJEMMAH = 1; - uint32 IMHNBMDKMMN = 7; + uint32 extraLevel = 1; + uint32 talentType = 7; uint64 avatar_guid = 10; - uint32 FAOAFMCOILH = 11; + uint32 talentIndex = 11; } diff --git a/proto/QueryCodexMonsterBeKilledNumRsp.proto b/proto/QueryCodexMonsterBeKilledNumRsp.proto index e2467009..6b0f8972 100644 --- a/proto/QueryCodexMonsterBeKilledNumRsp.proto +++ b/proto/QueryCodexMonsterBeKilledNumRsp.proto @@ -6,9 +6,9 @@ option java_package = "emu.grasscutter.net.proto"; // Name: LGANMLHFGID // CmdId: 4201 message QueryCodexMonsterBeKilledNumRsp { - repeated uint32 EHOHFHEOKHJ = 14; + repeated uint32 beKilledNumList = 14; int32 retcode = 11; - repeated uint32 KHEHMPJHELM = 1; + repeated uint32 beCapturedNumList = 1; repeated uint32 codex_id_list = 8; } diff --git a/proto/Quest.proto b/proto/Quest.proto index ff5ae6b8..74621b9f 100644 --- a/proto/Quest.proto +++ b/proto/Quest.proto @@ -2,22 +2,21 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - // Name: IBPHKCENHNF message Quest { - uint32 quest_id = 1; - uint32 state = 2; - uint32 start_time = 4; - bool is_random = 5; - uint32 parent_quest_id = 6; - uint32 LLNJKILEEBC = 7; - uint32 CIPMADJKCFI = 8; - uint32 JIBIPIACCNO = 9; - repeated uint32 DMLOPDKLBMF = 10; - repeated uint32 DOFGANFLADG = 11; - repeated uint32 NAJLNEMFEGA = 12; - map NCPOOIMAKMO = 13; - repeated uint32 KPIKFCDPMMM = 14; - map OCDJABANKIH = 15; + uint32 questId = 1; + uint32 state = 2; + uint32 startTime = 4; + bool isRandom = 5; + uint32 parentQuestId = 6; + uint32 questConfigId = 7; + uint32 startGameTime = 8; + uint32 acceptTime = 9; + repeated uint32 lackedNpcList = 10; + repeated uint32 finishProgressList = 11; + repeated uint32 failProgressList = 12; + map lackedNpcMap = 13; + repeated uint32 lackedPlaceList = 14; + map lackedPlaceMap = 15; } diff --git a/proto/QuestProgressUpdateNotify.proto b/proto/QuestProgressUpdateNotify.proto index e80fd694..a31cc1ee 100644 --- a/proto/QuestProgressUpdateNotify.proto +++ b/proto/QuestProgressUpdateNotify.proto @@ -6,8 +6,8 @@ option java_package = "emu.grasscutter.net.proto"; // Name: APPHCCAKOKB // CmdId: 466 message QuestProgressUpdateNotify { - repeated uint32 DOFGANFLADG = 7; - repeated uint32 NAJLNEMFEGA = 2; + repeated uint32 failProgressList = 7; + repeated uint32 finishProgressList = 2; uint32 quest_id = 3; } diff --git a/proto/ReliquaryUpgradeRsp.proto b/proto/ReliquaryUpgradeRsp.proto index f3b08c64..549f3ae8 100644 --- a/proto/ReliquaryUpgradeRsp.proto +++ b/proto/ReliquaryUpgradeRsp.proto @@ -6,12 +6,12 @@ option java_package = "emu.grasscutter.net.proto"; // Name: EHKGELEMEHM // CmdId: 674 message ReliquaryUpgradeRsp { - uint32 PJNELCLHMOH = 6; - uint32 NMHDEIHIEJK = 3; - repeated uint32 CHKOMADPLAO = 7; + uint32 curLevel = 6; + uint32 oldLevel = 3; + repeated uint32 oldAppendPropList = 7; int32 retcode = 11; uint64 target_reliquary_guid = 15; - repeated uint32 PBPLNHFCKIO = 1; - uint32 MFNMHANCIMP = 5; + repeated uint32 curAppendPropList = 1; + uint32 powerUpRate = 5; } diff --git a/proto/ResinChangeNotify.proto b/proto/ResinChangeNotify.proto index 55361d34..3e8f3a89 100644 --- a/proto/ResinChangeNotify.proto +++ b/proto/ResinChangeNotify.proto @@ -7,7 +7,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 649 message ResinChangeNotify { uint32 cur_value = 14; - uint32 KDJDKFKHOEN = 13; - uint32 NJLHPIKCNOP = 12; + uint32 curBuyCount = 13; + uint32 nextAddTimestamp = 12; } diff --git a/proto/ScenePointUnlockNotify.proto b/proto/ScenePointUnlockNotify.proto index b1f52244..1a314786 100644 --- a/proto/ScenePointUnlockNotify.proto +++ b/proto/ScenePointUnlockNotify.proto @@ -6,10 +6,10 @@ option java_package = "emu.grasscutter.net.proto"; // Name: DCLKBOACANF // CmdId: 261 message ScenePointUnlockNotify { - repeated uint32 JOMDNANCHND = 14; + repeated uint32 unhidePointList = 14; repeated uint32 hide_point_list = 9; repeated uint32 point_list = 3; - repeated uint32 LLLIACPHNEH = 7; + repeated uint32 lockedPointList = 7; uint32 scene_id = 6; } diff --git a/proto/ServerCondMeetQuestListUpdateNotify.proto b/proto/ServerCondMeetQuestListUpdateNotify.proto index e9775718..54b33935 100644 --- a/proto/ServerCondMeetQuestListUpdateNotify.proto +++ b/proto/ServerCondMeetQuestListUpdateNotify.proto @@ -6,7 +6,7 @@ option java_package = "emu.grasscutter.net.proto"; // Name: NKEFJLKJCIP // CmdId: 486 message ServerCondMeetQuestListUpdateNotify { - repeated uint32 ENOCFBCHAMO = 15; - repeated uint32 PJLFACFIEAA = 5; + repeated uint32 delQuestIdList = 15; + repeated uint32 addQuestIdList = 5; } diff --git a/proto/TakeFurnitureMakeRsp.proto b/proto/TakeFurnitureMakeRsp.proto index 1721061a..879eacc1 100644 --- a/proto/TakeFurnitureMakeRsp.proto +++ b/proto/TakeFurnitureMakeRsp.proto @@ -8,8 +8,8 @@ import "ItemParam.proto"; // Name: ACOKGGPOACP // CmdId: 4630 message TakeFurnitureMakeRsp { - repeated ItemParam PODPGGGOFGP = 11; - repeated ItemParam CBLILOJFLPO = 14; + repeated ItemParam outputItemList = 11; + repeated ItemParam returnItemList = 14; FurnitureMakeSlot furniture_make_slot = 12; uint32 make_id = 10; int32 retcode = 8; diff --git a/proto/TowerAllDataRsp.proto b/proto/TowerAllDataRsp.proto index 030e7a4d..d60b256c 100644 --- a/proto/TowerAllDataRsp.proto +++ b/proto/TowerAllDataRsp.proto @@ -6,25 +6,25 @@ import "TowerMonthlyBrief.proto"; import "TowerCurLevelRecord.proto"; import "TowerFloorRecord.proto"; -// Name: NFDBAJIDFBG +// Name: NFDBAJIDFBG (3.4) // CmdId: 2465 message TowerAllDataRsp { - map skipFloorGrantedRewardItemMap = 6; - TowerMonthlyBrief monthlyBrief = 2; - uint32 BAJALPKLOHN = 11; - uint32 OGLKMJOBNAK = 3; - int32 retcode = 9; - uint32 CKCFIIGKHMJ = 15; - bool is_first_interact = 14; - uint32 EJMAMALGICG = 12; - uint32 IOOHBFIGKHH = 13; - map floorOpenTimeMap = 10; - repeated TowerFloorRecord tower_floor_record_list = 1; - bool is_finished_entrance_floor = 4; - uint32 CFEHKIFIKFB = 7; - uint32 AMFOBDDCIHK = 1758; - TowerMonthlyBrief lastScheduleMonthlyBrief = 622; - uint32 towerScheduleId = 8; - TowerCurLevelRecord cur_level_record = 5; + uint32 Unk3300_OHCHCJGJIDK = 7; + TowerCurLevelRecord curLevelRecord = 1; + bool isFirstInteract = 8; + repeated TowerFloorRecord towerFloorRecordList = 6; + uint32 nextScheduleChangeTime = 15; + uint32 towerScheduleId = 9; + map floorOpenTimeMap = 12; + uint32 validTowerRecordNum = 5; + map skipFloorGrantedRewardItemMap = 11; + uint32 scheduleStartTime = 591; + TowerMonthlyBrief lastScheduleMonthlyBrief = 1482; + uint32 Unk3300_LEKODCFPINJ = 10; + uint32 Unk3300_HCDFJBHMHHF = 3; + uint32 Unk3300_JBACKENDHDG = 14; + bool isFinishedEntranceFloor = 2; + TowerMonthlyBrief monthlyBrief = 13; + int32 retcode = 4; }