From 7bea581783dde9154d88664d847e4003309903c0 Mon Sep 17 00:00:00 2001 From: Yuuki <6851027-yukiz@users.noreply.gitlab.com> Date: Tue, 22 Aug 2023 23:02:54 +0800 Subject: [PATCH] last sync --- all-in-one.proto | 146 +++++++++--------- .../{DEEPMGDNFLH.proto => ACNCCGPBILN.proto} | 12 +- proto/AbilityIdentifier.proto | 4 +- proto/AbilityMetaTriggerElementReaction.proto | 6 +- .../AbilityMetaUpdateBaseReactionDamage.proto | 6 +- proto/AbilityMixinElementShield.proto | 26 ++++ ...O.proto => AbilityMixinGlobalShield.proto} | 12 +- ...LDLE.proto => AbilityMixinShieldBar.proto} | 10 +- proto/AllWidgetDataNotify.proto | 4 +- proto/AttackResult.proto | 14 +- proto/CMNIAKLILEE.proto | 4 +- proto/ChapterStateNotify.proto | 10 +- proto/DMAJIHFJDNC.proto | 4 +- proto/DoGachaRsp.proto | 4 +- proto/FGNNOLDBLNO.proto | 21 +++ proto/ForgeQueueData.proto | 10 +- proto/GachaInfo.proto | 4 +- proto/GachaWishRsp.proto | 2 +- proto/HLNPOELHMPO.proto | 2 +- proto/JEDIGELMJCL.proto | 22 +++ proto/KFHHLHAMIAL.proto | 2 +- proto/LGDPLHFPCJE.proto | 2 +- proto/LockedPersonallineData.proto | 9 +- ...tTrialSelectAvatarAndEnterDungeonReq.proto | 2 +- proto/OfferingPariDetailData.proto | 23 +++ proto/PIJBPIFLPAE.proto | 2 +- proto/PlayerLoginRsp.proto | 4 +- proto/PlayerOfferingData.proto | 12 +- proto/SceneGalleryBoatMultiInfo.proto | 2 +- ..._CD_TYPE.proto => WidgetExtraCdType.proto} | 2 +- proto/WidgetUpdateExtraCDReq.proto | 4 +- proto/WidgetUpdateExtraCDRsp.proto | 4 +- 32 files changed, 245 insertions(+), 146 deletions(-) rename proto/{DEEPMGDNFLH.proto => ACNCCGPBILN.proto} (82%) create mode 100644 proto/AbilityMixinElementShield.proto rename proto/{CMINCHKMEMO.proto => AbilityMixinGlobalShield.proto} (83%) rename proto/{IGBGGICLDLE.proto => AbilityMixinShieldBar.proto} (89%) create mode 100644 proto/FGNNOLDBLNO.proto create mode 100644 proto/JEDIGELMJCL.proto create mode 100644 proto/OfferingPariDetailData.proto rename proto/{WIDGET_EXTRA_CD_TYPE.proto => WidgetExtraCdType.proto} (97%) diff --git a/all-in-one.proto b/all-in-one.proto index 54be569c..8f926f12 100644 --- a/all-in-one.proto +++ b/all-in-one.proto @@ -129,11 +129,11 @@ message OJBJDBHKLNE { // Obf: ODBBPNOOEOI message AbilityMetaTriggerElementReaction { - uint32 ADHLKLLFLPD = 2; - uint32 GJFGOBCICLP = 14; + uint32 element_reactor_type = 2; + uint32 element_reaction_type = 14; int32 hit_index = 3; uint32 trigger_entity_id = 1; - uint32 ECHFGCGHGEG = 4; + uint32 element_source_type = 4; } message LEGBJIABCMN { @@ -147,9 +147,9 @@ message AbilityMetaSetPoseParameter { // Obf: NGEKKGKDJED message AbilityMetaUpdateBaseReactionDamage { - uint32 DMENLAMJJEM = 1; - AbilityString LDEOKEHFACJ = 4; - uint32 HLMJBJGKLKD = 15; + uint32 reaction_type = 1; + AbilityString global_value_key = 4; + uint32 source_caster_id = 15; AbilityString ability_name = 3; } @@ -199,7 +199,7 @@ message NPDLPJGBLME { float MIEIPCBMANJ = 7; } -message KFHHLHAMIAL { +message AbilityActionServerMonsterLog { repeated int32 param_list = 4; } @@ -255,33 +255,33 @@ message GPKKGDNIAIB { bool KLAGFFLCLCM = 4; } -message CMNIAKLILEE { - float JNEKCJANDGG = 15; +message AbilityMixinEliteShield { + float sub_shield = 15; } -message DEEPMGDNFLH { - float JNEKCJANDGG = 4; - float JPLABPDDDAA = 11; - bool LACELNHKONE = 7; - uint32 EEPFLJEMMLD = 14; - float HNGHMNBGHLG = 10; - uint32 OEEFMKOMJBK = 15; +message AbilityMixinElementShield { + float sub_shield = 4; + float max_shield = 11; + bool is_shield_broken = 7; + uint32 absorb_type = 14; + float shield = 10; + uint32 player_num = 15; } -message CMINCHKMEMO { - bool DLFJNEEBLOG = 8; - float JNEKCJANDGG = 3; +message AbilityMixinGlobalShield { + bool is_create_effect = 8; + float sub_shield = 3; uint32 avatar_id = 12; - string DENNPCBBNFD = 13; - float ABJCKKIJDJH = 4; - float HNGHMNBGHLG = 6; + string shield_effect_name = 13; + float height_offset = 4; + float shield = 6; } -message IGBGGICLDLE { - float JPLABPDDDAA = 5; +message AbilityMixinShieldBar { + float max_shield = 5; uint32 element_type = 8; - uint32 OEEFMKOMJBK = 10; - float HNGHMNBGHLG = 7; + uint32 player_num = 10; + float shield = 7; } // Obf: ECIPFNGJAIF @@ -330,7 +330,7 @@ message PGBNGHFPGED { float NDFGGJOOPBE = 9; } -message PIJBPIFLPAE { +message AbilityMixinFireworksLauncher { uint32 HNGKHBALOLP = 6; uint32 phase = 13; uint32 BIHDGIPJMGC = 12; @@ -2337,7 +2337,7 @@ message MistTrialActivityDetailInfo { message MistTrialSelectAvatarAndEnterDungeonReq { // Obf: FGPIFIDBMKL message SelectAvatarIndex { - oneof LMDJFNHPDIK { + oneof detail { uint32 mist_trial_avatar_id = 4; uint64 formal_avatar_guid = 5; } @@ -10355,8 +10355,8 @@ message AbilityIdentifier { uint32 instanced_modifier_id = 11; int32 local_id = 2; bool is_serverbuff_modifier = 14; - uint32 PLEOONAACJI = 1; - uint32 DJPMGPMOPIN = 15; + uint32 modifier_owner_id = 1; + uint32 ability_caster_id = 15; uint32 instanced_ability_id = 9; } @@ -10364,7 +10364,7 @@ message AbilityIdentifier { message AttackResult { uint32 GNHFHCDDDBA = 1198; uint32 BHAPFDKHNPD = 82; - uint32 PJJEEPKBHIM = 1624; + uint32 hashed_anim_event_id = 1624; uint32 KDBNEJKOKDB = 6; float HKDJFJDCKBI = 2018; uint32 LADOHMHIICA = 1640; @@ -10372,10 +10372,10 @@ message AttackResult { AttackHitEffectResult hit_eff_result = 15; uint32 HAGEIJIIBAE = 1178; float GGPOMBNHHCA = 804; - bool KBKKCNLMPHE = 7; + bool is_crit = 7; uint32 element_type = 8; - uint32 CNCOJEJPNAH = 1597; - uint32 KDBJJLGHGBD = 1235; + uint32 attack_timestamp_ms = 1597; + uint32 amplify_reaction_type = 1235; bool IFHLFNMODNC = 78; uint32 BIIDCDNCFPH = 1; uint32 AFPDNEPONHN = 158; @@ -10385,13 +10385,13 @@ message AttackResult { float damage = 11; HitCollision hit_collision = 2; bool PFEKJJINPCE = 1765; - uint32 BNONIMILAAH = 1772; + uint32 addhurt_reaction_type = 1772; Vector resolved_dir = 3; uint32 OJPOIAJBPCN = 316; - float EAGHFGPNGHD = 979; + float element_durability_attenuation = 979; AbilityIdentifier ability_identifier = 12; bool GMKBKKOFIPN = 309; - float CBBCOOIFNCP = 1660; + float damage_shield = 1660; } // Obf: FAABEIHJGBK @@ -10557,7 +10557,7 @@ message AJDKBLNNCOI { Vector CBGCJPMPMKB = 5; } -message LGDPLHFPCJE { +message EvtLightCoreMove { Vector target_pos = 15; float IIMDFODNMKO = 13; float speed = 9; @@ -11167,7 +11167,7 @@ message GachaInfo { repeated uint32 displayUp4ItemList = 21; string gachaProbUrl = 1; uint32 curScheduleDailyGachaTimes = 1818; - uint32 tenCostItemId = 1593; + uint32 wishItemId = 1593; string gachaRecordUrlOversea = 1379; uint32 schedule_id = 10; uint32 wishProgress = 1219; @@ -11176,7 +11176,7 @@ message GachaInfo { uint32 gachaSortId = 15; repeated GachaUpInfo gacha_up_info_list = 1530; uint32 end_time = 9; - uint32 wishItemId = 8; + uint32 tenCostItemId = 8; uint32 costItemId = 2; uint32 gachaType = 6; uint32 begin_time = 12; @@ -11238,10 +11238,10 @@ message DoGachaRsp { uint32 leftGachaTimes = 6; uint32 gachaTimes = 10; uint32 tenCostItemNum = 1; - uint32 tenCostItemId = 2; + uint32 wishItemId = 2; uint32 costItemNum = 5; bool KIHLEFLGKAD = 888; - uint32 wishItemId = 7; + uint32 tenCostItemId = 7; uint32 costItemId = 9; bool PLBFOACGPII = 125; } @@ -11259,7 +11259,7 @@ message GachaWishReq { message GachaWishRsp { int32 retcode = 9; uint32 gachaType = 10; - uint32 tenCostItemId = 1; + uint32 wishItemId = 1; uint32 wishMaxProgress = 13; uint32 wishProgress = 2; uint32 gachaScheduleId = 4; @@ -11972,7 +11972,7 @@ message LanV3BoatMultiPlayerData { // Obf: OGJDCOJNONF message SceneGalleryBoatMultiInfo { - repeated LanV3BoatMultiPlayerData scInfo = 12; + repeated LanV3BoatMultiPlayerData player_data = 12; } // Obf: DOFBIHDDOHI @@ -15615,14 +15615,12 @@ message HomeSearchBlueprintRsp { } // CmdId: 4718 -// Obf: JEDIGELMJCL -message HomeSaveArrangementNoChangeReq { +message JEDIGELMJCL { string share_code = 2; } // CmdId: 4509 -// Obf: ACNCCGPBILN -message HomeSaveArrangementNoChangeRsp { +message ACNCCGPBILN { int32 retcode = 14; HomeBlueprintSlotInfo slot_info = 15; } @@ -16227,12 +16225,12 @@ message CombineRsp { // Obf: PDINDMONLDB message ForgeQueueData { uint32 avatar_id = 14; - uint32 unfinish_count = 15; - uint32 next_finish_timestamp = 13; - uint32 finish_count = 4; + uint32 finish_count = 15; + uint32 total_finish_timestamp = 13; + uint32 queue_id = 4; uint32 forge_id = 1; - uint32 total_finish_timestamp = 8; - uint32 queue_id = 9; + uint32 next_finish_timestamp = 8; + uint32 unfinish_count = 9; } // CmdId: 646 @@ -18246,11 +18244,11 @@ message PlayerOfferingData { uint32 level = 9; repeated uint32 taken_level_reward_list = 12; bool HJLIDMNHDFD = 3; - optional PlayerOfferingData offering_pari_detail_data = 1695; + optional OfferingPariDetailData offering_pari_detail_data = 1695; } // Obf: GEFPJNAPGJK -message PlayerOfferingData { +message OfferingPariDetailData { uint32 IGHMDGHKADF = 8; bool CJNBGNOIIJL = 4; } @@ -18720,7 +18718,7 @@ message PlayerLoginRsp { int32 ability_hash_code = 14; string client_version_suffix = 1903; bool NENMBLFJAMC = 7; - bytes playerData = 136; + bytes sc_info = 136; string client_md5 = 715; string game_biz = 10; repeated FeatureBlockInfo feature_block_info_list = 114; @@ -18746,7 +18744,7 @@ message PlayerLoginRsp { double total_tick_time = 903; string country_code = 1280; uint32 client_data_version = 4; - bytes scInfo = 3; + bytes player_data = 3; bool GPMHJGJLAFH = 13; uint32 client_silence_data_version = 6; uint32 player_data_version = 2; @@ -19737,19 +19735,21 @@ message QuestDestroyEntityRsp { // CmdId: 416 // Obf: CLNHLPJKIHO message ChapterStateNotify { - message NNBEJPGCIMD { + // Obf: NNBEJPGCIMD + message NeedPlayerLevel { bool is_limit = 8; uint32 configNeedPlayerLevel = 1; } - message HDPCHNPCKLP { + // Obf: HDPCHNPCKLP + message NeedBeginTime { uint32 configNeedBeginTime = 4; bool is_limit = 7; } uint32 chapter_id = 9; - HDPCHNPCKLP need_begin_time = 13; - NNBEJPGCIMD need_player_level = 1; + NeedBeginTime need_begin_time = 13; + NeedPlayerLevel need_player_level = 1; ChapterState chapter_state = 14; } @@ -19913,9 +19913,10 @@ message PersonalLineAllDataReq { // Obf: LPPGEMGIIIC message LockedPersonallineData { - enum JEMKDFPLHKI { - JEMKDFPLHKI_Level = 0; - JEMKDFPLHKI_Quest = 1; + // Obf: JEMKDFPLHKI + enum LockReason { + LEVEL = 0; + QUEST = 1; } message MKKLIJOGAKA { @@ -19923,7 +19924,7 @@ message LockedPersonallineData { uint32 chapter_id = 3; } - JEMKDFPLHKI lock_reason = 13; + LockReason lock_reason = 13; uint32 personal_line_id = 14; oneof param { uint32 chapter_id = 6; @@ -23323,7 +23324,7 @@ message AISnapshotEntityData { uint32 FCPDGFADJGP = 6; } -message HLNPOELHMPO { +message AISnapshotInfo { repeated AISnapshotEntityData ACFKMPMENHK = 3; } @@ -24864,8 +24865,7 @@ message WeatherWizardData { uint32 shield_value = 5; } -// Obf: FGNNOLDBLNO -message WidgetCameraInfo { +message FGNNOLDBLNO { bool NKHNKOHCCHJ = 1; } @@ -25028,7 +25028,7 @@ message AllWidgetDataNotify { repeated WidgetCoolDownData HLEHGMDGPDC = 8; repeated uint32 ENNIJLCIBGH = 1276; repeated uint32 background_active_widget_list = 3; - WidgetCameraInfo MHDAHEDKPMG = 2; + FGNNOLDBLNO MHDAHEDKPMG = 2; repeated OneoffGatherPointDetectorData oneoff_gather_point_detector_data_list = 12; } @@ -25149,14 +25149,14 @@ message WidgetCaptureAnimalRsp { message WidgetUpdateExtraCDReq { uint32 cd_group = 10; uint32 material_id = 13; - WIDGET_EXTRA_CD_TYPE extra_cd_type = 7; + WidgetExtraCdType extra_cd_type = 7; } // CmdId: 6018 // Obf: ECEDMOBDGMI message WidgetUpdateExtraCDRsp { int32 retcode = 5; - WIDGET_EXTRA_CD_TYPE extra_cd_type = 6; + WidgetExtraCdType extra_cd_type = 6; uint32 cd_group = 12; uint32 material_id = 14; WidgetCoolDownData cool_data = 8; @@ -25264,7 +25264,7 @@ message WidgetWeatherWizardDataNotify { // CmdId: 5979 message DMAJIHFJDNC { - WidgetCameraInfo MHDAHEDKPMG = 15; + FGNNOLDBLNO MHDAHEDKPMG = 15; } // CmdId: 5905 @@ -27945,7 +27945,7 @@ enum WidgetCreatorOpType { } // Obf: NEIEMOHMLEA -enum WIDGET_EXTRA_CD_TYPE { +enum WidgetExtraCdType { WIDGET_EXTRA_CD_TYPE_NONE = 0; WIDGET_EXTRA_CD_TYPE_E_SKILL_SHARED = 1; } diff --git a/proto/DEEPMGDNFLH.proto b/proto/ACNCCGPBILN.proto similarity index 82% rename from proto/DEEPMGDNFLH.proto rename to proto/ACNCCGPBILN.proto index 34dae933..e9f18933 100644 --- a/proto/DEEPMGDNFLH.proto +++ b/proto/ACNCCGPBILN.proto @@ -16,11 +16,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -message DEEPMGDNFLH { - float JNEKCJANDGG = 4; - float JPLABPDDDAA = 11; - bool LACELNHKONE = 7; - uint32 EEPFLJEMMLD = 14; - float HNGHMNBGHLG = 10; - uint32 OEEFMKOMJBK = 15; +import "HomeBlueprintSlotInfo.proto"; +// CmdId: 4509 +message ACNCCGPBILN { + int32 retcode = 14; + HomeBlueprintSlotInfo slot_info = 15; } diff --git a/proto/AbilityIdentifier.proto b/proto/AbilityIdentifier.proto index a8440ffd..d1f67543 100644 --- a/proto/AbilityIdentifier.proto +++ b/proto/AbilityIdentifier.proto @@ -21,7 +21,7 @@ message AbilityIdentifier { uint32 instanced_modifier_id = 11; int32 local_id = 2; bool is_serverbuff_modifier = 14; - uint32 PLEOONAACJI = 1; - uint32 DJPMGPMOPIN = 15; + uint32 modifier_owner_id = 1; + uint32 ability_caster_id = 15; uint32 instanced_ability_id = 9; } diff --git a/proto/AbilityMetaTriggerElementReaction.proto b/proto/AbilityMetaTriggerElementReaction.proto index 73fb541a..ad05804b 100644 --- a/proto/AbilityMetaTriggerElementReaction.proto +++ b/proto/AbilityMetaTriggerElementReaction.proto @@ -18,9 +18,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: ODBBPNOOEOI message AbilityMetaTriggerElementReaction { - uint32 ADHLKLLFLPD = 2; - uint32 GJFGOBCICLP = 14; + uint32 element_reactor_type = 2; + uint32 element_reaction_type = 14; int32 hit_index = 3; uint32 trigger_entity_id = 1; - uint32 ECHFGCGHGEG = 4; + uint32 element_source_type = 4; } diff --git a/proto/AbilityMetaUpdateBaseReactionDamage.proto b/proto/AbilityMetaUpdateBaseReactionDamage.proto index ec0034d6..346ec626 100644 --- a/proto/AbilityMetaUpdateBaseReactionDamage.proto +++ b/proto/AbilityMetaUpdateBaseReactionDamage.proto @@ -19,8 +19,8 @@ option java_package = "emu.grasscutter.net.proto"; import "AbilityString.proto"; // Obf: NGEKKGKDJED message AbilityMetaUpdateBaseReactionDamage { - uint32 DMENLAMJJEM = 1; - AbilityString LDEOKEHFACJ = 4; - uint32 HLMJBJGKLKD = 15; + uint32 reaction_type = 1; + AbilityString global_value_key = 4; + uint32 source_caster_id = 15; AbilityString ability_name = 3; } diff --git a/proto/AbilityMixinElementShield.proto b/proto/AbilityMixinElementShield.proto new file mode 100644 index 00000000..1346173d --- /dev/null +++ b/proto/AbilityMixinElementShield.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy 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"; +message AbilityMixinElementShield { + float sub_shield = 4; + float max_shield = 11; + bool is_shield_broken = 7; + uint32 absorb_type = 14; + float shield = 10; + uint32 player_num = 15; +} \ No newline at end of file diff --git a/proto/CMINCHKMEMO.proto b/proto/AbilityMixinGlobalShield.proto similarity index 83% rename from proto/CMINCHKMEMO.proto rename to proto/AbilityMixinGlobalShield.proto index dc6aecda..15c5f2b2 100644 --- a/proto/CMINCHKMEMO.proto +++ b/proto/AbilityMixinGlobalShield.proto @@ -16,11 +16,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -message CMINCHKMEMO { - bool DLFJNEEBLOG = 8; - float JNEKCJANDGG = 3; +message AbilityMixinGlobalShield { + bool is_create_effect = 8; + float sub_shield = 3; uint32 avatar_id = 12; - string DENNPCBBNFD = 13; - float ABJCKKIJDJH = 4; - float HNGHMNBGHLG = 6; + string shield_effect_name = 13; + float height_offset = 4; + float shield = 6; } diff --git a/proto/IGBGGICLDLE.proto b/proto/AbilityMixinShieldBar.proto similarity index 89% rename from proto/IGBGGICLDLE.proto rename to proto/AbilityMixinShieldBar.proto index deac5bd4..9e0bf3d7 100644 --- a/proto/IGBGGICLDLE.proto +++ b/proto/AbilityMixinShieldBar.proto @@ -16,9 +16,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -message IGBGGICLDLE { - float JPLABPDDDAA = 5; +message AbilityMixinShieldBar { + float max_shield = 5; uint32 element_type = 8; - uint32 OEEFMKOMJBK = 10; - float HNGHMNBGHLG = 7; -} + uint32 player_num = 10; + float shield = 7; +} \ No newline at end of file diff --git a/proto/AllWidgetDataNotify.proto b/proto/AllWidgetDataNotify.proto index 1a80b3e9..310bd4ea 100644 --- a/proto/AllWidgetDataNotify.proto +++ b/proto/AllWidgetDataNotify.proto @@ -23,7 +23,7 @@ import "AnchorPointData.proto"; import "SkyCrystalDetectorData.proto"; import "WidgetSlotData.proto"; import "ClientCollectorData.proto"; -import "WidgetCameraInfo.proto"; +import "FGNNOLDBLNO.proto"; import "OneoffGatherPointDetectorData.proto"; // CmdId: 4274 // Obf: KKFGPLOAPPM @@ -40,6 +40,6 @@ message AllWidgetDataNotify { repeated WidgetCoolDownData HLEHGMDGPDC = 8; repeated uint32 ENNIJLCIBGH = 1276; repeated uint32 background_active_widget_list = 3; - WidgetCameraInfo MHDAHEDKPMG = 2; + FGNNOLDBLNO MHDAHEDKPMG = 2; repeated OneoffGatherPointDetectorData oneoff_gather_point_detector_data_list = 12; } diff --git a/proto/AttackResult.proto b/proto/AttackResult.proto index 6a3e420b..594a7e2c 100644 --- a/proto/AttackResult.proto +++ b/proto/AttackResult.proto @@ -24,7 +24,7 @@ import "AbilityIdentifier.proto"; message AttackResult { uint32 GNHFHCDDDBA = 1198; uint32 BHAPFDKHNPD = 82; - uint32 PJJEEPKBHIM = 1624; + uint32 hashed_anim_event_id = 1624; uint32 KDBNEJKOKDB = 6; float HKDJFJDCKBI = 2018; uint32 LADOHMHIICA = 1640; @@ -32,10 +32,10 @@ message AttackResult { AttackHitEffectResult hit_eff_result = 15; uint32 HAGEIJIIBAE = 1178; float GGPOMBNHHCA = 804; - bool KBKKCNLMPHE = 7; + bool is_crit = 7; uint32 element_type = 8; - uint32 CNCOJEJPNAH = 1597; - uint32 KDBJJLGHGBD = 1235; + uint32 attack_timestamp_ms = 1597; + uint32 amplify_reaction_type = 1235; bool IFHLFNMODNC = 78; uint32 BIIDCDNCFPH = 1; uint32 AFPDNEPONHN = 158; @@ -45,11 +45,11 @@ message AttackResult { float damage = 11; HitCollision hit_collision = 2; bool PFEKJJINPCE = 1765; - uint32 BNONIMILAAH = 1772; + uint32 addhurt_reaction_type = 1772; Vector resolved_dir = 3; uint32 OJPOIAJBPCN = 316; - float EAGHFGPNGHD = 979; + float element_durability_attenuation = 979; AbilityIdentifier ability_identifier = 12; bool GMKBKKOFIPN = 309; - float CBBCOOIFNCP = 1660; + float damage_shield = 1660; } diff --git a/proto/CMNIAKLILEE.proto b/proto/CMNIAKLILEE.proto index 1f7c09d1..49cc19bf 100644 --- a/proto/CMNIAKLILEE.proto +++ b/proto/CMNIAKLILEE.proto @@ -16,6 +16,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -message CMNIAKLILEE { - float JNEKCJANDGG = 15; +message AbilityMixinEliteShield { + float sub_shield = 15; } diff --git a/proto/ChapterStateNotify.proto b/proto/ChapterStateNotify.proto index 32057953..05f5e729 100644 --- a/proto/ChapterStateNotify.proto +++ b/proto/ChapterStateNotify.proto @@ -20,18 +20,20 @@ import "ChapterState.proto"; // CmdId: 416 // Obf: CLNHLPJKIHO message ChapterStateNotify { - message NNBEJPGCIMD { + // Obf: NNBEJPGCIMD + message NeedPlayerLevel { bool is_limit = 8; uint32 configNeedPlayerLevel = 1; } - message HDPCHNPCKLP { + // Obf: HDPCHNPCKLP + message NeedBeginTime { uint32 configNeedBeginTime = 4; bool is_limit = 7; } uint32 chapter_id = 9; - HDPCHNPCKLP need_begin_time = 13; - NNBEJPGCIMD need_player_level = 1; + NeedBeginTime need_begin_time = 13; + NeedPlayerLevel need_player_level = 1; ChapterState chapter_state = 14; } diff --git a/proto/DMAJIHFJDNC.proto b/proto/DMAJIHFJDNC.proto index 801c1c5c..aba63c67 100644 --- a/proto/DMAJIHFJDNC.proto +++ b/proto/DMAJIHFJDNC.proto @@ -16,8 +16,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "WidgetCameraInfo.proto"; +import "FGNNOLDBLNO.proto"; // CmdId: 5979 message DMAJIHFJDNC { - WidgetCameraInfo MHDAHEDKPMG = 15; + FGNNOLDBLNO MHDAHEDKPMG = 15; } diff --git a/proto/DoGachaRsp.proto b/proto/DoGachaRsp.proto index 0d5fb2d6..82c07e63 100644 --- a/proto/DoGachaRsp.proto +++ b/proto/DoGachaRsp.proto @@ -33,10 +33,10 @@ message DoGachaRsp { uint32 leftGachaTimes = 6; uint32 gachaTimes = 10; uint32 tenCostItemNum = 1; - uint32 tenCostItemId = 2; + uint32 wishItemId = 2; uint32 costItemNum = 5; bool KIHLEFLGKAD = 888; - uint32 wishItemId = 7; + uint32 tenCostItemId = 7; uint32 costItemId = 9; bool PLBFOACGPII = 125; } diff --git a/proto/FGNNOLDBLNO.proto b/proto/FGNNOLDBLNO.proto new file mode 100644 index 00000000..1f96be35 --- /dev/null +++ b/proto/FGNNOLDBLNO.proto @@ -0,0 +1,21 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy 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"; +message FGNNOLDBLNO { + bool NKHNKOHCCHJ = 1; +} diff --git a/proto/ForgeQueueData.proto b/proto/ForgeQueueData.proto index 387ca50f..a93758d2 100644 --- a/proto/ForgeQueueData.proto +++ b/proto/ForgeQueueData.proto @@ -19,10 +19,10 @@ option java_package = "emu.grasscutter.net.proto"; // Obf: PDINDMONLDB message ForgeQueueData { uint32 avatar_id = 14; - uint32 unfinish_count = 15; - uint32 next_finish_timestamp = 13; - uint32 finish_count = 4; + uint32 finish_count = 15; + uint32 total_finish_timestamp = 13; + uint32 queue_id = 4; uint32 forge_id = 1; - uint32 total_finish_timestamp = 8; - uint32 queue_id = 9; + uint32 next_finish_timestamp = 8; + uint32 unfinish_count = 9; } diff --git a/proto/GachaInfo.proto b/proto/GachaInfo.proto index daf1ec5f..e2076868 100644 --- a/proto/GachaInfo.proto +++ b/proto/GachaInfo.proto @@ -28,7 +28,7 @@ message GachaInfo { repeated uint32 displayUp4ItemList = 21; string gachaProbUrl = 1; uint32 curScheduleDailyGachaTimes = 1818; - uint32 tenCostItemId = 1593; + uint32 wishItemId = 1593; string gachaRecordUrlOversea = 1379; uint32 schedule_id = 10; uint32 wishProgress = 1219; @@ -37,7 +37,7 @@ message GachaInfo { uint32 gachaSortId = 15; repeated GachaUpInfo gacha_up_info_list = 1530; uint32 end_time = 9; - uint32 wishItemId = 8; + uint32 tenCostItemId = 8; uint32 costItemId = 2; uint32 gachaType = 6; uint32 begin_time = 12; diff --git a/proto/GachaWishRsp.proto b/proto/GachaWishRsp.proto index 805874d3..3ffe22ae 100644 --- a/proto/GachaWishRsp.proto +++ b/proto/GachaWishRsp.proto @@ -21,7 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; message GachaWishRsp { int32 retcode = 9; uint32 gachaType = 10; - uint32 tenCostItemId = 1; + uint32 wishItemId = 1; uint32 wishMaxProgress = 13; uint32 wishProgress = 2; uint32 gachaScheduleId = 4; diff --git a/proto/HLNPOELHMPO.proto b/proto/HLNPOELHMPO.proto index c85f01c3..4cf75272 100644 --- a/proto/HLNPOELHMPO.proto +++ b/proto/HLNPOELHMPO.proto @@ -17,6 +17,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "AISnapshotEntityData.proto"; -message HLNPOELHMPO { +message AISnapshotInfo { repeated AISnapshotEntityData ACFKMPMENHK = 3; } diff --git a/proto/JEDIGELMJCL.proto b/proto/JEDIGELMJCL.proto new file mode 100644 index 00000000..184ec29e --- /dev/null +++ b/proto/JEDIGELMJCL.proto @@ -0,0 +1,22 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy 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"; +// CmdId: 4718 +message JEDIGELMJCL { + string share_code = 2; +} diff --git a/proto/KFHHLHAMIAL.proto b/proto/KFHHLHAMIAL.proto index dc577c81..e8d856a3 100644 --- a/proto/KFHHLHAMIAL.proto +++ b/proto/KFHHLHAMIAL.proto @@ -16,6 +16,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -message KFHHLHAMIAL { +message AbilityActionServerMonsterLog { repeated int32 param_list = 4; } diff --git a/proto/LGDPLHFPCJE.proto b/proto/LGDPLHFPCJE.proto index 0a4676c2..4ec711b8 100644 --- a/proto/LGDPLHFPCJE.proto +++ b/proto/LGDPLHFPCJE.proto @@ -17,7 +17,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; -message LGDPLHFPCJE { +message EvtLightCoreMove { Vector target_pos = 15; float IIMDFODNMKO = 13; float speed = 9; diff --git a/proto/LockedPersonallineData.proto b/proto/LockedPersonallineData.proto index 52b5ba41..bc5312f4 100644 --- a/proto/LockedPersonallineData.proto +++ b/proto/LockedPersonallineData.proto @@ -18,9 +18,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: LPPGEMGIIIC message LockedPersonallineData { - enum JEMKDFPLHKI { - JEMKDFPLHKI_Level = 0; - JEMKDFPLHKI_Quest = 1; + // Obf: JEMKDFPLHKI + enum LockReason { + LEVEL = 0; + QUEST = 1; } message MKKLIJOGAKA { @@ -28,7 +29,7 @@ message LockedPersonallineData { uint32 chapter_id = 3; } - JEMKDFPLHKI lock_reason = 13; + LockReason lock_reason = 13; uint32 personal_line_id = 14; oneof param { uint32 chapter_id = 6; diff --git a/proto/MistTrialSelectAvatarAndEnterDungeonReq.proto b/proto/MistTrialSelectAvatarAndEnterDungeonReq.proto index 247c429b..717ab04d 100644 --- a/proto/MistTrialSelectAvatarAndEnterDungeonReq.proto +++ b/proto/MistTrialSelectAvatarAndEnterDungeonReq.proto @@ -21,7 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; message MistTrialSelectAvatarAndEnterDungeonReq { // Obf: FGPIFIDBMKL message SelectAvatarIndex { - oneof LMDJFNHPDIK { + oneof detail { uint32 mist_trial_avatar_id = 4; uint64 formal_avatar_guid = 5; } diff --git a/proto/OfferingPariDetailData.proto b/proto/OfferingPariDetailData.proto new file mode 100644 index 00000000..7a865c83 --- /dev/null +++ b/proto/OfferingPariDetailData.proto @@ -0,0 +1,23 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy 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"; +// Obf: GEFPJNAPGJK +message OfferingPariDetailData { + uint32 IGHMDGHKADF = 8; + bool CJNBGNOIIJL = 4; +} diff --git a/proto/PIJBPIFLPAE.proto b/proto/PIJBPIFLPAE.proto index f552bcb4..0d5af315 100644 --- a/proto/PIJBPIFLPAE.proto +++ b/proto/PIJBPIFLPAE.proto @@ -16,7 +16,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -message PIJBPIFLPAE { +message AbilityMixinFireworksLauncher { uint32 HNGKHBALOLP = 6; uint32 phase = 13; uint32 BIHDGIPJMGC = 12; diff --git a/proto/PlayerLoginRsp.proto b/proto/PlayerLoginRsp.proto index 1279636e..19bd3c91 100644 --- a/proto/PlayerLoginRsp.proto +++ b/proto/PlayerLoginRsp.proto @@ -28,7 +28,7 @@ message PlayerLoginRsp { int32 ability_hash_code = 14; string client_version_suffix = 1903; bool NENMBLFJAMC = 7; - bytes playerData = 136; + bytes sc_info = 136; string client_md5 = 715; string game_biz = 10; repeated FeatureBlockInfo feature_block_info_list = 114; @@ -54,7 +54,7 @@ message PlayerLoginRsp { double total_tick_time = 903; string country_code = 1280; uint32 client_data_version = 4; - bytes scInfo = 3; + bytes player_data = 3; bool GPMHJGJLAFH = 13; uint32 client_silence_data_version = 6; uint32 player_data_version = 2; diff --git a/proto/PlayerOfferingData.proto b/proto/PlayerOfferingData.proto index 28c813a7..e2a33f64 100644 --- a/proto/PlayerOfferingData.proto +++ b/proto/PlayerOfferingData.proto @@ -16,8 +16,14 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Obf: GEFPJNAPGJK +import "OfferingPariDetailData.proto"; +// Obf: MHPIGIIPLIC message PlayerOfferingData { - uint32 IGHMDGHKADF = 8; - bool CJNBGNOIIJL = 4; + map EOLCDPBPNGG = 8; + bool is_first_interact = 10; + uint32 offering_id = 5; + uint32 level = 9; + repeated uint32 taken_level_reward_list = 12; + bool HJLIDMNHDFD = 3; + optional OfferingPariDetailData offering_pari_detail_data = 1695; } diff --git a/proto/SceneGalleryBoatMultiInfo.proto b/proto/SceneGalleryBoatMultiInfo.proto index 00cb26c0..0614d5fd 100644 --- a/proto/SceneGalleryBoatMultiInfo.proto +++ b/proto/SceneGalleryBoatMultiInfo.proto @@ -19,5 +19,5 @@ option java_package = "emu.grasscutter.net.proto"; import "LanV3BoatMultiPlayerData.proto"; // Obf: OGJDCOJNONF message SceneGalleryBoatMultiInfo { - repeated LanV3BoatMultiPlayerData scInfo = 12; + repeated LanV3BoatMultiPlayerData player_data = 12; } diff --git a/proto/WIDGET_EXTRA_CD_TYPE.proto b/proto/WidgetExtraCdType.proto similarity index 97% rename from proto/WIDGET_EXTRA_CD_TYPE.proto rename to proto/WidgetExtraCdType.proto index 2b711d43..35555bfd 100644 --- a/proto/WIDGET_EXTRA_CD_TYPE.proto +++ b/proto/WidgetExtraCdType.proto @@ -17,7 +17,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: NEIEMOHMLEA -enum WIDGET_EXTRA_CD_TYPE { +enum WidgetExtraCdType { WIDGET_EXTRA_CD_TYPE_NONE = 0; WIDGET_EXTRA_CD_TYPE_E_SKILL_SHARED = 1; } diff --git a/proto/WidgetUpdateExtraCDReq.proto b/proto/WidgetUpdateExtraCDReq.proto index 7a07d6b6..9cccf907 100644 --- a/proto/WidgetUpdateExtraCDReq.proto +++ b/proto/WidgetUpdateExtraCDReq.proto @@ -16,11 +16,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "WIDGET_EXTRA_CD_TYPE.proto"; +import "WidgetExtraCdType.proto"; // CmdId: 5977 // Obf: AEGIILILAJA message WidgetUpdateExtraCDReq { uint32 cd_group = 10; uint32 material_id = 13; - WIDGET_EXTRA_CD_TYPE extra_cd_type = 7; + WidgetExtraCdType extra_cd_type = 7; } diff --git a/proto/WidgetUpdateExtraCDRsp.proto b/proto/WidgetUpdateExtraCDRsp.proto index 13e5ddeb..8abb0342 100644 --- a/proto/WidgetUpdateExtraCDRsp.proto +++ b/proto/WidgetUpdateExtraCDRsp.proto @@ -16,13 +16,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "WIDGET_EXTRA_CD_TYPE.proto"; +import "WidgetExtraCdType.proto"; import "WidgetCoolDownData.proto"; // CmdId: 6018 // Obf: ECEDMOBDGMI message WidgetUpdateExtraCDRsp { int32 retcode = 5; - WIDGET_EXTRA_CD_TYPE extra_cd_type = 6; + WidgetExtraCdType extra_cd_type = 6; uint32 cd_group = 12; uint32 material_id = 14; WidgetCoolDownData cool_data = 8;