From 4c69dedab5e3018d8f1d338dc061de5af4b9d44f Mon Sep 17 00:00:00 2001 From: Yuuki <6851027-yukiz@users.noreply.gitlab.com> Date: Tue, 28 May 2024 18:52:04 +0800 Subject: [PATCH] sync proto --- deobf.proto | 230 +++++++++++----------- proto/AbilityActionCreateGadget.proto | 26 +-- proto/AbilityActionGenerateElemBall.proto | 10 +- proto/AvatarDataNotify.proto | 4 +- proto/AvatarFlycloakChangeNotify.proto | 8 +- proto/AvatarGainCostumeNotify.proto | 6 +- proto/AvatarGainFlycloakNotify.proto | 6 +- proto/AvatarPropNotify.proto | 8 +- proto/AvatarWearFlycloakReq.proto | 8 +- proto/AvatarWearFlycloakRsp.proto | 10 +- proto/CrystalLinkAvatarInfo.proto | 25 +-- proto/CrystalLinkBuffInfo.proto | 25 +-- proto/CrystalLinkDungeonAvatarInfo.proto | 25 +-- proto/CrystalLinkDungeonInfoNotify.proto | 16 ++ proto/CrystalLinkEnterDungeonReq.proto | 12 ++ proto/CrystalLinkEnterDungeonRsp.proto | 13 ++ proto/CrystalLinkTeamInfo.proto | 28 +-- proto/EntityPropNotify.proto | 11 ++ proto/MarkEntityInMinMapNotify.proto | 12 ++ proto/MarkNewNotify.proto | 27 +-- 20 files changed, 248 insertions(+), 262 deletions(-) create mode 100644 proto/CrystalLinkDungeonInfoNotify.proto create mode 100644 proto/CrystalLinkEnterDungeonReq.proto create mode 100644 proto/CrystalLinkEnterDungeonRsp.proto create mode 100644 proto/EntityPropNotify.proto create mode 100644 proto/MarkEntityInMinMapNotify.proto diff --git a/deobf.proto b/deobf.proto index a15b7b27..6b9c9147 100644 --- a/deobf.proto +++ b/deobf.proto @@ -405,11 +405,11 @@ message OGOHGLMIGIJ { } // CmdId: 8016 -message HCDOCILHAKD { +message CrystalLinkEnterDungeonRsp { int32 retcode = 7; uint32 difficulty_id = 8; uint32 level_id = 10; - repeated HIABLBDDDGH EHGMMKKFHOC = 14; + repeated CrystalLinkTeamInfo team_info_list = 14; } // CmdId: 26464 @@ -421,7 +421,7 @@ message PlayerChatReq { // CmdId: 881 message FCKBJJJLMJA { uint32 difficulty = 2; - repeated FMKIEAOEGIA EHGMMKKFHOC = 8; + repeated FMKIEAOEGIA team_info_list = 8; uint32 stage_id = 12; } @@ -488,9 +488,9 @@ message SceneGalleryWindFieldInfo { uint32 CDPKKFEKEEJ = 14; } -message HIABLBDDDGH { - repeated FOIADILPAGB avatar_info_list = 11; - repeated DKBELEBLOBK buff_info_list = 14; +message CrystalLinkTeamInfo { + repeated CrystalLinkAvatarInfo avatar_info_list = 11; + repeated CrystalLinkBuffInfo buff_info_list = 14; } // CmdId: 3055 @@ -605,7 +605,7 @@ message GadgetGeneralRewardInfoNotify { // CmdId: 20854 message DENJKHBIMAL { uint32 stage_id = 2; - repeated BGNIJEKPCHG EHGMMKKFHOC = 12; + repeated BGNIJEKPCHG team_info_list = 12; uint32 difficulty = 13; } @@ -1039,7 +1039,7 @@ message DoGachaReq { // CmdId: 4031 message BKMCAPNGBLC { - uint32 GIBNJGNINPC = 2; + uint32 reward_id = 2; } // CmdId: 2593 @@ -1835,7 +1835,7 @@ message CEECPJGCBHI { message BJGCGKKIIBG { uint64 avatar_id = 4; - bool FJFGMPODBEA = 14; + bool is_trial = 14; } message CrucibleBattleUidInfo { @@ -2010,7 +2010,7 @@ message GHEKKNBBMBK { message COBJKLEGHGI { uint64 avatar_id = 1; - bool FJFGMPODBEA = 10; + bool is_trial = 10; } // CmdId: 20617 @@ -2058,7 +2058,7 @@ message BKOHJLMGIBJ { } // CmdId: 27498 -message AAPMHBGCAOK { +message AvatarGainCostumeNotify { uint32 costume_id = 5; } @@ -2102,8 +2102,8 @@ message KGPLOMHAHEO { } enum ChangeEnergyReason { - ChangeEnergyReason_CHANGE_ENERGY_NONE = 0; - ChangeEnergyReason_CHANGE_ENERGY_SKILL_START = 1; + CHANGE_ENERGY_REASON_NONE = 0; + CHANGE_ENERGY_REASON_SKILL_START = 1; } message ELEAGLACLKH { @@ -2332,7 +2332,7 @@ message HPNPAJMEJMB { message AMLEDNMNKAD { uint32 avatar_id = 11; - bool FJFGMPODBEA = 13; + bool is_trial = 13; } // CmdId: 22080 @@ -2938,29 +2938,29 @@ message EMIJIBLAPAG { // CmdId: 5613 message FONFAKBOLBP { uint32 schedule_id = 7; - uint32 GIBNJGNINPC = 8; + uint32 reward_id = 8; uint32 position = 11; int32 retcode = 12; } message AbilityMixinBreakout { - enum KCOHIABPNFN { - KCOHIABPNFN_NONE = 0; - KCOHIABPNFN_CREATE_CONNECT = 1; - KCOHIABPNFN_START_GAME = 2; - KCOHIABPNFN_PING = 3; - KCOHIABPNFN_FINISH_GAME = 4; - KCOHIABPNFN_SNAP_SHOT = 5; - KCOHIABPNFN_ACTION = 6; + enum SyncType { + SYNC_TYPE_NONE = 0; + SYNC_TYPE_CREATE_CONNECT = 1; + SYNC_TYPE_START_GAME = 2; + SYNC_TYPE_PING = 3; + SYNC_TYPE_FINISH_GAME = 4; + SYNC_TYPE_SNAP_SHOT = 5; + SYNC_TYPE_ACTION = 6; } - KCOHIABPNFN sync_type = 11; + SyncType sync_type = 11; int32 retcode = 13; oneof sync { - AJBNNMFJPIK sync_create_connect = 9; + BreakoutSyncCreateConnect sync_create_connect = 9; BreakoutSyncPing sync_ping = 4; - IMGPCEPBAAG sync_finish_game = 2; - BPJCJLELMHK sync_snap_shot = 7; + BreakoutSyncFinishGame sync_finish_game = 2; + BreakoutSyncSnapShot sync_snap_shot = 7; BreakoutSyncAction sync_action = 3; } } @@ -3044,7 +3044,7 @@ message LEELFGOJOMC { } message BattlePassRewardTag { - uint32 GIBNJGNINPC = 4; + uint32 reward_id = 4; BattlePassUnlockStatus unlock_status = 10; uint32 level = 13; } @@ -3335,14 +3335,14 @@ message PHJLENMHMFM { } // CmdId: 2952 -message LDGBPPPJDBI { - uint32 EOGJELPLCIC = 3; +message AvatarFlycloakChangeNotify { + uint32 flycloak_id = 3; uint64 avatar_guid = 10; } message MIGBNKHHKLE { uint32 stage_id = 1; - repeated BHLEJPFPFAG EHGMMKKFHOC = 3; + repeated BHLEJPFPFAG team_info_list = 3; uint32 level_id = 4; bool is_new_record = 6; repeated uint32 DAJKLIAJOBD = 8; @@ -3530,7 +3530,7 @@ message GOPKEIDKNLB { // CmdId: 6817 message MHLMBJKCGHA { uint32 stage_id = 1; - repeated POHLPAAGIEO EHGMMKKFHOC = 4; + repeated POHLPAAGIEO team_info_list = 4; uint32 difficulty = 13; } @@ -4266,9 +4266,9 @@ message OAIMPOBAIEE { bool FFCCGCCMBCF = 4; } -message EFFMIALFIJA { +message CrystalLinkDungeonAvatarInfo { uint64 avatar_guid = 1; - bool FJFGMPODBEA = 13; + bool is_trial = 13; } message MDIICLGOJAO { @@ -4326,7 +4326,7 @@ message IDFCIKCGKBL { message GIMLMAHJOJD { Vector pos = 2; - uint32 GIBNJGNINPC = 3; + uint32 reward_id = 3; uint32 group_id = 9; uint32 AGNMPHHFHGC = 11; } @@ -4576,7 +4576,7 @@ message CustomGalleryNormalScoreBoard { message APBHMKJAMDH { } -message BPJCJLELMHK { +message BreakoutSyncSnapShot { BreakoutSnapShot snap_shot = 4; } @@ -4637,13 +4637,13 @@ message KPMNLHDCPOM { } // CmdId: 3946 -message PBENLJNKCOG { +message CrystalLinkDungeonInfoNotify { uint32 level_id = 3; - repeated EFFMIALFIJA BKGNMCPHAOK = 5; + repeated CrystalLinkDungeonAvatarInfo BKGNMCPHAOK = 5; uint32 difficulty_id = 6; - uint32 HLHAIAODCHO = 7; - repeated DKBELEBLOBK buff_info_list = 11; - bool HCKGEEEADHL = 12; + uint32 init_gallery_progress = 7; + repeated CrystalLinkBuffInfo buff_info_list = 11; + bool is_upper_part = 12; } // CmdId: 5403 @@ -4862,7 +4862,7 @@ message KHJIECNHINO { // CmdId: 24588 message NFIIHIFJCDI { - uint32 GIBNJGNINPC = 12; + uint32 reward_id = 12; } // CmdId: 950 @@ -5519,7 +5519,7 @@ message NOJHCECDJFH { // CmdId: 5655 message BDFBDNKAFJB { int32 retcode = 13; - uint32 GIBNJGNINPC = 15; + uint32 reward_id = 15; } // CmdId: 7739 @@ -5639,7 +5639,7 @@ message CoinCollectPrepareStageNotify { // CmdId: 2784 message ODDGKEGCOFG { int32 retcode = 3; - repeated GCBBIBCKHKI EHGMMKKFHOC = 14; + repeated GCBBIBCKHKI team_info_list = 14; } // CmdId: 27146 @@ -5947,7 +5947,7 @@ message GetOnlinePlayerInfoRsp { // CmdId: 9818 message JNLDBCBBLOE { - uint32 GIBNJGNINPC = 1; + uint32 reward_id = 1; uint32 activity_id = 14; } @@ -6518,7 +6518,7 @@ message KMANALJGHMG { } message KPEOFOHPPAP { - uint32 GIBNJGNINPC = 1; + uint32 reward_id = 1; repeated ItemParam item_list = 2; } @@ -6666,8 +6666,8 @@ message FleurFairV2DetailInfo { } // CmdId: 22682 -message FBDBOCIJMFM { - uint32 EOGJELPLCIC = 4; +message AvatarGainFlycloakNotify { + uint32 flycloak_id = 4; } // CmdId: 5469 @@ -6949,9 +6949,9 @@ message AbilityAttachedModifier { } // CmdId: 5948 -message BAINEIEEPCE { +message MarkNewNotify { repeated uint32 id_list = 1; - uint32 OMNMKBPJGDP = 2; + uint32 mark_new_type = 2; } // CmdId: 22332 @@ -7235,7 +7235,7 @@ message IHLICBPLJBK { uint32 LBHNFFJILMN = 10; } -message AOEKFDIAAGA { +message AbilityActionCreateGadget { Vector rot = 3; Vector pos = 5; uint32 room_id = 7; @@ -8053,7 +8053,7 @@ message GKIJODBOAPJ { // CmdId: 8896 message CIMKLPJFJMD { - repeated POHLPAAGIEO EHGMMKKFHOC = 6; + repeated POHLPAAGIEO team_info_list = 6; } message BlitzRushActivityDetailInfo { @@ -8073,7 +8073,7 @@ message GEJLHPMFEMI { // CmdId: 4648 message BLPCNGFGCBA { uint32 PMAEBJCCBNA = 2; - uint32 GIBNJGNINPC = 9; + uint32 reward_id = 9; uint32 IHFCOPOEGDG = 11; } @@ -8131,7 +8131,7 @@ message PBKMLPJKLEM { message KBKEMCINCJJ { bool LBLFBCOIDKM = 4; - uint32 GIBNJGNINPC = 5; + uint32 reward_id = 5; uint32 dungeon_id = 12; } @@ -8641,7 +8641,7 @@ message CJBBOECALPI { // CmdId: 29165 message ADEPDGLEMEM { - int32 GIBNJGNINPC = 5; + int32 reward_id = 5; int32 retcode = 10; } @@ -9237,7 +9237,7 @@ message OELJOPHHGNB { repeated IFOPFIKBGGH IGAIIHHBPNP = 3; repeated uint32 buff_id_list = 7; uint32 NOKAAKKOHLB = 13; - bool HCKGEEEADHL = 14; + bool is_upper_part = 14; } message IFMHKJDOOFO { @@ -10072,9 +10072,9 @@ message HNFAOPIBDPO { bool DFJNFLGGAEP = 6; } -message FOIADILPAGB { +message CrystalLinkAvatarInfo { uint64 avatar_id = 4; - bool FJFGMPODBEA = 6; + bool is_trial = 6; } message IDFOECFLALN { @@ -10540,7 +10540,7 @@ message DoGachaRsp { repeated GachaItem gacha_item_list = 13; uint32 gachaScheduleId = 14; uint32 gachaTimes = 15; - uint32 IMPJPKBKFLB = 156; + uint32 dailyGachaTimes = 156; bool BLIOHILHJOP = 205; uint32 MJCGMHMPKOE = 1513; bool AGPAJPJENKG = 1563; @@ -10808,7 +10808,7 @@ message CJLABBMLHJF { // CmdId: 27738 message EGLKMGGKLKA { uint32 PHBMKHDNJMM = 6; - uint32 GIBNJGNINPC = 7; + uint32 reward_id = 7; int32 retcode = 10; uint64 avatar_guid = 14; } @@ -11183,7 +11183,7 @@ message BCONLPHGJGE { // CmdId: 308 message OLANJPHKNMB { int32 retcode = 2; - uint32 GIBNJGNINPC = 12; + uint32 reward_id = 12; uint32 level = 14; } @@ -12135,7 +12135,7 @@ message BPLBLKNMGOE { uint32 stage_id = 1; uint32 MBBPJMNNMIK = 9; bool is_finished = 10; - repeated OPADLAOJNJA EHGMMKKFHOC = 15; + repeated OPADLAOJNJA team_info_list = 15; } // CmdId: 22616 @@ -12156,7 +12156,7 @@ message GHNMLJIIDCA { // CmdId: 1610 message GetGachaInfoRsp { - uint32 IMPJPKBKFLB = 2; + uint32 dailyGachaTimes = 2; int32 retcode = 3; repeated GachaInfo gacha_info_list = 5; bool BLIOHILHJOP = 9; @@ -12596,7 +12596,7 @@ message BCMLNNKIELG { message GKELPJJKKIB { uint32 avatar_id = 1; - bool FJFGMPODBEA = 2; + bool is_trial = 2; uint32 costume_id = 3; } @@ -14529,7 +14529,7 @@ message OJNJEKAEHKP { } message TrialAvatarActivityDetailInfo { - repeated GABKMNKCFGE reward_info_list = 7; + repeated TrialAvatarActivityRewardDetailInfo reward_info_list = 7; } message BABBODHEKHM { @@ -15563,7 +15563,7 @@ message JCIPMEOKFOO { message JOFNAHDHDCD { uint64 avatar_id = 13; - bool FJFGMPODBEA = 15; + bool is_trial = 15; } // CmdId: 27480 @@ -16473,7 +16473,7 @@ message MPBEJBMCGHB { message IKNOOIFHAIF { int32 retcode = 2; uint32 activity_id = 6; - uint32 GIBNJGNINPC = 7; + uint32 reward_id = 7; } // CmdId: 20409 @@ -17784,11 +17784,11 @@ message JHKMCHIIIHE { bool is_finished = 13; } -message GABKMNKCFGE { +message TrialAvatarActivityRewardDetailInfo { uint32 trial_avatar_index_id = 4; bool JMMOPPCJNPH = 6; bool BJJCBECALHJ = 7; - uint32 GIBNJGNINPC = 14; + uint32 reward_id = 14; } // CmdId: 2051 @@ -18189,14 +18189,14 @@ message LFBKNJCPKIJ { } // CmdId: 24899 -message FILHMMDCGOH { +message AvatarPropNotify { uint64 avatar_guid = 8; map prop_map = 14; } // CmdId: 229 message NOJFFPDHJOD { - uint32 GIBNJGNINPC = 7; + uint32 reward_id = 7; uint64 avatar_guid = 9; int32 retcode = 10; uint32 promote_level = 13; @@ -19089,13 +19089,13 @@ message SceneTransToPointRsp { } // CmdId: 9393 -message MONEEKBFHDO { - /* protected @ 0x20 */// uint32 DKAHONKACBN = 65535; +message ChangeGameTimeRsp { + /* protected @ 0x20 */// uint32 extra_days = 65535; /* protected @ 0x24 */// int32 retcode = 65535; - /* protected @ 0x28 */// uint32 JLBLJDPEIHI = 65535; + /* protected @ 0x28 */// uint32 cur_game_time = 65535; } -message IMGPCEPBAAG { +message BreakoutSyncFinishGame { bool is_win = 8; uint64 server_game_time = 10; bool KNHCIGLJNHL = 14; @@ -19311,7 +19311,7 @@ message PlayerCookRsp { message GLOCAKAEBHJ { bool HIPAADIAFCC = 2; - bool FJFGMPODBEA = 9; + bool is_trial = 9; uint64 avatar_guid = 11; } @@ -19361,12 +19361,12 @@ message InstableSprayDungeonSettleInfo { // CmdId: 24452 message AvatarDataNotify { - //repeated uint32 owned_flycloak_list = null; + repeated uint32 owned_flycloak_list = 13; repeated AvatarRenameInfo avatar_rename_list = 10; repeated AvatarInfo avatar_list = 5; map avatar_team_map = 15; //repeated uint32 backup_avatar_team_order_list = null; - //repeated uint32 owned_costume_list = null; + repeated uint32 owned_costume_list = 2; repeated uint64 temp_avatar_guid_list = 2;//sus uint32 cur_avatar_team_id = 1; uint64 choose_avatar_guid = 11; @@ -19993,7 +19993,7 @@ message GCGMsgUseSkillEnd { uint32 card_guid = 14; } -message NPDHEAMLICH { +message AbilityActionGenerateElemBall { uint32 room_id = 6; Vector rot = 10; Vector pos = 14; @@ -20035,7 +20035,7 @@ message WearEquipReq { } // CmdId: 21190 -message HMICLOFFJGD { +message ClientAbilityInitFinishNotify { repeated AbilityInvokeEntry invokes = 3; uint32 entity_id = 14; } @@ -20291,7 +20291,7 @@ message PLMLBCAEFDB { message KBCDAJADBHK { float LEKHBGBAIKE = 5; uint32 AABBJMMOMGK = 6; - uint32 OHFABPPBDEB = 11; + uint32 player_num = 11; float ELCFEJKIKMJ = 12; float FPKKBELJFBP = 13; bool AEFDODJCAAC = 14; @@ -21496,7 +21496,7 @@ message MLFNBKPGJKK { // CmdId: 29712 message DCHGDPHMOBE { - uint32 GIBNJGNINPC = 5; + uint32 reward_id = 5; BABBODHEKHM CGELDMBGOJJ = 6; int32 retcode = 7; uint32 IHFCOPOEGDG = 12; @@ -21893,10 +21893,10 @@ message CGBMEBJNPFA { } // CmdId: 924 -message INHJOMAALAO { +message AvatarWearFlycloakRsp { uint64 avatar_guid = 3; int32 retcode = 4; - uint32 EOGJELPLCIC = 11; + uint32 flycloak_id = 11; } // CmdId: 26090 @@ -22031,7 +22031,7 @@ message EECFGBNNNON { uint32 target_entity_id = 12; } -message DKBELEBLOBK { +message CrystalLinkBuffInfo { uint32 BHGKKDGHAKN = 9; uint32 IHDGOBBBADD = 12; } @@ -22102,8 +22102,7 @@ message OGPLHLLFLEE { } // CmdId: 8063 -message LGMHBKKGHCB { -} +message LGMHBKKGHCB // CmdId: 9141 message ONDIJMIENLE { @@ -22611,7 +22610,7 @@ message ILNBNHMLOOA { uint32 refresh_id = 1; uint32 resin = 2; uint32 BAGJJCINLDD = 3; - uint32 GIBNJGNINPC = 5; + uint32 reward_id = 5; bool AHAPIDGGAJB = 7; uint32 scene_id = 8; uint32 city_id = 9; @@ -22627,7 +22626,7 @@ message HPAKOEGNLDN { } message CNJDMOPJIFF { - bool FJFGMPODBEA = 6; + bool is_trial = 6; uint64 avatar_guid = 10; } @@ -22790,7 +22789,7 @@ message JMCKBFPNIED { int32 retcode = 9; } -message AJBNNMFJPIK { +message BreakoutSyncCreateConnect { repeated BreakoutSyncConnectUidInfo uid_info_list = 11; } @@ -23249,7 +23248,7 @@ message ABLJJPBCAOP { } // CmdId: 1480 -message DIGBBCKLMAM { +message MarkEntityInMinMapNotify { uint32 monster_id = 3; uint32 entity_id = 13; Vector position = 14; @@ -24222,9 +24221,9 @@ message GetOpActivityInfoRsp { } // CmdId: 29969 -message BDGJEGMDHDF { +message CrystalLinkEnterDungeonReq { uint32 level_id = 7; - repeated HIABLBDDDGH EHGMMKKFHOC = 9; + repeated CrystalLinkTeamInfo team_info_list = 9; uint32 difficulty_id = 12; } @@ -25035,9 +25034,9 @@ message DCEDHKGGFJC { } // CmdId: 21936 -message NIPBDNMIFPH { +message AvatarWearFlycloakReq { uint64 avatar_guid = 7; - uint32 EOGJELPLCIC = 8; + uint32 flycloak_id = 8; } message SocialShowAvatarInfo { @@ -25129,10 +25128,10 @@ message JPGDKJKJJOG { uint32 JJMHCEIHJBH = 15; } -message DEEAEONHCHO { +message CrystalLinkLevelInfo { uint32 level_id = 2; uint32 best_score = 3; - repeated HIABLBDDDGH EHGMMKKFHOC = 12; + repeated CrystalLinkTeamInfo team_info_list = 12; bool is_open = 14; } @@ -25383,7 +25382,7 @@ message NBHIAOJOGAO { } message CrystalLinkActivityDetailInfo { - repeated DEEAEONHCHO level_info_list = 4; + repeated CrystalLinkLevelInfo level_info_list = 4; uint32 difficulty_id = 15; } @@ -26005,7 +26004,7 @@ message AMEGBFBEDAM { } // CmdId: 9051 -message GLMOHNNAHOO { +message EntityPropNotify { map prop_map = 10; uint32 entity_id = 14; } @@ -26142,7 +26141,7 @@ message GetAllMailResultNotify { message BIIPEBLABGC { bool LOFPJEDOOIC = 2; uint32 level_id = 4; - repeated BHLEJPFPFAG EHGMMKKFHOC = 7; + repeated BHLEJPFPFAG team_info_list = 7; uint32 stage_id = 10; uint32 difficulty = 13; } @@ -26569,8 +26568,7 @@ message KGEAFFFLBIN { } // CmdId: 24875 -message ALCKJOFAKEL { -} +message ALCKJOFAKEL // CmdId: 22674 message IALKBPMPJDF { @@ -26964,10 +26962,10 @@ message HGAJIFHEAOB { } // CmdId: 26138 -message AHCADECCKAJ { - /* protected @ 0x20 */// bool AEDAHKECAAP = 65535; +message ChangeGameTimeReq { + /* protected @ 0x20 */// bool is_force_set = 65535; /* protected @ 0x24 */// uint32 game_time = 65535; - /* protected @ 0x28 */// uint32 DKAHONKACBN = 65535; + /* protected @ 0x28 */// uint32 extra_days = 65535; } message GCGOperationOnStageSelect { @@ -27389,8 +27387,7 @@ message SceneGalleryHomeBalloonInfo { } // CmdId: 294 -message OBGNLCCHLIK { -} +message OBGNLCCHLIK // CmdId: 20706 message CLCBKDGLMJP { @@ -27632,7 +27629,7 @@ message LHJBPCKOJGL { uint32 progress = 2; uint32 EPKBMLAJJIA = 5; bool is_finished = 7; - uint32 GIBNJGNINPC = 9; + uint32 reward_id = 9; } // CmdId: 22509 @@ -27736,10 +27733,10 @@ message CFMAJOGOINM { } // CmdId: 26429 -message CANKELPJFLD { +message SkipPlayerGameTimeReq { uint32 client_game_time = 5; uint32 game_time = 8; - bool AEDAHKECAAP = 12; + bool is_force_set = 12; } // CmdId: 20119 @@ -28014,8 +28011,7 @@ message NJGICNBHEPM { } // CmdId: 26439 -message EEGDAABFFEF { -} +message EEGDAABFFEF message CFJIJBEEHPJ { uint32 uid = 6; @@ -28191,8 +28187,8 @@ message EPKDGBNCLBK { } // CmdId: 9147 -message LOCACCFEBLN { - uint64 LMLNIDPBCKL = 2; +message ClientLoadingCostumeVerificationNotify { + uint64 prefab_hash = 2; uint32 costume_id = 4; uint64 guid = 6; } @@ -28671,9 +28667,9 @@ message CGEFFCJGLAC { int32 retcode = 2; } -message HBKENDLGGOE { +message AbilityMixinShieldBar { uint32 element_type = 4; - uint32 OHFABPPBDEB = 8; + uint32 player_num = 8; float ELCFEJKIKMJ = 10; float FPKKBELJFBP = 14; } @@ -30974,7 +30970,7 @@ message SumoActivityDetailInfo { } message AbilityMetaModifierChange { - repeated ModifierProperty KDFCCJHKAPH = 2; + repeated ModifierProperty properties = 2; float IGOAHJDOAJL = 3; bool BDACCDEPCKL = 4; bool HBKHNKHEPGE = 5; diff --git a/proto/AbilityActionCreateGadget.proto b/proto/AbilityActionCreateGadget.proto index 3bbc636a..ba27789b 100644 --- a/proto/AbilityActionCreateGadget.proto +++ b/proto/AbilityActionCreateGadget.proto @@ -1,25 +1,11 @@ -// 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"; + import "Vector.proto"; -// Obf: BAFEPPHIOGH + +// 4.6.0 message AbilityActionCreateGadget { - Vector pos = 10; - Vector rot = 12; + Vector rot = 3; + Vector pos = 5; uint32 room_id = 7; -} +} \ No newline at end of file diff --git a/proto/AbilityActionGenerateElemBall.proto b/proto/AbilityActionGenerateElemBall.proto index fbd5da7e..4694d148 100644 --- a/proto/AbilityActionGenerateElemBall.proto +++ b/proto/AbilityActionGenerateElemBall.proto @@ -1,9 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "Vector.proto"; +// 4.6.0 message AbilityActionGenerateElemBall { - Vector pos = 4; - Vector rot = 10; - uint32 room_id = 7; -} + uint32 room_id = 6; + Vector rot = 10; + Vector pos = 14; +} \ No newline at end of file diff --git a/proto/AvatarDataNotify.proto b/proto/AvatarDataNotify.proto index 3b7253ca..594ba959 100644 --- a/proto/AvatarDataNotify.proto +++ b/proto/AvatarDataNotify.proto @@ -8,12 +8,12 @@ import "AvatarRenameInfo.proto"; // 4.6.0 // CmdId: 24452 message AvatarDataNotify { - //repeated uint32 owned_flycloak_list = 13;//sus + repeated uint32 owned_flycloak_list = 13; repeated AvatarRenameInfo avatar_rename_list = 10; repeated AvatarInfo avatar_list = 5; map avatar_team_map = 15; //repeated uint32 backup_avatar_team_order_list = 9;//sus - //repeated uint32 owned_costume_list = 2;//sus + repeated uint32 owned_costume_list = 2; //repeated uint64 temp_avatar_guid_list = 999;//Wrong uint32 cur_avatar_team_id = 1; uint64 choose_avatar_guid = 11; diff --git a/proto/AvatarFlycloakChangeNotify.proto b/proto/AvatarFlycloakChangeNotify.proto index cd2f450c..dd58c6ea 100644 --- a/proto/AvatarFlycloakChangeNotify.proto +++ b/proto/AvatarFlycloakChangeNotify.proto @@ -1,7 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 2952 message AvatarFlycloakChangeNotify { - uint32 flycloak_id = 12; - uint64 avatar_guid = 11; -} + uint32 flycloak_id = 3; + uint64 avatar_guid = 10; +} \ No newline at end of file diff --git a/proto/AvatarGainCostumeNotify.proto b/proto/AvatarGainCostumeNotify.proto index 39b47f0e..d3ef0aab 100644 --- a/proto/AvatarGainCostumeNotify.proto +++ b/proto/AvatarGainCostumeNotify.proto @@ -1,6 +1,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 27498 message AvatarGainCostumeNotify { - uint32 costume_id = 10; -} + uint32 costume_id = 5; +} \ No newline at end of file diff --git a/proto/AvatarGainFlycloakNotify.proto b/proto/AvatarGainFlycloakNotify.proto index 3d88af79..a66570c5 100644 --- a/proto/AvatarGainFlycloakNotify.proto +++ b/proto/AvatarGainFlycloakNotify.proto @@ -1,6 +1,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 22682 message AvatarGainFlycloakNotify { - uint32 flycloak_id = 5; -} + uint32 flycloak_id = 4; +} \ No newline at end of file diff --git a/proto/AvatarPropNotify.proto b/proto/AvatarPropNotify.proto index 2d62eff1..cfc7b008 100644 --- a/proto/AvatarPropNotify.proto +++ b/proto/AvatarPropNotify.proto @@ -1,7 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 24899 message AvatarPropNotify { - map prop_map = 10; - uint64 avatar_guid = 15; -} + uint64 avatar_guid = 8; + map prop_map = 14; +} \ No newline at end of file diff --git a/proto/AvatarWearFlycloakReq.proto b/proto/AvatarWearFlycloakReq.proto index 8a7b21be..c58fb7a9 100644 --- a/proto/AvatarWearFlycloakReq.proto +++ b/proto/AvatarWearFlycloakReq.proto @@ -1,7 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 21936 message AvatarWearFlycloakReq { - uint32 flycloak_id = 12; - uint64 avatar_guid = 6; -} + uint64 avatar_guid = 7; + uint32 flycloak_id = 8; +} \ No newline at end of file diff --git a/proto/AvatarWearFlycloakRsp.proto b/proto/AvatarWearFlycloakRsp.proto index ef386699..153624a4 100644 --- a/proto/AvatarWearFlycloakRsp.proto +++ b/proto/AvatarWearFlycloakRsp.proto @@ -1,8 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 924 message AvatarWearFlycloakRsp { - int32 retcode = 5; - uint32 flycloak_id = 7; - uint64 avatar_guid = 2; -} + uint64 avatar_guid = 3; + int32 retcode = 4; + uint32 flycloak_id = 11; +} \ No newline at end of file diff --git a/proto/CrystalLinkAvatarInfo.proto b/proto/CrystalLinkAvatarInfo.proto index 3ca97e8e..b75458b0 100644 --- a/proto/CrystalLinkAvatarInfo.proto +++ b/proto/CrystalLinkAvatarInfo.proto @@ -1,23 +1,8 @@ -// 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: HKCMOMDAOCF + +// 4.6.0 message CrystalLinkAvatarInfo { - bool is_trial = 7; - uint64 avatar_id = 1; -} + uint64 avatar_id = 4; + bool is_trial = 6; +} \ No newline at end of file diff --git a/proto/CrystalLinkBuffInfo.proto b/proto/CrystalLinkBuffInfo.proto index 9794c2ea..290e23d8 100644 --- a/proto/CrystalLinkBuffInfo.proto +++ b/proto/CrystalLinkBuffInfo.proto @@ -1,23 +1,8 @@ -// 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: JHCGNCCGBFI + +// 4.6.0 message CrystalLinkBuffInfo { - uint32 FJLJNEAMGHL = 12; - uint32 JIBBBGMJKBF = 6; -} + uint32 BHGKKDGHAKN = 9; + uint32 IHDGOBBBADD = 12; +} \ No newline at end of file diff --git a/proto/CrystalLinkDungeonAvatarInfo.proto b/proto/CrystalLinkDungeonAvatarInfo.proto index aac09154..a8c3b9dc 100644 --- a/proto/CrystalLinkDungeonAvatarInfo.proto +++ b/proto/CrystalLinkDungeonAvatarInfo.proto @@ -1,23 +1,8 @@ -// 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: EMILFGGOCLJ + +// 4.6.0 message CrystalLinkDungeonAvatarInfo { - uint64 avatar_guid = 4; - bool is_trial = 5; -} + uint64 avatar_guid = 1; + bool is_trial = 13; +} \ No newline at end of file diff --git a/proto/CrystalLinkDungeonInfoNotify.proto b/proto/CrystalLinkDungeonInfoNotify.proto new file mode 100644 index 00000000..ef820b2b --- /dev/null +++ b/proto/CrystalLinkDungeonInfoNotify.proto @@ -0,0 +1,16 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; + +import "CrystalLinkBuffInfo.proto"; +import "CrystalLinkDungeonAvatarInfo.proto"; + +// 4.6.0 +// CmdId: 3946 +message CrystalLinkDungeonInfoNotify { + uint32 level_id = 3; + repeated CrystalLinkDungeonAvatarInfo BKGNMCPHAOK = 5; + uint32 difficulty_id = 6; + uint32 init_gallery_progress = 7; + repeated CrystalLinkBuffInfo buff_info_list = 11; + bool is_upper_part = 12; +} \ No newline at end of file diff --git a/proto/CrystalLinkEnterDungeonReq.proto b/proto/CrystalLinkEnterDungeonReq.proto new file mode 100644 index 00000000..9410293f --- /dev/null +++ b/proto/CrystalLinkEnterDungeonReq.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; + +import "CrystalLinkTeamInfo.proto"; + +// 4.6.0 +// CmdId: 29969 +message CrystalLinkEnterDungeonReq { + uint32 level_id = 7; + repeated CrystalLinkTeamInfo team_info_list = 9; + uint32 difficulty_id = 12; +} \ No newline at end of file diff --git a/proto/CrystalLinkEnterDungeonRsp.proto b/proto/CrystalLinkEnterDungeonRsp.proto new file mode 100644 index 00000000..d3110672 --- /dev/null +++ b/proto/CrystalLinkEnterDungeonRsp.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; + +import "CrystalLinkTeamInfo.proto"; + +// 4.6.0 +// CmdId: 8016 +message CrystalLinkEnterDungeonRsp { + int32 retcode = 7; + uint32 difficulty_id = 8; + uint32 level_id = 10; + repeated CrystalLinkTeamInfo team_info_list = 14; +} \ No newline at end of file diff --git a/proto/CrystalLinkTeamInfo.proto b/proto/CrystalLinkTeamInfo.proto index 488e6246..5221f3fd 100644 --- a/proto/CrystalLinkTeamInfo.proto +++ b/proto/CrystalLinkTeamInfo.proto @@ -1,25 +1,11 @@ -// 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"; -import "CrystalLinkBuffInfo.proto"; + import "CrystalLinkAvatarInfo.proto"; -// Obf: HJHHNKFBGDE +import "CrystalLinkBuffInfo.proto"; + +// 4.6.0 message CrystalLinkTeamInfo { - repeated CrystalLinkBuffInfo buff_info_list = 7; - repeated CrystalLinkAvatarInfo avatar_info_list = 6; -} + repeated CrystalLinkAvatarInfo avatar_info_list = 11; + repeated CrystalLinkBuffInfo buff_info_list = 14; +} \ No newline at end of file diff --git a/proto/EntityPropNotify.proto b/proto/EntityPropNotify.proto new file mode 100644 index 00000000..f5d6de7b --- /dev/null +++ b/proto/EntityPropNotify.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; + +import "PropValue.proto"; + +// 4.6.0 +// CmdId: 9051 +message EntityPropNotify { + map prop_map = 10; + uint32 entity_id = 14; +} \ No newline at end of file diff --git a/proto/MarkEntityInMinMapNotify.proto b/proto/MarkEntityInMinMapNotify.proto new file mode 100644 index 00000000..1a904dad --- /dev/null +++ b/proto/MarkEntityInMinMapNotify.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; + +import "Vector.proto"; + +// 4.6.0 +// CmdId: 1480 +message MarkEntityInMinMapNotify { + uint32 monster_id = 3; + uint32 entity_id = 13; + Vector position = 14; +} \ No newline at end of file diff --git a/proto/MarkNewNotify.proto b/proto/MarkNewNotify.proto index 3e32b0d7..caac7f67 100644 --- a/proto/MarkNewNotify.proto +++ b/proto/MarkNewNotify.proto @@ -1,24 +1,9 @@ -// 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: 26228 -// Obf: IBFGMEBBKKM + +// 4.6.0 +// CmdId: 5948 message MarkNewNotify { - uint32 mark_new_type = 9; - repeated uint32 id_list = 11; -} + repeated uint32 id_list = 1; + uint32 mark_new_type = 2; +} \ No newline at end of file