diff --git a/proto/ActivityInfo.proto b/proto/ActivityInfo.proto index 82cdfeeb..6242f6e8 100644 --- a/proto/ActivityInfo.proto +++ b/proto/ActivityInfo.proto @@ -6,6 +6,7 @@ import "ActivityPushTipsData.proto"; import "ActivityWatcherInfo.proto"; import "MusicGameActivityDetailInfo.proto"; +import "TrialAvatarActivityDetailInfo.proto"; // Name: EIPLHBCKIIO message ActivityInfo { @@ -36,7 +37,9 @@ message ActivityInfo { oneof detail { // event gc + TrialAvatarActivityDetailInfo trial_avatar_info = 12; MusicGameActivityDetailInfo music_game_info = 1966; + } } diff --git a/proto/AvatarDelNotify.proto b/proto/AvatarDelNotify.proto new file mode 100644 index 00000000..8fad8f74 --- /dev/null +++ b/proto/AvatarDelNotify.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// Name: ABHDPPOLMHE +// CmdId: 1621 +message AvatarDelNotify { + repeated uint64 avatar_guid_list = 11; +} diff --git a/proto/CheckUgcStateReq.proto b/proto/CheckUgcStateReq.proto new file mode 100644 index 00000000..ea2ba555 --- /dev/null +++ b/proto/CheckUgcStateReq.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 6342 (3.2) +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message CheckUgcStateReq {} diff --git a/proto/CheckUgcStateRsp.proto b/proto/CheckUgcStateRsp.proto new file mode 100644 index 00000000..927c316b --- /dev/null +++ b/proto/CheckUgcStateRsp.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 6314 (3.2) +// EnetChannelId: 0 +// EnetIsReliable: true +message CheckUgcStateRsp { + int32 retcode = 7; +} diff --git a/proto/CheckUgcUpdateReq.proto b/proto/CheckUgcUpdateReq.proto new file mode 100644 index 00000000..221e2aca --- /dev/null +++ b/proto/CheckUgcUpdateReq.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +import "UgcType.proto"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 6320 (3.2) +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message CheckUgcUpdateReq { + UgcType ugc_type = 13; +} diff --git a/proto/CheckUgcUpdateRsp.proto b/proto/CheckUgcUpdateRsp.proto new file mode 100644 index 00000000..4a72258d --- /dev/null +++ b/proto/CheckUgcUpdateRsp.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; + +import "UgcType.proto"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 6345 (3.2) +// EnetChannelId: 0 +// EnetIsReliable: true +message CheckUgcUpdateRsp { + repeated uint64 update_ugc_guid_list = 15; + int32 retcode = 10; + UgcType ugc_type = 12; +} diff --git a/proto/CloseCommonTipsNotify.proto b/proto/CloseCommonTipsNotify.proto new file mode 100644 index 00000000..abd3ca56 --- /dev/null +++ b/proto/CloseCommonTipsNotify.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// Name: AFLOLBEDPJM +// CmdId: 3196 +message CloseCommonTipsNotify { +} diff --git a/proto/DungeonPlayerDieNotify.proto b/proto/DungeonPlayerDieNotify.proto new file mode 100644 index 00000000..c726b87d --- /dev/null +++ b/proto/DungeonPlayerDieNotify.proto @@ -0,0 +1,21 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "PlayerDieType.proto"; +import "StrengthenPointData.proto"; + +// Name: EPKICJCBBIF +// CmdId: 959 +message DungeonPlayerDieNotify { + uint32 murderer_entity_id = 1; + uint32 dungeon_id = 2; + uint32 wait_time = 11; + map strengthen_point_data_map = 15; + uint32 revive_count = 5; + PlayerDieType die_type = 6; + oneof entity { + uint32 monster_id = 4; + uint32 gadget_id = 7; + } +} diff --git a/proto/DungeonPlayerDieReq.proto b/proto/DungeonPlayerDieReq.proto new file mode 100644 index 00000000..14726669 --- /dev/null +++ b/proto/DungeonPlayerDieReq.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "PlayerDieType.proto"; + +// Name: MJCFJHMAMOL +// CmdId: 929 +message DungeonPlayerDieReq { + uint32 dungeon_id = 9; + PlayerDieType die_type = 13; +} + diff --git a/proto/DungeonPlayerDieRsp.proto b/proto/DungeonPlayerDieRsp.proto new file mode 100644 index 00000000..50b0c644 --- /dev/null +++ b/proto/DungeonPlayerDieRsp.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +// Name: PAANABIGFPI +// CmdId: 927 +message DungeonPlayerDieRsp { + int32 retcode = 1; +} + diff --git a/proto/EnterTrialAvatarActivityDungeonReq.proto b/proto/EnterTrialAvatarActivityDungeonReq.proto new file mode 100644 index 00000000..42e5588a --- /dev/null +++ b/proto/EnterTrialAvatarActivityDungeonReq.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// Name: BODNCMMJHFA +// CmdId: 2084 +message EnterTrialAvatarActivityDungeonReq { + uint32 enter_point_id = 15; + uint32 activity_id = 7; + uint32 trial_avatar_index_id = 13; +} diff --git a/proto/EnterTrialAvatarActivityDungeonRsp.proto b/proto/EnterTrialAvatarActivityDungeonRsp.proto new file mode 100644 index 00000000..67ba30ca --- /dev/null +++ b/proto/EnterTrialAvatarActivityDungeonRsp.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// Name: PAFBDJNHHJB +// CmdId: 2154 +message EnterTrialAvatarActivityDungeonRsp { + int32 retcode = 3; + uint32 activity_id = 12; + uint32 trial_avatar_index_id = 5; +} diff --git a/proto/ExecuteGadgetLuaReq.proto b/proto/ExecuteGadgetLuaReq.proto new file mode 100644 index 00000000..80355180 --- /dev/null +++ b/proto/ExecuteGadgetLuaReq.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// Name: CPGCKPFMILP +// CmdId: 217 +message ExecuteGadgetLuaReq { + int32 param1 = 14; + int32 param3 = 5; + int32 param2 = 4; + uint32 source_entity_id = 9; +} diff --git a/proto/ExecuteGadgetLuaRsp.proto b/proto/ExecuteGadgetLuaRsp.proto new file mode 100644 index 00000000..cf41bee8 --- /dev/null +++ b/proto/ExecuteGadgetLuaRsp.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// Name: HAJKCLEOHJL +// CmdId: 224 +message ExecuteGadgetLuaRsp { + int32 retcode = 7; +} diff --git a/proto/GetUgcBriefInfoReq.proto b/proto/GetUgcBriefInfoReq.proto new file mode 100644 index 00000000..3b750531 --- /dev/null +++ b/proto/GetUgcBriefInfoReq.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "UgcType.proto"; + +// Name: DPBNMIFDCJH +// CmdId: 6309 +message GetUgcBriefInfoReq { + UgcType ugc_type = 1; + uint64 ugc_guid = 12; +} diff --git a/proto/GetUgcBriefInfoRsp.proto b/proto/GetUgcBriefInfoRsp.proto new file mode 100644 index 00000000..261a8f12 --- /dev/null +++ b/proto/GetUgcBriefInfoRsp.proto @@ -0,0 +1,17 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "UgcMusicBriefInfo.proto"; +import "UgcType.proto"; + +// Name: HCHEBMEEOJO +// CmdId: 6346 +message GetUgcBriefInfoRsp { + UgcType ugc_type = 14; + int32 retcode = 4; + uint64 ugc_guid = 7; + oneof brief { + UgcMusicBriefInfo music_brief_info = 8; + } +} diff --git a/proto/MusicGameActivityDetailInfo.proto b/proto/MusicGameActivityDetailInfo.proto index 3036bee2..55d33ab0 100644 --- a/proto/MusicGameActivityDetailInfo.proto +++ b/proto/MusicGameActivityDetailInfo.proto @@ -1,14 +1,13 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; - import "MusicGameRecord.proto"; import "UgcMusicBriefInfo.proto"; -// Name: CJNEENHAPEE -message MusicGameActivityDetailInfo { - repeated UgcMusicBriefInfo OMGGIPLOILH = 9; - repeated UgcMusicBriefInfo JJMBELIDNLN = 1; - map music_game_record_map = 13; -} +option java_package = "emu.grasscutter.net.proto"; +// 3.2 +message MusicGameActivityDetailInfo { + repeated UgcMusicBriefInfo ugc_record_list = 4; + repeated UgcMusicBriefInfo ugc_search_list = 7; + map music_game_record_map = 8; +} diff --git a/proto/MusicGameRecord.proto b/proto/MusicGameRecord.proto index db734ab0..145115d4 100644 --- a/proto/MusicGameRecord.proto +++ b/proto/MusicGameRecord.proto @@ -2,11 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - -// Name: MPJJDJEINNM +// 3.2 message MusicGameRecord { - bool is_unlock = 12; - uint32 max_score = 4; - uint32 max_combo = 7; + bool is_unlock = 9; + uint32 max_score = 11; + uint32 max_combo = 6; } - diff --git a/proto/MusicGameSettleReq.proto b/proto/MusicGameSettleReq.proto index 6bed4d27..b81c9402 100644 --- a/proto/MusicGameSettleReq.proto +++ b/proto/MusicGameSettleReq.proto @@ -2,27 +2,27 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - -// Name: KKNNAGLMLKD -// CmdId: 8278 +// CmdId: 8892 (3.2) +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message MusicGameSettleReq { - uint32 APJPLBOJEGN = 1; - uint32 combo = 14; - uint64 ugc_guid = 6; - uint32 OJIACEJOFJF = 1954; - uint32 max_combo = 15; - bool is_save_score = 3; - uint32 BFAIDHEKEOD = 181; - repeated uint32 DGMDAOAENMJ = 630; - uint32 score = 2; - bool JIIDBCILMEP = 1707; - uint32 JNBMKEFPJIC = 1085; - bool AECNMHLOMBH = 634; - float speed = 1108; - repeated uint32 NNIJFEMDAIM = 13; - uint32 HPAMHHMILKM = 8; - uint32 NDOFNFADKJH = 10; - uint32 correct_hit = 4; - uint32 music_basic_id = 12; + repeated uint32 button_list = 384; + uint32 delay = 795; + repeated uint32 note_list = 4; + uint32 score_rating = 15; + uint32 score = 9; + uint64 ugc_guid = 6; + uint32 restart_times = 13; + bool is_custom_delay = 422; + uint32 max_combo = 5; + uint32 is_full_combo = 1058; + float speed = 409; + bool is_save_score = 3; + uint32 combo = 1; + uint32 music_basic_id = 7; + uint32 star_rating = 2; + uint32 volume = 1953; + uint32 correct_hit = 14; + bool is_custom_speed = 1285; } - diff --git a/proto/MusicGameSettleRsp.proto b/proto/MusicGameSettleRsp.proto index e1fff4fa..a5f75b66 100644 --- a/proto/MusicGameSettleRsp.proto +++ b/proto/MusicGameSettleRsp.proto @@ -2,14 +2,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - -// Name: ANDLNOABFII -// CmdId: 8542 +// CmdId: 8673 (3.2) +// EnetChannelId: 0 +// EnetIsReliable: true message MusicGameSettleRsp { - uint64 ugc_guid = 9; - bool is_unlock_next_level = 5; - uint32 music_basic_id = 14; - bool is_new_record = 7; - int32 retcode = 15; + int32 retcode = 11; + uint32 music_basic_id = 5; + bool is_new_record = 6; + bool is_unlock_next_level = 2; + uint64 ugc_guid = 10; } - diff --git a/proto/MusicGameStartReq.proto b/proto/MusicGameStartReq.proto index 8f93507a..d2e19ed4 100644 --- a/proto/MusicGameStartReq.proto +++ b/proto/MusicGameStartReq.proto @@ -2,12 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - -// Name: KIECLHFBINF -// CmdId: 8103 +// CmdId: 8406 (3.2) +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message MusicGameStartReq { - uint64 ugc_guid = 13; - bool is_save_score = 7; - uint32 music_basic_id = 4; + uint32 music_basic_id = 2; + bool is_save_score = 11; + uint64 ugc_guid = 3; } - diff --git a/proto/MusicGameStartRsp.proto b/proto/MusicGameStartRsp.proto index f7052605..96886c38 100644 --- a/proto/MusicGameStartRsp.proto +++ b/proto/MusicGameStartRsp.proto @@ -2,12 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - -// Name: GGFNHKHDDKC -// CmdId: 8334 +// CmdId: 8326 (3.2) +// EnetChannelId: 0 +// EnetIsReliable: true message MusicGameStartRsp { - int32 retcode = 9; - uint64 ugc_guid = 15; - uint32 music_basic_id = 11; + uint32 music_basic_id = 4; + int32 retcode = 1; + uint64 ugc_guid = 15; } - diff --git a/proto/OfficialCustomDungeon.proto b/proto/OfficialCustomDungeon.proto new file mode 100644 index 00000000..27b5e587 --- /dev/null +++ b/proto/OfficialCustomDungeon.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// 3.2 +message OfficialCustomDungeon { + uint32 dungeon_id = 11; + uint32 win_times = 3; +} diff --git a/proto/ReceivedTrialAvatarActivityRewardReq.proto b/proto/ReceivedTrialAvatarActivityRewardReq.proto new file mode 100644 index 00000000..ae11a475 --- /dev/null +++ b/proto/ReceivedTrialAvatarActivityRewardReq.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +// Name: KHHINOIPNPA +// CmdId: 2005 +message ReceivedTrialAvatarActivityRewardReq { + uint32 trial_avatar_index_id = 3; +} + diff --git a/proto/ReceivedTrialAvatarActivityRewardRsp.proto b/proto/ReceivedTrialAvatarActivityRewardRsp.proto new file mode 100644 index 00000000..b5101a43 --- /dev/null +++ b/proto/ReceivedTrialAvatarActivityRewardRsp.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +// Name: LIMEMDMOOCJ +// CmdId: 2009 +message ReceivedTrialAvatarActivityRewardRsp { + uint32 activity_id = 12; + uint32 trial_avatar_index_id = 15; + int32 retcode = 5; +} + diff --git a/proto/SaveUgcReq.proto b/proto/SaveUgcReq.proto new file mode 100644 index 00000000..9d4d1c47 --- /dev/null +++ b/proto/SaveUgcReq.proto @@ -0,0 +1,21 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "UgcMusicBriefInfo.proto"; +import "UgcMusicRecord.proto"; +import "UgcType.proto"; + +// Name: DMPCNMHFEHN +// CmdId: 6344 +message SaveUgcReq { + UgcType ugc_type = 13; + uint32 schedule_id = 2; + oneof record { + UgcMusicRecord music_record = 11; + } + oneof brief { + UgcMusicBriefInfo music_brief_info = 380; + } +} + diff --git a/proto/SaveUgcRsp.proto b/proto/SaveUgcRsp.proto new file mode 100644 index 00000000..eac3edd0 --- /dev/null +++ b/proto/SaveUgcRsp.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "UgcType.proto"; + +// Name: JKPCEIOLHFA +// CmdId: 6332 +message SaveUgcRsp { + UgcType ugc_type = 3; + uint64 ugc_guid = 6; + int32 retcode = 14; + bool JGBHEMIDGCJ = 11; +} + diff --git a/proto/ScenePlayerSoundNotify.proto b/proto/ScenePlayerSoundNotify.proto new file mode 100644 index 00000000..09ab94d1 --- /dev/null +++ b/proto/ScenePlayerSoundNotify.proto @@ -0,0 +1,21 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "Vector.proto"; + +// Name: EMBMCPPLGPA +// CmdId: 201 +message ScenePlayerSoundNotify { + // Name: MCCICFBIADN + enum PlaySoundType { + PLAY_SOUND_NONE = 0; + PLAY_SOUND_START = 1; + PLAY_SOUND_STOP = 2; + } + + PlaySoundType play_type = 14; + Vector play_pos = 1; + string sound_name = 4; +} + diff --git a/proto/ShowClientGuideNotify.proto b/proto/ShowClientGuideNotify.proto new file mode 100644 index 00000000..d236148d --- /dev/null +++ b/proto/ShowClientGuideNotify.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +// Name: LAJJKMLLJEB +// CmdId: 3384 +message ShowClientGuideNotify { + string guide_name = 11; +} + diff --git a/proto/ShowCommonTipsNotify.proto b/proto/ShowCommonTipsNotify.proto new file mode 100644 index 00000000..235de87d --- /dev/null +++ b/proto/ShowCommonTipsNotify.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +// Name: DCNCLONCJHI +// CmdId: 3469 +message ShowCommonTipsNotify { + uint32 close_time = 1; + string content = 6; + string title = 14; +} + diff --git a/proto/TrialAvatarActivityDetailInfo.proto b/proto/TrialAvatarActivityDetailInfo.proto new file mode 100644 index 00000000..d97a1349 --- /dev/null +++ b/proto/TrialAvatarActivityDetailInfo.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "TrialAvatarActivityRewardDetailInfo.proto"; + +// Name: OIGGLAODKKL +message TrialAvatarActivityDetailInfo { + repeated TrialAvatarActivityRewardDetailInfo reward_info_list = 4; +} + diff --git a/proto/TrialAvatarActivityRewardDetailInfo.proto b/proto/TrialAvatarActivityRewardDetailInfo.proto new file mode 100644 index 00000000..16ca2142 --- /dev/null +++ b/proto/TrialAvatarActivityRewardDetailInfo.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +// Name: BEBIONDAIJE +message TrialAvatarActivityRewardDetailInfo { + bool received_reward = 12; // MCCAEONNHPH + uint32 reward_id = 8; + bool passed_dungeon = 14; // JNEMHMEMNEB + uint32 trial_avatar_index_id = 13; +} + diff --git a/proto/TrialAvatarInDungeonIndexNotify.proto b/proto/TrialAvatarInDungeonIndexNotify.proto new file mode 100644 index 00000000..583d6e4c --- /dev/null +++ b/proto/TrialAvatarInDungeonIndexNotify.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +// Name: NEIOEGLNCBC +// CmdId: 2109 +message TrialAvatarInDungeonIndexNotify { + uint32 trial_avatar_index_id = 6; +} + diff --git a/proto/UgcActivityDetailInfo.proto b/proto/UgcActivityDetailInfo.proto new file mode 100644 index 00000000..2da21bab --- /dev/null +++ b/proto/UgcActivityDetailInfo.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +import "OfficialCustomDungeon.proto"; + +option java_package = "emu.grasscutter.net.proto"; + +// 3.2 +message UgcActivityDetailInfo { + bool is_ugc_feature_closed = 10; + uint32 custom_dungeon_group_id = 12; + repeated OfficialCustomDungeon official_custom_dungeon_list = 5; + bool is_enable_ugc = 11; +} diff --git a/proto/UgcMusicBriefInfo.proto b/proto/UgcMusicBriefInfo.proto index 8c6ebb19..8d586196 100644 --- a/proto/UgcMusicBriefInfo.proto +++ b/proto/UgcMusicBriefInfo.proto @@ -2,29 +2,26 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - -// Name: NFCMDLFAPCF +// 3.2 message UgcMusicBriefInfo { - uint64 import_from_ugc_guid = 6; - bool BFBOOIBDEFL = 15; - uint32 OMKIMIPNGLF = 1847; - string creator_nickname = 13; - uint32 ICHFOLMCONK = 9; - uint32 music_id = 10; - uint32 ECGMBEDIMAF = 14; - uint32 JDMDEBFDOCB = 1288; - bool IKPEAIAEIOE = 12; - bool is_psn_platform = 8; - uint32 BGBGAHDGCOD = 567; - repeated uint32 NEPBHGEPAJF = 1605; - uint32 FENKBJEOFOD = 1535; - uint32 FCCLIJPGIMB = 2; - repeated uint32 BINOPNBOMLE = 429; - uint32 version = 11; - uint64 ugc_guid = 3; - uint32 max_score = 1; - uint32 MNFFJEHHPNG = 4; - bool GPMMJBKAIMN = 5; - uint32 MDNHFEMGKIL = 7; + uint64 import_from_ugc_guid = 5; + bool is_published = 8; + bool is_played = 1; + uint32 music_id = 2; + uint32 save_page_type = 1182; + uint32 save_idx = 12; + string creator_nickname = 10; + uint32 version = 15; + uint32 save_time = 3; + repeated uint32 after_note_list = 1002; + repeated uint32 before_note_list = 982; + bool is_psn_platform = 9; + uint32 time_line_edit_time = 1822; + bool is_changed_after_publish = 11; + uint32 publish_time = 13; + uint32 max_score = 14; + uint32 real_time_edit_time = 576; + uint32 note_count = 7; + uint64 ugc_guid = 4; + uint32 self_max_score = 6; } - diff --git a/proto/UgcMusicNote.proto b/proto/UgcMusicNote.proto index 9c3b2872..bf676c4f 100644 --- a/proto/UgcMusicNote.proto +++ b/proto/UgcMusicNote.proto @@ -2,10 +2,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - -// Name: KELICPOLEGO +// 3.2 message UgcMusicNote { - uint32 start_time = 15; - uint32 end_time = 8; + uint32 start_time = 12; + uint32 end_time = 5; } - diff --git a/proto/UgcMusicRecord.proto b/proto/UgcMusicRecord.proto index eae17b89..d6990393 100644 --- a/proto/UgcMusicRecord.proto +++ b/proto/UgcMusicRecord.proto @@ -1,12 +1,11 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; - import "UgcMusicTrack.proto"; -// Name: AMAEJCFDLLP -message UgcMusicRecord { - uint32 music_id = 6; - repeated UgcMusicTrack music_track_list = 2; -} +option java_package = "emu.grasscutter.net.proto"; +// 3.2 +message UgcMusicRecord { + repeated UgcMusicTrack music_track_list = 4; + uint32 music_id = 13; +} diff --git a/proto/UgcMusicTrack.proto b/proto/UgcMusicTrack.proto index fe5dd71f..ce46c61e 100644 --- a/proto/UgcMusicTrack.proto +++ b/proto/UgcMusicTrack.proto @@ -1,11 +1,10 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; - import "UgcMusicNote.proto"; -// Name: PNNCHCKBNDL -message UgcMusicTrack { - repeated UgcMusicNote music_note_list = 2; -} +option java_package = "emu.grasscutter.net.proto"; +// 3.2 +message UgcMusicTrack { + repeated UgcMusicNote music_note_list = 6; +} diff --git a/proto/UgcNotify.proto b/proto/UgcNotify.proto new file mode 100644 index 00000000..fb87a28c --- /dev/null +++ b/proto/UgcNotify.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 6341 (3.2) +// EnetChannelId: 0 +// EnetIsReliable: true +message UgcNotify { + bool is_ugc_publish_ban = 12; + bool is_ugc_publish_feature_closed = 8; + bool is_ugc_feature_closed = 15; +} diff --git a/proto/UgcType.proto b/proto/UgcType.proto index 76e2c3d6..2fa3ecb2 100644 --- a/proto/UgcType.proto +++ b/proto/UgcType.proto @@ -2,10 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - -// Name: MOCGOKGHGNG +// 3.2 enum UgcType { - UGC_TYPE_NONE = 0; - UGC_TYPE_MUSIC_GAME = 1; + UGC_TYPE_NONE = 0; + UGC_TYPE_MUSIC_GAME = 1; }