From 5eb05fff341f247cbd66e4e7f3e91be66166c3e3 Mon Sep 17 00:00:00 2001 From: Akbar Yahya Date: Wed, 1 Mar 2023 10:23:23 +0800 Subject: [PATCH] sync fix 4 --- proto/ABAMJKJOMHJ.proto | 4 +-- proto/AHGODAFKPIM.proto | 4 +-- proto/ANIHIBEGDJC.proto | 13 ------- proto/BuildingInfo.proto | 12 +++---- proto/CKKPDOAODLN.proto | 15 -------- proto/{DDGEINCPPIK.proto => ChildQuest.proto} | 4 +-- proto/DungeonCandidateTeamInfoNotify.proto | 4 +-- proto/DungeonCandidateTeamPlayerState.proto | 12 +++++++ proto/FlightActivitySettleNotify.proto | 2 +- ...AABOGBOJFC.proto => ForceUpdateInfo.proto} | 4 +-- proto/FoundationReq.proto | 4 +-- proto/FoundationRsp.proto | 4 +-- proto/GCGDiceSideType.proto | 18 ++++++++++ proto/GCGMsgAddDice.proto | 6 ++-- proto/GCGMsgDiceReroll.proto | 4 +-- proto/GCGMsgDiceRoll.proto | 4 +-- proto/GOGCALJCAMC.proto | 12 ------- proto/GetQuestLackingResourceRsp.proto | 8 ++--- proto/GlobalBuildingInfoNotify.proto | 4 +-- proto/InBattleMechanicusBuildingInfo.proto | 4 +-- proto/KPHNGIEIKOJ.proto | 13 ------- proto/MailCollectState.proto | 13 +++++++ proto/MailData.proto | 14 ++++---- ...BGLBMMCPPK.proto => MailTextContent.proto} | 4 +-- proto/PENJFODAGGI.proto | 18 ---------- proto/ParentQuest.proto | 8 ++--- ...DMHP.proto => ParentQuestRandomInfo.proto} | 6 ++-- proto/PlatformInfo.proto | 14 ++++---- ...JBB.proto => QueryCurrRegionHttpRsp.proto} | 12 +++---- proto/QueryRegionListHttpRsp.proto | 15 ++++++++ proto/Quest.proto | 18 +++++----- proto/QuestProgressUpdateNotify.proto | 4 +-- proto/RegionInfo.proto | 34 +++++++++---------- ...DIKKJHCCB.proto => RegionSimpleInfo.proto} | 4 +-- proto/RogueDiaryAvatar.proto | 4 +-- proto/RogueDiaryAvatarDisableStatus.proto | 13 +++++++ proto/SummerTimeSprintBoatSettleNotify.proto | 2 +- proto/TreasureSeelieCollectOrbsNotify.proto | 4 +-- proto/VintageHuntingSecondStageInfo.proto | 6 ++-- .../VintageHuntingSecondStageSettleInfo.proto | 4 +-- 40 files changed, 176 insertions(+), 176 deletions(-) delete mode 100644 proto/ANIHIBEGDJC.proto delete mode 100644 proto/CKKPDOAODLN.proto rename proto/{DDGEINCPPIK.proto => ChildQuest.proto} (72%) create mode 100644 proto/DungeonCandidateTeamPlayerState.proto rename proto/{MAABOGBOJFC.proto => ForceUpdateInfo.proto} (62%) create mode 100644 proto/GCGDiceSideType.proto delete mode 100644 proto/GOGCALJCAMC.proto delete mode 100644 proto/KPHNGIEIKOJ.proto create mode 100644 proto/MailCollectState.proto rename proto/{CBGLBMMCPPK.proto => MailTextContent.proto} (74%) delete mode 100644 proto/PENJFODAGGI.proto rename proto/{JLADMBEDMHP.proto => ParentQuestRandomInfo.proto} (56%) rename proto/{AHMNLAOFJBB.proto => QueryCurrRegionHttpRsp.proto} (57%) create mode 100644 proto/QueryRegionListHttpRsp.proto rename proto/{LLDIKKJHCCB.proto => RegionSimpleInfo.proto} (74%) create mode 100644 proto/RogueDiaryAvatarDisableStatus.proto diff --git a/proto/ABAMJKJOMHJ.proto b/proto/ABAMJKJOMHJ.proto index 9c467d3e..77ef1b6e 100644 --- a/proto/ABAMJKJOMHJ.proto +++ b/proto/ABAMJKJOMHJ.proto @@ -2,12 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "PENJFODAGGI.proto"; +import "GCGDiceSideType.proto"; // Name: ABAMJKJOMHJ // CmdId: 7765 message ABAMJKJOMHJ { repeated uint32 MFJPHFOJKEF = 8; - repeated PENJFODAGGI GGGHONFOAKP = 13; + repeated GCGDiceSideType dice_side_list = 13; } diff --git a/proto/AHGODAFKPIM.proto b/proto/AHGODAFKPIM.proto index e98fdbdf..7eadc47a 100644 --- a/proto/AHGODAFKPIM.proto +++ b/proto/AHGODAFKPIM.proto @@ -4,13 +4,13 @@ option java_package = "emu.grasscutter.net.proto"; import "AEEKABMMKNE.proto"; import "DIGLBMAEMML.proto"; +import "GCGDiceSideType.proto"; import "HHKFLCHIBJJ.proto"; -import "PENJFODAGGI.proto"; // Name: AHGODAFKPIM message AHGODAFKPIM { uint32 ONKDMOMNGBG = 824; - repeated PENJFODAGGI GGGHONFOAKP = 1; + repeated GCGDiceSideType dice_side_list = 1; uint32 IGMNOEBOCJP = 3; repeated HHKFLCHIBJJ AICAJEFEHLF = 1540; repeated AEEKABMMKNE PLPMEJFNDKA = 12; diff --git a/proto/ANIHIBEGDJC.proto b/proto/ANIHIBEGDJC.proto deleted file mode 100644 index b7358d5d..00000000 --- a/proto/ANIHIBEGDJC.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - -// Name: ANIHIBEGDJC -enum ANIHIBEGDJC { - ANIHIBEGDJC_OKHMBACGIDI = 0; - ANIHIBEGDJC_HMNPIKMJBAB = 1; - ANIHIBEGDJC_LOPFCNNIOOD = 2; - ANIHIBEGDJC_EAAAMEMNHHJ = 3; -} - diff --git a/proto/BuildingInfo.proto b/proto/BuildingInfo.proto index 683563cc..5edb17a7 100644 --- a/proto/BuildingInfo.proto +++ b/proto/BuildingInfo.proto @@ -5,12 +5,12 @@ option java_package = "emu.grasscutter.net.proto"; // Name: KAGPDLCBOHD message BuildingInfo { - uint32 AHBIFENKEPF = 1; - uint32 ODOEMLALIML = 2; - uint32 ICGOGHKFMAP = 3; - uint32 NDOKKOHPEMN = 5; + uint32 building_id = 1; + uint32 point_config_id = 2; + uint32 cost = 3; + uint32 refund = 5; uint32 owner_uid = 6; - uint32 LJDMMCIKHLC = 7; - uint32 IHNHBADFLKJ = 8; + uint32 current_num = 7; + uint32 max_num = 8; } diff --git a/proto/CKKPDOAODLN.proto b/proto/CKKPDOAODLN.proto deleted file mode 100644 index 3e828421..00000000 --- a/proto/CKKPDOAODLN.proto +++ /dev/null @@ -1,15 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "LLDIKKJHCCB.proto"; - -// Name: CKKPDOAODLN -message CKKPDOAODLN { - int32 retcode = 1; - repeated LLDIKKJHCCB BJBMBPIEJPI = 2; - bytes ODHGCKGDENJ = 5; - bytes DPJIJEEPMDG = 6; - bool LFIFNAGHMJC = 7; -} - diff --git a/proto/DDGEINCPPIK.proto b/proto/ChildQuest.proto similarity index 72% rename from proto/DDGEINCPPIK.proto rename to proto/ChildQuest.proto index 2730c919..d4f76dbb 100644 --- a/proto/DDGEINCPPIK.proto +++ b/proto/ChildQuest.proto @@ -4,9 +4,9 @@ option java_package = "emu.grasscutter.net.proto"; // Name: DDGEINCPPIK -message DDGEINCPPIK { +message ChildQuest { uint32 state = 1; - uint32 LLNJKILEEBC = 14; + uint32 quest_config_id = 14; uint32 quest_id = 8; } diff --git a/proto/DungeonCandidateTeamInfoNotify.proto b/proto/DungeonCandidateTeamInfoNotify.proto index 168a12cc..7f0267c9 100644 --- a/proto/DungeonCandidateTeamInfoNotify.proto +++ b/proto/DungeonCandidateTeamInfoNotify.proto @@ -3,7 +3,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "DungeonCandidateTeamAvatar.proto"; -import "GOGCALJCAMC.proto"; +import "DungeonCandidateTeamPlayerState.proto"; // Name: FIIOKEKPAFG // CmdId: 946 @@ -11,7 +11,7 @@ message DungeonCandidateTeamInfoNotify { repeated DungeonCandidateTeamAvatar avatar_list = 6; repeated uint32 ready_player_uid = 14; uint32 match_type = 11; - map JPNABBEKHHJ = 5; + map player_state_map = 5; uint32 dungeon_id = 3; } diff --git a/proto/DungeonCandidateTeamPlayerState.proto b/proto/DungeonCandidateTeamPlayerState.proto new file mode 100644 index 00000000..06afca7d --- /dev/null +++ b/proto/DungeonCandidateTeamPlayerState.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +// Name: GOGCALJCAMC +enum DungeonCandidateTeamPlayerState { + DUNGEON_CANDIDATE_TEAM_PLAYER_STATE_IDLE = 0; + DUNGEON_CANDIDATE_TEAM_PLAYER_STATE_CHANGING_AVATAR = 1; + DUNGEON_CANDIDATE_TEAM_PLAYER_STATE_READY = 2; +} + diff --git a/proto/FlightActivitySettleNotify.proto b/proto/FlightActivitySettleNotify.proto index 4ca3faaa..5df6a44a 100644 --- a/proto/FlightActivitySettleNotify.proto +++ b/proto/FlightActivitySettleNotify.proto @@ -13,6 +13,6 @@ message FlightActivitySettleNotify { uint32 group_id = 3; uint32 left_time = 9; bool is_success = 4; - uint32 NJENGLLHPJD = 10; + uint32 total_num = 10; } diff --git a/proto/MAABOGBOJFC.proto b/proto/ForceUpdateInfo.proto similarity index 62% rename from proto/MAABOGBOJFC.proto rename to proto/ForceUpdateInfo.proto index d26796bb..44391a74 100644 --- a/proto/MAABOGBOJFC.proto +++ b/proto/ForceUpdateInfo.proto @@ -4,7 +4,7 @@ option java_package = "emu.grasscutter.net.proto"; // Name: MAABOGBOJFC -message MAABOGBOJFC { - string AGLGNFAKDMP = 1; +message ForceUpdateInfo { + string force_update_url = 1; } diff --git a/proto/FoundationReq.proto b/proto/FoundationReq.proto index b57b0414..35a4153f 100644 --- a/proto/FoundationReq.proto +++ b/proto/FoundationReq.proto @@ -8,8 +8,8 @@ import "FoundationOpType.proto"; // CmdId: 827 message FoundationReq { FoundationOpType op_type = 4; - uint32 ODOEMLALIML = 13; + uint32 point_config_id = 13; uint32 gadget_entity_id = 6; - uint32 AHBIFENKEPF = 1; + uint32 building_id = 1; } diff --git a/proto/FoundationRsp.proto b/proto/FoundationRsp.proto index c022916b..5ff14452 100644 --- a/proto/FoundationRsp.proto +++ b/proto/FoundationRsp.proto @@ -8,9 +8,9 @@ import "FoundationOpType.proto"; // CmdId: 866 message FoundationRsp { FoundationOpType op_type = 12; - uint32 ODOEMLALIML = 10; + uint32 point_config_id = 10; int32 retcode = 14; - uint32 AHBIFENKEPF = 15; + uint32 building_id = 15; uint32 gadget_entity_id = 6; } diff --git a/proto/GCGDiceSideType.proto b/proto/GCGDiceSideType.proto new file mode 100644 index 00000000..edc17188 --- /dev/null +++ b/proto/GCGDiceSideType.proto @@ -0,0 +1,18 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +// Name: PENJFODAGGI +enum GCGDiceSideType { + GCG_DICE_SIDE_INVALID = 0; + GCG_DICE_SIDE_CRYO = 1; + GCG_DICE_SIDE_HYDRO = 2; + GCG_DICE_SIDE_PYRO = 3; + GCG_DICE_SIDE_ELECTRO = 4; + GCG_DICE_SIDE_GEO = 5; + GCG_DICE_SIDE_DENDRO = 6; + GCG_DICE_SIDE_ANEMO = 7; + GCG_DICE_SIDE_PAIMON = 8; +} + diff --git a/proto/GCGMsgAddDice.proto b/proto/GCGMsgAddDice.proto index f616a806..4d380378 100644 --- a/proto/GCGMsgAddDice.proto +++ b/proto/GCGMsgAddDice.proto @@ -2,15 +2,15 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +import "GCGDiceSideType.proto"; import "GCGReason.proto"; -import "PENJFODAGGI.proto"; // Name: JJPBDGJNPOL message GCGMsgAddDice { - map FHJPIJFMAPL = 11; + map FHJPIJFMAPL = 11; uint32 controller_id = 5; GCGReason reason = 1; int32 change_count = 14; - map PNELDJLCNOP = 8; + map PNELDJLCNOP = 8; } diff --git a/proto/GCGMsgDiceReroll.proto b/proto/GCGMsgDiceReroll.proto index 4514666c..3ae55895 100644 --- a/proto/GCGMsgDiceReroll.proto +++ b/proto/GCGMsgDiceReroll.proto @@ -2,11 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "PENJFODAGGI.proto"; +import "GCGDiceSideType.proto"; // Name: EMAGMDBBEJB message GCGMsgDiceReroll { - repeated PENJFODAGGI GGGHONFOAKP = 1; + repeated GCGDiceSideType dice_side_list = 1; repeated uint32 select_dice_index_list = 2; uint32 controller_id = 13; } diff --git a/proto/GCGMsgDiceRoll.proto b/proto/GCGMsgDiceRoll.proto index 05ef4371..c0a20194 100644 --- a/proto/GCGMsgDiceRoll.proto +++ b/proto/GCGMsgDiceRoll.proto @@ -2,12 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "PENJFODAGGI.proto"; +import "GCGDiceSideType.proto"; // Name: HAOLLNONCFH message GCGMsgDiceRoll { uint32 dice_num = 15; uint32 controller_id = 2; - repeated PENJFODAGGI GGGHONFOAKP = 14; + repeated GCGDiceSideType dice_side_list = 14; } diff --git a/proto/GOGCALJCAMC.proto b/proto/GOGCALJCAMC.proto deleted file mode 100644 index 5cc50918..00000000 --- a/proto/GOGCALJCAMC.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - -// Name: GOGCALJCAMC -enum GOGCALJCAMC { - GOGCALJCAMC_PJBFEFHBAAD = 0; - GOGCALJCAMC_LJBOPAFHEIA = 1; - GOGCALJCAMC_EMFCAAMENEN = 2; -} - diff --git a/proto/GetQuestLackingResourceRsp.proto b/proto/GetQuestLackingResourceRsp.proto index ec2b629c..e8fe37ad 100644 --- a/proto/GetQuestLackingResourceRsp.proto +++ b/proto/GetQuestLackingResourceRsp.proto @@ -6,11 +6,11 @@ option java_package = "emu.grasscutter.net.proto"; // Name: OFAJEECKBCP // CmdId: 411 message GetQuestLackingResourceRsp { - map NCPOOIMAKMO = 6; - repeated uint32 KPIKFCDPMMM = 15; + map lacked_npc_map = 6; + repeated uint32 lacked_place_list = 15; uint32 quest_id = 8; int32 retcode = 14; - map OCDJABANKIH = 5; - repeated uint32 DMLOPDKLBMF = 4; + map lacked_place_map = 5; + repeated uint32 lacked_npc_list = 4; } diff --git a/proto/GlobalBuildingInfoNotify.proto b/proto/GlobalBuildingInfoNotify.proto index 857cec8f..06dc932c 100644 --- a/proto/GlobalBuildingInfoNotify.proto +++ b/proto/GlobalBuildingInfoNotify.proto @@ -7,8 +7,8 @@ import "BuildingInfo.proto"; // Name: JHCOBPEEBLO // CmdId: 5373 message GlobalBuildingInfoNotify { - uint32 LJDMMCIKHLC = 12; - uint32 IHNHBADFLKJ = 4; + uint32 current_num = 12; + uint32 max_num = 4; repeated BuildingInfo building_list = 5; } diff --git a/proto/InBattleMechanicusBuildingInfo.proto b/proto/InBattleMechanicusBuildingInfo.proto index 2fdf7324..0f2d7a3d 100644 --- a/proto/InBattleMechanicusBuildingInfo.proto +++ b/proto/InBattleMechanicusBuildingInfo.proto @@ -6,8 +6,8 @@ option java_package = "emu.grasscutter.net.proto"; // Name: PHLPMOGFMDN message InBattleMechanicusBuildingInfo { uint32 cost_points = 8; - uint32 KEOEDNKONHH = 4; - uint32 AHBIFENKEPF = 9; + uint32 refund_points = 4; + uint32 building_id = 9; uint32 level = 13; } 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/MailCollectState.proto b/proto/MailCollectState.proto new file mode 100644 index 00000000..2fbb90ae --- /dev/null +++ b/proto/MailCollectState.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +// Name: KPHNGIEIKOJ +enum MailCollectState { + MAIL_COLLECTIBLE_UNKONW = 0; + MAIL_NOT_COLLECTIBLE = 1; + MAIL_COLLECTIBLE_UNCOLLECTED = 2; + MAIL_COLLECTIBLE_COLLECTED = 3; +} + diff --git a/proto/MailData.proto b/proto/MailData.proto index 9bc252b5..c99e824d 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 "MailCollectState.proto"; import "MailItem.proto"; +import "MailTextContent.proto"; // Name: HGOBDHKMDHO message MailData { - uint32 FMBALDHPHEL = 1; - CBGLBMMCPPK KHMBDKIONNN = 4; + uint32 mail_id = 1; + MailTextContent mail_text_content = 4; repeated MailItem item_list = 7; - uint32 ONHBGIHJJHJ = 8; + uint32 send_time = 8; uint32 expire_time = 9; - uint32 GJNJJOANHLH = 10; + uint32 importance = 10; bool is_read = 11; bool is_attachment_got = 12; uint32 config_id = 13; repeated string argument_list = 14; - KPHNGIEIKOJ AOGNLIAECKG = 15; + MailCollectState collect_state = 15; } diff --git a/proto/CBGLBMMCPPK.proto b/proto/MailTextContent.proto similarity index 74% rename from proto/CBGLBMMCPPK.proto rename to proto/MailTextContent.proto index 60c08c48..acda8199 100644 --- a/proto/CBGLBMMCPPK.proto +++ b/proto/MailTextContent.proto @@ -4,9 +4,9 @@ option java_package = "emu.grasscutter.net.proto"; // Name: CBGLBMMCPPK -message CBGLBMMCPPK { +message MailTextContent { string title = 1; string content = 2; - string NBNLJCLPGEA = 3; + string sender = 3; } diff --git a/proto/PENJFODAGGI.proto b/proto/PENJFODAGGI.proto deleted file mode 100644 index cd0d87f6..00000000 --- a/proto/PENJFODAGGI.proto +++ /dev/null @@ -1,18 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - -// Name: PENJFODAGGI -enum PENJFODAGGI { - PENJFODAGGI_FBPIAOONAOC = 0; - PENJFODAGGI_CJNJEJFBKCE = 1; - PENJFODAGGI_IICFMKLEDHP = 2; - PENJFODAGGI_ECMEFHLEHLF = 3; - PENJFODAGGI_FODMOELILAL = 4; - PENJFODAGGI_EJMOFOMCLJL = 5; - PENJFODAGGI_LCBGDEJHDCK = 6; - PENJFODAGGI_PFEGGDDLJJI = 7; - PENJFODAGGI_OPKMMNAECNF = 8; -} - diff --git a/proto/ParentQuest.proto b/proto/ParentQuest.proto index e572de08..45514ebb 100644 --- a/proto/ParentQuest.proto +++ b/proto/ParentQuest.proto @@ -2,14 +2,14 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "DDGEINCPPIK.proto"; +import "ChildQuest.proto"; import "InferencePageInfo.proto"; -import "JLADMBEDMHP.proto"; +import "ParentQuestRandomInfo.proto"; // Name: NMIGKDMCKHK message ParentQuest { bool is_random = 1; - repeated DDGEINCPPIK AAGHMGIMKJM = 13; + repeated ChildQuest child_quest_list = 13; repeated int32 quest_var = 2; repeated InferencePageInfo inference_page_list = 4; uint32 DOCNJADOIPJ = 5; @@ -18,6 +18,6 @@ message ParentQuest { map time_var_map = 14; bool is_finished = 8; uint32 parent_quest_id = 11; - JLADMBEDMHP DODJBLHPEAD = 3; + ParentQuestRandomInfo random_info = 3; } diff --git a/proto/JLADMBEDMHP.proto b/proto/ParentQuestRandomInfo.proto similarity index 56% rename from proto/JLADMBEDMHP.proto rename to proto/ParentQuestRandomInfo.proto index f95c4787..51003ab1 100644 --- a/proto/JLADMBEDMHP.proto +++ b/proto/ParentQuestRandomInfo.proto @@ -4,9 +4,9 @@ option java_package = "emu.grasscutter.net.proto"; // Name: JLADMBEDMHP -message JLADMBEDMHP { - repeated uint32 LJFDCKDKDDD = 9; +message ParentQuestRandomInfo { + repeated uint32 factor_list = 9; uint32 template_id = 4; - uint32 EOMGIJGKNKH = 14; + uint32 entrance_id = 14; } diff --git a/proto/PlatformInfo.proto b/proto/PlatformInfo.proto index 8fbed4bc..fd1cdcc7 100644 --- a/proto/PlatformInfo.proto +++ b/proto/PlatformInfo.proto @@ -11,14 +11,14 @@ import "Vector.proto"; message PlatformInfo { uint32 route_id = 1; int32 start_index = 2; - uint32 MGFMDFCMKDH = 3; - uint32 COKDLJOELIL = 4; - Vector PMCHNNEAMCO = 7; + uint32 start_route_time = 3; + uint32 start_scene_time = 4; + Vector start_pos = 7; bool is_started = 8; - MathQuaternion PFJLOCMMIDO = 9; - uint32 LJKOGHEMFPA = 10; - Vector PGNBBMEBGIO = 11; - MathQuaternion DFEPLBHBKHG = 12; + MathQuaternion start_rot = 9; + uint32 stop_scene_time = 10; + Vector pos_offset = 11; + MathQuaternion rot_offset = 12; MovingPlatformType moving_platform_type = 13; bool is_active = 14; Route route = 15; diff --git a/proto/AHMNLAOFJBB.proto b/proto/QueryCurrRegionHttpRsp.proto similarity index 57% rename from proto/AHMNLAOFJBB.proto rename to proto/QueryCurrRegionHttpRsp.proto index 4cfafad0..f11c9c74 100644 --- a/proto/AHMNLAOFJBB.proto +++ b/proto/QueryCurrRegionHttpRsp.proto @@ -2,21 +2,21 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "MAABOGBOJFC.proto"; +import "ForceUpdateInfo.proto"; import "RegionInfo.proto"; import "StopServerInfo.proto"; // Name: AHMNLAOFJBB -message AHMNLAOFJBB { +message QueryCurrRegionHttpRsp { int32 retcode = 1; string msg = 2; RegionInfo region_info = 3; - bytes ODHGCKGDENJ = 11; - bytes OEJHLDFBBKA = 12; - bytes NHNKFFPCOJI = 13; + bytes client_secret_key = 11; + bytes region_custom_config_encrypted = 12; + bytes client_region_custom_config_encrypted = 13; string HHDIBBJDLAN = 14; oneof detail { - MAABOGBOJFC force_udpate = 4; + ForceUpdateInfo force_udpate = 4; StopServerInfo stop_server = 5; } } diff --git a/proto/QueryRegionListHttpRsp.proto b/proto/QueryRegionListHttpRsp.proto new file mode 100644 index 00000000..f4776963 --- /dev/null +++ b/proto/QueryRegionListHttpRsp.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "RegionSimpleInfo.proto"; + +// Name: CKKPDOAODLN +message QueryRegionListHttpRsp { + int32 retcode = 1; + repeated RegionSimpleInfo region_list = 2; + bytes client_secret_key = 5; + bytes client_custom_config_encrypted = 6; + bool enable_login_pc = 7; +} + diff --git a/proto/Quest.proto b/proto/Quest.proto index ff5ae6b8..999f3924 100644 --- a/proto/Quest.proto +++ b/proto/Quest.proto @@ -10,14 +10,14 @@ message Quest { 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 quest_config_id = 7; + uint32 start_game_time = 8; + uint32 accept_time = 9; + repeated uint32 lacked_npc_list = 10; + repeated uint32 finish_progress_list = 11; + repeated uint32 fail_progress_list = 12; + map lacked_npc_map = 13; + repeated uint32 lacked_place_list = 14; + map lacked_place_map = 15; } diff --git a/proto/QuestProgressUpdateNotify.proto b/proto/QuestProgressUpdateNotify.proto index e80fd694..0df0738e 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 finish_progress_list = 7; + repeated uint32 fail_progress_list = 2; uint32 quest_id = 3; } diff --git a/proto/RegionInfo.proto b/proto/RegionInfo.proto index 87f6d6d2..5fa9e645 100644 --- a/proto/RegionInfo.proto +++ b/proto/RegionInfo.proto @@ -6,32 +6,32 @@ import "ResVersionConfig.proto"; // Name: GFALMACJGIH message RegionInfo { - string PABPLKPIGHA = 1; + string gateserver_ip = 1; uint32 gateserver_port = 2; - string MLHGPMBLOBP = 3; + string pay_callback_url = 3; string area_type = 7; - string LNMIHHILEAA = 8; - string JJHAADAJOEN = 9; - string FHPFJOBOFFI = 10; - string OECCOHOFPHH = 11; - string OFMJINOEOBE = 12; - string PIKHFLKAEAB = 13; + string resource_url = 8; + string data_url = 9; + string feedback_url = 10; + string bulletin_url = 11; + string resource_url_bak = 12; + string data_url_bak = 13; uint32 client_data_version = 14; - string LJJOCJEHHKG = 16; + string handbook_url = 16; uint32 client_silence_data_version = 18; - string PKKPMOCJKHC = 19; - string LDCNOJABNOL = 20; + string client_data_md5 = 19; + string client_silence_data_md5 = 20; ResVersionConfig next_res_version_config = 22; bytes secret_key = 23; - string FLHKPJMCCBI = 24; + string official_community_url = 24; string client_version_suffix = 26; string client_silence_version_suffix = 27; bool use_gateserver_domain_name = 28; - string GLJEJHFBKJL = 29; - string CBKNFNOONLJ = 30; - string BMJAOBJFPAO = 31; - string DDGGPNMAIGN = 32; - string FCGFOJHEABF = 33; + string gateserver_domain_name = 29; + string user_center_url = 30; + string account_bind_url = 31; + string cdkey_url = 32; + string privacy_policy_url = 33; string next_resource_url = 34; ResVersionConfig res_version_config = 35; string game_biz = 36; diff --git a/proto/LLDIKKJHCCB.proto b/proto/RegionSimpleInfo.proto similarity index 74% rename from proto/LLDIKKJHCCB.proto rename to proto/RegionSimpleInfo.proto index d256270c..9478e18a 100644 --- a/proto/LLDIKKJHCCB.proto +++ b/proto/RegionSimpleInfo.proto @@ -4,10 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; // Name: LLDIKKJHCCB -message LLDIKKJHCCB { +message RegionSimpleInfo { string name = 1; string title = 2; string type = 3; - string PAHJMONJIMJ = 4; + string dispatch_url = 4; } diff --git a/proto/RogueDiaryAvatar.proto b/proto/RogueDiaryAvatar.proto index dcec6a1b..7d17635a 100644 --- a/proto/RogueDiaryAvatar.proto +++ b/proto/RogueDiaryAvatar.proto @@ -3,13 +3,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "ActivityDungeonAvatar.proto"; -import "ANIHIBEGDJC.proto"; +import "RogueDiaryAvatarDisableStatus.proto"; // Name: KDDEEFOPBJB message RogueDiaryAvatar { uint32 level = 13; ActivityDungeonAvatar avatar = 4; - repeated ANIHIBEGDJC PGIFCEDONAA = 14; + repeated RogueDiaryAvatarDisableStatus disable_status_list = 14; uint32 tired_round = 3; } diff --git a/proto/RogueDiaryAvatarDisableStatus.proto b/proto/RogueDiaryAvatarDisableStatus.proto new file mode 100644 index 00000000..228199a8 --- /dev/null +++ b/proto/RogueDiaryAvatarDisableStatus.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +// Name: ANIHIBEGDJC +enum RogueDiaryAvatarDisableStatus { + ROGUE_DIARY_AVATAR_DISABLE_NONE = 0; + ROGUE_DIARY_AVATAR_DISABLE_DEATH = 1; + ROGUE_DIARY_AVATAR_DISABLE_TIRED = 2; + ROGUE_DIARY_AVATAR_DISABLE_DUPLICATED = 3; +} + diff --git a/proto/SummerTimeSprintBoatSettleNotify.proto b/proto/SummerTimeSprintBoatSettleNotify.proto index 0a8cdd52..3d23e0ae 100644 --- a/proto/SummerTimeSprintBoatSettleNotify.proto +++ b/proto/SummerTimeSprintBoatSettleNotify.proto @@ -13,6 +13,6 @@ message SummerTimeSprintBoatSettleNotify { bool is_new_record = 6; uint32 DOJCKDMCLJE = 5; uint32 left_time = 9; - uint32 NJENGLLHPJD = 4; + uint32 total_num = 4; } diff --git a/proto/TreasureSeelieCollectOrbsNotify.proto b/proto/TreasureSeelieCollectOrbsNotify.proto index 5ac6df91..4a0a3780 100644 --- a/proto/TreasureSeelieCollectOrbsNotify.proto +++ b/proto/TreasureSeelieCollectOrbsNotify.proto @@ -6,7 +6,7 @@ option java_package = "emu.grasscutter.net.proto"; // Name: PHFOGHDLLBB // CmdId: 24055 message TreasureSeelieCollectOrbsNotify { - uint32 LJDMMCIKHLC = 3; - uint32 NJENGLLHPJD = 10; + uint32 current_num = 3; + uint32 total_num = 10; } diff --git a/proto/VintageHuntingSecondStageInfo.proto b/proto/VintageHuntingSecondStageInfo.proto index 2db6b822..fcec8b27 100644 --- a/proto/VintageHuntingSecondStageInfo.proto +++ b/proto/VintageHuntingSecondStageInfo.proto @@ -5,8 +5,8 @@ option java_package = "emu.grasscutter.net.proto"; // Name: PLHEFJJMNBM message VintageHuntingSecondStageInfo { - uint32 DGJGEHECILB = 11; - uint32 NJENGLLHPJD = 5; - uint32 AGHLEPMGGPH = 1; + uint32 left_num = 11; + uint32 total_num = 5; + uint32 capture_animal_num = 1; } diff --git a/proto/VintageHuntingSecondStageSettleInfo.proto b/proto/VintageHuntingSecondStageSettleInfo.proto index 76f55824..8e263603 100644 --- a/proto/VintageHuntingSecondStageSettleInfo.proto +++ b/proto/VintageHuntingSecondStageSettleInfo.proto @@ -5,8 +5,8 @@ option java_package = "emu.grasscutter.net.proto"; // Name: JCNBBFBADBF message VintageHuntingSecondStageSettleInfo { - uint32 NJENGLLHPJD = 12; - uint32 AGHLEPMGGPH = 14; + uint32 total_num = 12; + uint32 capture_animal_num = 14; map animal_count_map = 8; }