From 06a63b8202fe27e791b369bac26bf3c6bfb269e4 Mon Sep 17 00:00:00 2001 From: Akbar Yahya Date: Wed, 28 Dec 2022 04:11:31 +0800 Subject: [PATCH] Update proto fix7-10 --- proto/AISnapshotEntitySkillCycle.proto | 2 +- proto/AbilityMetaModifierChange.proto | 4 ++-- proto/ActivityCondStateChangeNotify.proto | 4 ++-- proto/ActivityInfo.proto | 4 ++-- proto/AvatarRenameAuditSourceType.proto | 26 ++++++++++++++++++++++ proto/BrickBreakerDetailInfo.proto | 4 ++-- proto/ClientReportNotify.proto | 4 ++-- proto/CombineRsp.proto | 6 ++--- proto/EvtBulletHitNotify.proto | 4 ++-- proto/GetAuthkeyReq.proto | 4 ++-- proto/GetAuthkeyRsp.proto | 4 ++-- proto/GetPlayerTokenReq.proto | 2 +- proto/GetPlayerTokenRsp.proto | 6 ++--- proto/HideAndSeekActivityDetailInfo.proto | 8 +++---- proto/PlayerLoginReq.proto | 2 +- proto/PlayerMatchInfoNotify.proto | 4 ++-- proto/ProudSkillExtraLevelNotify.proto | 6 ++--- proto/RegionalPlayInfoNotify.proto | 4 ++-- proto/RegionalPlayVar.proto | 4 ++-- proto/ResetAvatarRenameReason.proto | 27 +++++++++++++++++++++++ proto/SceneGalleryHideAndSeekInfo.proto | 4 ++-- proto/SeaLampActivityDetailInfo.proto | 4 ++-- proto/ShopGoods.proto | 2 +- proto/WidgetReportReq.proto | 2 +- 24 files changed, 97 insertions(+), 44 deletions(-) create mode 100644 proto/AvatarRenameAuditSourceType.proto create mode 100644 proto/ResetAvatarRenameReason.proto diff --git a/proto/AISnapshotEntitySkillCycle.proto b/proto/AISnapshotEntitySkillCycle.proto index f02060e4..121aa96f 100644 --- a/proto/AISnapshotEntitySkillCycle.proto +++ b/proto/AISnapshotEntitySkillCycle.proto @@ -23,6 +23,6 @@ message AISnapshotEntitySkillCycle { bool Unk3300_IIOIBLEOHEK = 14; uint32 skill_id = 12; bool Unk3300_ABKFNGIDFMI = 7; - bool Unk3300_IFKDIMDJBDH = 2; + bool failed = 2; bool Unk3300_EGIILMJFEBE = 1; } diff --git a/proto/AbilityMetaModifierChange.proto b/proto/AbilityMetaModifierChange.proto index a9f56551..6a2f5140 100644 --- a/proto/AbilityMetaModifierChange.proto +++ b/proto/AbilityMetaModifierChange.proto @@ -28,9 +28,9 @@ message AbilityMetaModifierChange { AbilityAttachedModifier attached_instanced_modifier = 3; bool is_attached_parent_ability = 5; repeated ModifierProperty properties = 14; - bool Unk3300_NOPKODKOHJK = 12; + bool is_mute_remote = 12; int32 modifier_local_id = 2; - bool Unk3300_PBNENPBMNCI = 8; + bool is_durability_zero = 8; AbilityString parent_ability_name = 13; uint32 server_buff_uid = 9; uint32 apply_entity_id = 7; diff --git a/proto/ActivityCondStateChangeNotify.proto b/proto/ActivityCondStateChangeNotify.proto index 754ab7cc..4cff7c85 100644 --- a/proto/ActivityCondStateChangeNotify.proto +++ b/proto/ActivityCondStateChangeNotify.proto @@ -32,8 +32,8 @@ message ActivityCondStateChangeNotify { uint32 activity_id = 5; uint32 schedule_id = 14; - repeated uint32 Unk3300_HKKNIHNBHAE = 1; - repeated uint32 Unk3300_BGNIBLKCPCA = 4; + repeated uint32 expire_cond_list = 1; + repeated uint32 meet_cond_list = 4; repeated uint32 activated_sale_id_list = 8; repeated Uint32Pair disable_transfer_point_interaction_list = 11; } diff --git a/proto/ActivityInfo.proto b/proto/ActivityInfo.proto index b6504130..f5177363 100644 --- a/proto/ActivityInfo.proto +++ b/proto/ActivityInfo.proto @@ -92,7 +92,7 @@ message ActivityInfo { uint32 schedule_id = 7; uint32 score_limit = 1870; bool Unk3300_ICNJJKDHPCH = 14; - repeated uint32 Unk3300_BGNIBLKCPCA = 11; + repeated uint32 meet_cond_list = 11; bool Unk3300_NEPKLLBJFKK = 1645; repeated ActivityWatcherInfo watcher_info_list = 6; repeated ActivityPushTipsData activity_push_tips_data_list = 1867; @@ -108,7 +108,7 @@ message ActivityInfo { bool Unk3300_MDBDPIBEGGH = 12; map wish_gift_num_map = 939; uint32 end_time = 10; - repeated uint32 Unk3300_HKKNIHNBHAE = 5; + repeated uint32 expire_cond_list = 5; oneof detail { SeaLampActivityDetailInfo sam_lamp_info = 2; CrucibleActivityDetailInfo crucible_info = 15; diff --git a/proto/AvatarRenameAuditSourceType.proto b/proto/AvatarRenameAuditSourceType.proto new file mode 100644 index 00000000..2a13d6b3 --- /dev/null +++ b/proto/AvatarRenameAuditSourceType.proto @@ -0,0 +1,26 @@ +// 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 +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +enum AvatarRenameAuditSourceType { + AVATAR_RENAME_AUDIT_SOURCE_TYPE_NONE = 0; + AVATAR_RENAME_AUDIT_SOURCE_TYPE_ITEM = 1; + AVATAR_RENAME_AUDIT_SOURCE_TYPE_QUEST = 2; +} diff --git a/proto/BrickBreakerDetailInfo.proto b/proto/BrickBreakerDetailInfo.proto index 044f16fb..aed91b49 100644 --- a/proto/BrickBreakerDetailInfo.proto +++ b/proto/BrickBreakerDetailInfo.proto @@ -24,7 +24,7 @@ option java_package = "emu.grasscutter.net.proto"; message BrickBreakerDetailInfo { repeated BrickBreakerActivityStageInfo stage_info_list = 13; - repeated BrickBreakerLevelInfo Unk3300_AIEGOACOINO = 9; - repeated BrickBreakerLevelInfo Unk3300_BCHEELFPNCD = 11; + repeated BrickBreakerLevelInfo dungeon_level_info_list = 9; + repeated BrickBreakerLevelInfo world_level_info_list = 11; map skill_info_map = 1; } diff --git a/proto/ClientReportNotify.proto b/proto/ClientReportNotify.proto index 8f0e2329..718dbd7e 100644 --- a/proto/ClientReportNotify.proto +++ b/proto/ClientReportNotify.proto @@ -29,6 +29,6 @@ message ClientReportNotify { // IS_ALLOW_CLIENT = 1; // } - string Unk3300_JHJDJEBAFCM = 15; - string Unk3300_AMLEAJLJDFO = 10; + string report_type = 15; + string report_value = 10; } diff --git a/proto/CombineRsp.proto b/proto/CombineRsp.proto index 3d50ff3a..2cc59506 100644 --- a/proto/CombineRsp.proto +++ b/proto/CombineRsp.proto @@ -30,9 +30,9 @@ message CombineRsp { // ENET_IS_RELIABLE = 1; // } - repeated ItemParam Unk3300_IAMGGFHOMEC = 11; - repeated ItemParam Unk3300_BAKPEKIFJOA = 13; - repeated ItemParam Unk3300_CDAFJDFHLKI = 6; + repeated ItemParam total_return_item_list = 11; + repeated ItemParam total_extra_item_list = 13; + repeated ItemParam total_random_item_list = 6; uint64 avatar_guid = 7; uint32 combine_count = 2; uint32 combine_id = 10; diff --git a/proto/EvtBulletHitNotify.proto b/proto/EvtBulletHitNotify.proto index 109d80e4..76c27f43 100644 --- a/proto/EvtBulletHitNotify.proto +++ b/proto/EvtBulletHitNotify.proto @@ -34,9 +34,9 @@ message EvtBulletHitNotify { // } ForwardType forward_type = 2; - uint32 Unk3300_ELNFDKNGHFP = 4; + uint32 single_bullet_id = 4; Vector hit_normal = 9; - uint32 Unk3300_KANAJBJHCLG = 6; + uint32 hit_entity_id = 6; Vector hit_point = 8; HitColliderType hit_collider_type = 10; uint32 entity_id = 14; diff --git a/proto/GetAuthkeyReq.proto b/proto/GetAuthkeyReq.proto index 77a10d05..9e48e371 100644 --- a/proto/GetAuthkeyReq.proto +++ b/proto/GetAuthkeyReq.proto @@ -29,7 +29,7 @@ message GetAuthkeyReq { // IS_ALLOW_CLIENT = 1; // } - uint32 Unk3300_FGBHHPOKCJH = 6; + uint32 sign_type = 6; string auth_appid = 13; - uint32 Unk3300_DODLFCNOAMB = 15; + uint32 authkey_ver = 15; } diff --git a/proto/GetAuthkeyRsp.proto b/proto/GetAuthkeyRsp.proto index adb2c60b..678d8139 100644 --- a/proto/GetAuthkeyRsp.proto +++ b/proto/GetAuthkeyRsp.proto @@ -30,8 +30,8 @@ message GetAuthkeyRsp { int32 retcode = 8; string authkey = 6; - uint32 Unk3300_DODLFCNOAMB = 13; - uint32 Unk3300_FGBHHPOKCJH = 3; + uint32 authkey_ver = 13; + uint32 sign_type = 3; string auth_appid = 7; string game_biz = 1; } diff --git a/proto/GetPlayerTokenReq.proto b/proto/GetPlayerTokenReq.proto index b605249f..dd0c44b8 100644 --- a/proto/GetPlayerTokenReq.proto +++ b/proto/GetPlayerTokenReq.proto @@ -30,7 +30,7 @@ message GetPlayerTokenReq { // } uint32 uid = 10; - uint32 Unk3300_DILMOPPLPEM = 1735; + uint32 cloud_client_ip = 1735; uint32 platform_type = 2; bool is_guest = 14; string online_id = 12; diff --git a/proto/GetPlayerTokenRsp.proto b/proto/GetPlayerTokenRsp.proto index 2248045b..3e7ccb94 100644 --- a/proto/GetPlayerTokenRsp.proto +++ b/proto/GetPlayerTokenRsp.proto @@ -31,7 +31,7 @@ message GetPlayerTokenRsp { // } bytes security_cmd_buffer = 6; - uint32 Unk3300_PIPLDEAPMMN = 7; + uint32 gm_uid = 7; bool is_guest = 11; bool Unk3300_AJBBIPFMBEL = 126; uint32 key_id = 134; @@ -43,7 +43,7 @@ message GetPlayerTokenRsp { uint64 secret_key_seed = 3; string token = 13; string server_rand_key = 1188; - uint32 Unk3300_DILMOPPLPEM = 1670; + uint32 cloud_client_ip = 1670; string birthday = 1847; uint32 tag = 1099; string client_ip_str = 1382; @@ -55,7 +55,7 @@ message GetPlayerTokenRsp { uint32 platform_type = 10; uint32 reg_platform = 646; StopServerInfo stop_server = 1897; - uint32 Unk3300_FHPCJMIILPA = 12; + uint32 black_uid_end_time = 12; bool Unk3300_CFBHAHOHDKC = 746; string account_uid = 1; repeated uint32 finish_collection_id_list = 1766; diff --git a/proto/HideAndSeekActivityDetailInfo.proto b/proto/HideAndSeekActivityDetailInfo.proto index 8cf95301..1ece3b84 100644 --- a/proto/HideAndSeekActivityDetailInfo.proto +++ b/proto/HideAndSeekActivityDetailInfo.proto @@ -22,9 +22,9 @@ import "HideAndSeekMapInfo.proto"; option java_package = "emu.grasscutter.net.proto"; message HideAndSeekActivityDetailInfo { - repeated uint32 Unk3300_JBKIAGNADEN = 6; + repeated uint32 chosen_hunter_skill_list = 6; repeated HideAndSeekMapInfo open_map_info_list = 13; - repeated uint32 Unk3300_FPCDPLNJKKN = 2; - repeated uint32 Unk3300_CMLGPPDANNN = 15; - repeated uint32 Unk3300_HHJPAALNMNK = 4; + repeated uint32 chosen_hider_skill_list = 2; + repeated uint32 chosen_map_list = 15; + repeated uint32 unlock_map_list = 4; } diff --git a/proto/PlayerLoginReq.proto b/proto/PlayerLoginReq.proto index 5a6bd6c3..612ebd1b 100644 --- a/proto/PlayerLoginReq.proto +++ b/proto/PlayerLoginReq.proto @@ -58,7 +58,7 @@ message PlayerLoginReq { uint32 Unk3300_OOBHAIIIPHH = 85; uint32 Unk3300_NDLANBEIGEG = 1320; string country_code = 104; - uint32 Unk3300_PIPLDEAPMMN = 1790; + uint32 gm_uid = 1790; TrackingIOInfo tracking_io_info = 1713; bool is_transfer = 624; string security_library_version = 828; diff --git a/proto/PlayerMatchInfoNotify.proto b/proto/PlayerMatchInfoNotify.proto index 5234777f..705fd671 100644 --- a/proto/PlayerMatchInfoNotify.proto +++ b/proto/PlayerMatchInfoNotify.proto @@ -31,8 +31,8 @@ message PlayerMatchInfoNotify { // } uint32 dungeon_id = 4; - uint32 Unk3300_BNEIANJBLBL = 5; - uint32 Unk3300_OCILKHJPJED = 10; + uint32 match_begin_time = 5; + uint32 estimate_match_cost_time = 10; uint32 host_uid = 12; MatchType match_type = 13; uint32 mechanicus_difficult_level = 15; diff --git a/proto/ProudSkillExtraLevelNotify.proto b/proto/ProudSkillExtraLevelNotify.proto index 2e4408b5..c7cd57d7 100644 --- a/proto/ProudSkillExtraLevelNotify.proto +++ b/proto/ProudSkillExtraLevelNotify.proto @@ -29,7 +29,7 @@ message ProudSkillExtraLevelNotify { // } uint64 avatar_guid = 13; - uint32 Unk3300_ODIOPLHJHAE = 4; - uint32 Unk3300_LKNFMODMEIA = 8; - uint32 Unk3300_IPDBADAAHBA = 2; + uint32 extra_level = 4; + uint32 talent_type = 8; + uint32 talent_index = 2; } diff --git a/proto/RegionalPlayInfoNotify.proto b/proto/RegionalPlayInfoNotify.proto index cf5c6efa..bb00d71f 100644 --- a/proto/RegionalPlayInfoNotify.proto +++ b/proto/RegionalPlayInfoNotify.proto @@ -33,6 +33,6 @@ message RegionalPlayInfoNotify { uint32 play_type = 3; repeated RegionalPlayVar var_list = 13; string play_name = 5; - bool Unk3300_FMEPEBIHNOL = 1; - bool Unk3300_MBGOJOBNPNG = 14; + bool is_enabled = 1; + bool is_in_region = 14; } diff --git a/proto/RegionalPlayVar.proto b/proto/RegionalPlayVar.proto index c833712e..11cfb380 100644 --- a/proto/RegionalPlayVar.proto +++ b/proto/RegionalPlayVar.proto @@ -21,7 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; message RegionalPlayVar { uint32 type = 5; - float Unk3300_FOBMHHNIPPH = 4; - float Unk3300_PIDHFABKIJN = 3; + float base_value = 4; + float max_value = 3; float value = 2; } diff --git a/proto/ResetAvatarRenameReason.proto b/proto/ResetAvatarRenameReason.proto new file mode 100644 index 00000000..f443d82e --- /dev/null +++ b/proto/ResetAvatarRenameReason.proto @@ -0,0 +1,27 @@ +// 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 +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +enum ResetAvatarRenameReason { + RESET_AVATAR_RENAME_REASON_NONE = 0; + RESET_AVATAR_RENAME_REASON_IP_BLACK_LIST = 1; + RESET_AVATAR_RENAME_REASON_QUEST_AUDIT = 2; + RESET_AVATAR_RENAME_REASON_ACTIVE = 3; +} diff --git a/proto/SceneGalleryHideAndSeekInfo.proto b/proto/SceneGalleryHideAndSeekInfo.proto index 0dc83c66..681fa631 100644 --- a/proto/SceneGalleryHideAndSeekInfo.proto +++ b/proto/SceneGalleryHideAndSeekInfo.proto @@ -20,6 +20,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; message SceneGalleryHideAndSeekInfo { - repeated uint32 Unk3300_LHMHALKDBBN = 10; - repeated uint32 Unk3300_CNLKMGFFAEC = 7; + repeated uint32 visible_uid_list = 10; + repeated uint32 caught_uid_list = 7; } diff --git a/proto/SeaLampActivityDetailInfo.proto b/proto/SeaLampActivityDetailInfo.proto index e9661740..8eba1087 100644 --- a/proto/SeaLampActivityDetailInfo.proto +++ b/proto/SeaLampActivityDetailInfo.proto @@ -22,9 +22,9 @@ option java_package = "emu.grasscutter.net.proto"; message SeaLampActivityDetailInfo { repeated uint32 Unk3300_ODBFFAIIPMB = 2; uint32 days = 6; - uint32 Unk3300_DGMGNJLHFMB = 8; + uint32 factor = 8; uint32 progress = 5; repeated uint32 Unk3300_FGHDJJCLNFN = 14; - uint32 Unk3300_GBCCJMBPBBI = 11; + uint32 contribution = 11; uint32 phase_id = 3; } diff --git a/proto/ShopGoods.proto b/proto/ShopGoods.proto index 2dd22ad6..b044bd4c 100644 --- a/proto/ShopGoods.proto +++ b/proto/ShopGoods.proto @@ -22,7 +22,7 @@ import "ItemParam.proto"; option java_package = "emu.grasscutter.net.proto"; message ShopGoods { - uint32 Unk3300_PBMKNPCNBCK = 1003; + uint32 secondary_sheet_id = 1003; ItemParam goods_item = 15; repeated ItemParam cost_item_list = 7; uint32 bought_num = 14; diff --git a/proto/WidgetReportReq.proto b/proto/WidgetReportReq.proto index 192e8daa..1a62f0fb 100644 --- a/proto/WidgetReportReq.proto +++ b/proto/WidgetReportReq.proto @@ -33,5 +33,5 @@ message WidgetReportReq { bool Unk3300_APDFKKNKIJJ = 7; bool Unk3300_BCAIBKDIHHF = 6; uint32 material_id = 2; - bool Unk3300_EFBCLDDKMIM = 14; + bool is_clear_sky_crystal_hint = 14; }