diff --git a/proto/AbilityMixinRecoverInfo.proto b/proto/AbilityMixinRecoverInfo.proto index 32d06061..6994b6d1 100644 --- a/proto/AbilityMixinRecoverInfo.proto +++ b/proto/AbilityMixinRecoverInfo.proto @@ -5,7 +5,7 @@ import "MassivePropSyncInfo.proto"; message AbilityMixinRecoverInfo { - oneof IMHIHMPKFBB { + oneof source { uint32 instanced_ability_id = 1; uint32 instanced_modifier_id = 2; } diff --git a/proto/AbilityScalarValueEntry.proto b/proto/AbilityScalarValueEntry.proto index 1bf2a4b2..60fdf76f 100644 --- a/proto/AbilityScalarValueEntry.proto +++ b/proto/AbilityScalarValueEntry.proto @@ -10,7 +10,7 @@ import "AbilityScalarType.proto"; message AbilityScalarValueEntry { AbilityString key = 1; AbilityScalarType valueType = 2; - oneof FOOIPEBDMGK { + oneof value { float float_value = 3; string string_value = 4; int32 int_value = 5; diff --git a/proto/AbilityString.proto b/proto/AbilityString.proto index 4b5be87c..aca16f8b 100644 --- a/proto/AbilityString.proto +++ b/proto/AbilityString.proto @@ -6,7 +6,7 @@ option java_package = "emu.grasscutter.net.proto"; message AbilityString { - oneof JNHEJKGOMOD { + oneof type { string str = 1; uint32 hash = 2; } diff --git a/proto/ActivityInfo.proto b/proto/ActivityInfo.proto index 6a99d132..cc75e0ef 100644 --- a/proto/ActivityInfo.proto +++ b/proto/ActivityInfo.proto @@ -100,7 +100,7 @@ message ActivityInfo { map wishGiftNumMap = 1052; bool Unk3300_NEPKLLBJFKK = 1637; uint32 beginTime = 5; - oneof IKJIPGGMNBK { + oneof detail { SamLampInfo sam_lamp_info = 4; CrucibleInfo crucible_info = 13; SalesmanInfo salesman_info = 1; diff --git a/proto/AnimatorParameterValueInfo.proto b/proto/AnimatorParameterValueInfo.proto index b3de3e36..637bd427 100644 --- a/proto/AnimatorParameterValueInfo.proto +++ b/proto/AnimatorParameterValueInfo.proto @@ -7,7 +7,7 @@ option java_package = "emu.grasscutter.net.proto"; message AnimatorParameterValueInfo { uint32 paraType = 1; - oneof MMJOJNNFGCN { + oneof para_val { int32 int_val = 2; float float_val = 3; bool bool_val = 4; diff --git a/proto/DungeonChallengeFinishNotify.proto b/proto/DungeonChallengeFinishNotify.proto index 82387749..23a6fd53 100644 --- a/proto/DungeonChallengeFinishNotify.proto +++ b/proto/DungeonChallengeFinishNotify.proto @@ -26,7 +26,7 @@ message DungeonChallengeFinishNotify { uint32 currentValue = 9; uint32 timeCost = 11; map strengthenPointDataMap = 7; - oneof NPHEJFPOMFG { + oneof detail { ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1867; EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 942; PotionDungeonResultInfo potion_dungeon_result_info = 709; diff --git a/proto/DungeonSettleNotify.proto b/proto/DungeonSettleNotify.proto index da3844e7..97cd7e97 100644 --- a/proto/DungeonSettleNotify.proto +++ b/proto/DungeonSettleNotify.proto @@ -36,7 +36,7 @@ message DungeonSettleNotify { uint32 createPlayerUid = 9; bool isSuccess = 4; uint32 closeTime = 6; - oneof IMHJDGEKFBP { + oneof detail { TowerLevelEndNotify tower_level_end_notify = 281; TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 1737; ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1045; diff --git a/proto/Equip.proto b/proto/Equip.proto index ed072287..e2721344 100644 --- a/proto/Equip.proto +++ b/proto/Equip.proto @@ -6,7 +6,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Reliquary.proto"; import "Weapon.proto"; message Equip { - oneof FOIGJKHHNPG { + oneof detail { Reliquary reliquary = 1; Weapon weapon = 2; } diff --git a/proto/GadgetPlayInfo.proto b/proto/GadgetPlayInfo.proto index 3e349ab0..8ce68564 100644 --- a/proto/GadgetPlayInfo.proto +++ b/proto/GadgetPlayInfo.proto @@ -11,7 +11,7 @@ message GadgetPlayInfo { uint32 startCd = 4; uint32 startTime = 5; uint32 progress = 6; - oneof IAFCHJBAJFA { + oneof play_info { CrucibleInfo crucible_info = 21; } } diff --git a/proto/GetOnlinePlayerInfoReq.proto b/proto/GetOnlinePlayerInfoReq.proto index 94163eca..c67db8c8 100644 --- a/proto/GetOnlinePlayerInfoReq.proto +++ b/proto/GetOnlinePlayerInfoReq.proto @@ -11,7 +11,7 @@ message GetOnlinePlayerInfoReq { } bool isOnlineId = 3; - oneof PBOENAFIDML { + oneof player_id { uint32 target_uid = 4; string online_id = 10; string psn_id = 12; diff --git a/proto/GetUgcRsp.proto b/proto/GetUgcRsp.proto index 52549650..0149c5bd 100644 --- a/proto/GetUgcRsp.proto +++ b/proto/GetUgcRsp.proto @@ -19,7 +19,7 @@ message GetUgcRsp { int32 retcode = 8; RecordUsage ugcRecordUsage = 7; uint64 ugcGuid = 9; - oneof KJLNEMBPDOF { + oneof record { MusicRecord music_record = 1; } } diff --git a/proto/HomeMarkPointFurnitureData.proto b/proto/HomeMarkPointFurnitureData.proto index b8e3d6a7..459aeaec 100644 --- a/proto/HomeMarkPointFurnitureData.proto +++ b/proto/HomeMarkPointFurnitureData.proto @@ -11,7 +11,7 @@ message HomeMarkPointFurnitureData { uint32 furnitureId = 2; uint32 furnitureType = 3; Vector pos = 4; - oneof GPHOOOLEKGJ { + oneof extra { NpcData npc_data = 6; SuiteData suite_data = 7; } diff --git a/proto/Item.proto b/proto/Item.proto index a45ddd70..04f21fe7 100644 --- a/proto/Item.proto +++ b/proto/Item.proto @@ -9,7 +9,7 @@ import "Furniture.proto"; message Item { uint32 itemId = 1; uint64 guid = 2; - oneof NNFJENNPJMK { + oneof detail { Material material = 5; Equip equip = 6; Furniture furniture = 7; diff --git a/proto/LockedPersonallineData.proto b/proto/LockedPersonallineData.proto index eba87c19..de9da154 100644 --- a/proto/LockedPersonallineData.proto +++ b/proto/LockedPersonallineData.proto @@ -7,7 +7,7 @@ import "LockReason.proto"; message LockedPersonallineData { uint32 personalLineId = 6; LockReason lockReason = 4; - oneof IGACBJFMMFM { + oneof param { uint32 chapter_id = 5; uint32 level = 13; } diff --git a/proto/MaterialDeleteInfo.proto b/proto/MaterialDeleteInfo.proto index daee21ae..f1efaf34 100644 --- a/proto/MaterialDeleteInfo.proto +++ b/proto/MaterialDeleteInfo.proto @@ -15,7 +15,7 @@ message MaterialDeleteInfo { } bool hasDeleteConfig = 1; - oneof OKADNKAHBGL { + oneof delete_info { CountDownDelete count_down_delete = 2; DateTimeDelete date_delete = 3; DelayWeekCountDownDelete delay_week_count_down_delete = 4;