diff --git a/deobf.proto b/deobf.proto index 64d59e2e..0807b24b 100644 --- a/deobf.proto +++ b/deobf.proto @@ -9,7 +9,7 @@ message ABGIJHMDFPF { message KOALOAIAECI { uint32 material_id = 5; uint32 LGDDNLOOLKA = 7; - AHMDJOHBEFF PNINFAOEDHK = 12; + WidgetCoolDownData PNINFAOEDHK = 12; int32 retcode = 13; FEACKCCDBIN BPCGAIECKKD = 14; } @@ -125,7 +125,7 @@ message EntityTagChangeNotify { // CmdId: 8636 message NBDLDBMHNEN { uint32 index = 9; - uint32 BJIEKIFCCLI = 14; + uint32 make_id = 14; } // CmdId: 26799 @@ -455,8 +455,8 @@ message PlayerInvestigationTargetNotify { repeated InvestigationTarget investigation_target_list = 7; } -message ENGNHOIABCL { - uint32 OPOBEKNJIOE = 4; +message PlayerRTTInfo { + uint32 rtt = 4; uint32 uid = 10; } @@ -483,8 +483,8 @@ message HKAMEPMHAHN { } // CmdId: 5883 -message PPBNEEDPIFD { - repeated CEIPLLACIIJ BIHDPHNGAHI = 1; +message GivingRecordNotify { + repeated GivingRecord giving_record_list = 1; } // CmdId: 4179 @@ -766,8 +766,8 @@ message ELGJIBJEGCO { // CmdId: 23221 message EAACAMDKEFK { - LCGMFOGLDOD IABEIPFENKI = 10; - uint32 BJIEKIFCCLI = 13; + FurnitureMakeSlot furniture_make_slot = 10; + uint32 make_id = 13; int32 retcode = 14; } @@ -932,7 +932,7 @@ message MABCHILCHBM { uint64 LKBINMHIDJP = 11; } -// CmdId: 7184 +// CmdId: 7184 (drum) message DDCKECBDELH { repeated uint32 param1 = 1; int32 type = 4; @@ -2291,9 +2291,9 @@ message NGDDENAPOGH { } // CmdId: 29375 -message KPLBJBAFPBG { - repeated AHMDJOHBEFF BHOECIDMJKF = 8; - repeated AHMDJOHBEFF PPCNIAPEMIF = 10; +message WidgetCoolDownNotify { + repeated WidgetCoolDownData normal_cool_down_data_list = 8; + repeated WidgetCoolDownData group_cool_down_data_list = 10; } // CmdId: 3111 @@ -2829,10 +2829,10 @@ message MIMLAOFCEKF { } // CmdId: 3013 -message OLBHHAFFFCE { +message EvtAvatarUpdateFocusNotify { ForwardType forward_type = 5; uint32 entity_id = 6; - Vector LAHBHBNHOPK = 14; + Vector focus_forward = 14; } // CmdId: 8024 @@ -2862,13 +2862,13 @@ message GKODCFFLIMO { repeated CustomCommonNodeInfo LKMAMMBEFFM = 11; } -enum KBKPGGJIJLC { - KBKPGGJIJLC_SERVER_LOG_NONE = 0; - KBKPGGJIJLC_SERVER_LOG_ABILITY = 1; - KBKPGGJIJLC_SERVER_LOG_LEVEL = 2; - KBKPGGJIJLC_SERVER_LOG_ENTITY = 3; - KBKPGGJIJLC_SERVER_LOG_LUA = 4; - KBKPGGJIJLC_SERVER_LOG_DAILYTASK = 5; +enum ServerLogType { + SERVER_LOG_NONE = 0; + SERVER_LOG_ABILITY = 1; + SERVER_LOG_LEVEL = 2; + SERVER_LOG_ENTITY = 3; + SERVER_LOG_LUA = 4; + SERVER_LOG_DAILYTASK = 5; } // CmdId: 4431 @@ -3073,7 +3073,7 @@ message GKAOJBDAIPK { message CylinderRegionSize { float ANBMKICECKG = 2; - float PCINBEPDEEC = 10; + float radius = 10; } // CmdId: 22579 @@ -3197,7 +3197,7 @@ message IOOMGOJLEAO { } // CmdId: 29050 -message PCBLKNOGPEC { +message AvatarChangeAnimHashReq { uint64 avatar_guid = 6; uint32 anim_hash = 7; } @@ -3289,7 +3289,7 @@ message PMOJJMAHCHL { message BOGDBPJKMJA { uint32 avatar_id = 1; - uint32 BJIEKIFCCLI = 2; + uint32 make_id = 2; } // CmdId: 699 @@ -3591,9 +3591,9 @@ message OOIMFPGHEHD { } // CmdId: 25904 -message IPDKAOIFKPO { +message WidgetSlotChangeNotify { WidgetSlotData slot = 2; - IHPLLJMLPGK op = 7; + WidgetSlotOp op = 7; } // CmdId: 28939 @@ -4793,8 +4793,8 @@ message PFMJMICLDGB { } // CmdId: 9673 -message IIHCONAEOIK { - NJMDFFKJKJK OLOBEPBDLEM = 10; +message WidgetGadgetDataNotify { + WidgetGadgetData widget_gadget_data = 10; } // CmdId: 22640 @@ -5228,8 +5228,8 @@ message JGMNFIFDADN { // CmdId: 7585 message KGPNKGFHBNH { uint32 index = 5; - uint32 BJIEKIFCCLI = 10; - bool FMDJBIBJDNG = 11; + uint32 make_id = 10; + bool is_fast_finish = 11; } enum CodexType { @@ -5252,9 +5252,9 @@ message RoguelikeRuneReward { // CmdId: 20727 message PBFJJLEOJAA { - string GKBABAGLFFA = 5; - KBKPGGJIJLC HCEOCFEAFNM = 6; - FGMNINJNLAF PHGKJBAHEGD = 10; + string server_log = 5; + ServerLogType log_type = 6; + ServerLogLevel log_level = 10; } message JPOJBJEILPP { @@ -5578,12 +5578,12 @@ message ELJPIKPEIPE { } // CmdId: 28114 -message DBKEABGBMHN { +message TakeFurnitureMakeRsp { int32 retcode = 3; - repeated ItemParam DANPBPLCDEC = 8; - uint32 BJIEKIFCCLI = 11; - repeated ItemParam JDNOOMMLFID = 12; - LCGMFOGLDOD IABEIPFENKI = 14; + repeated ItemParam return_item_list = 8; + uint32 make_id = 11; + repeated ItemParam output_item_list = 12; + FurnitureMakeSlot furniture_make_slot = 14; } message Quest { @@ -5874,7 +5874,7 @@ message IDCHEKNBCID { } // CmdId: 25646 -message CAEIBHNMIJG { +message SeeMonsterReq { uint32 monster_id = 13; } @@ -6033,7 +6033,7 @@ message BNHNPJOEHAK { // CmdId: 22769 message JMBBGGMGFDF { - repeated JBLBNFJPLEJ LOMEIBFJHDN = 4; + repeated OneoffGatherPointDetectorData LOMEIBFJHDN = 4; } message FLANGGLJLAH { @@ -6097,11 +6097,11 @@ message OOLIKHGDDOF { } // CmdId: 4109 -message FOCOJPAIMIG { +message EvtAvatarEnterFocusNotify { bool OCPMCJPGDEK = 1; bool NDBDEIHDOGN = 2; uint32 entity_id = 3; - Vector LAHBHBNHOPK = 4; + Vector focus_forward = 4; bool NMMDNJJFMLM = 5; bool ODICPMKFMOB = 6; bool HOCCINCEKPD = 8; @@ -6114,9 +6114,9 @@ message FOCOJPAIMIG { } // CmdId: 3907 -message EEGMCPEPNHD { - bool DLDFPMAOENK = 5; - CEIPLLACIIJ OHPDIJGOGPO = 13; +message GivingRecordChangeNotify { + bool is_deactive = 5; + GivingRecord giving_record = 13; } // CmdId: 1259 @@ -6185,10 +6185,10 @@ message LCMFFKHCCDP { } // CmdId: 2720 -message HGGKJAJPIBN { - uint32 CHABJFCMICJ = 4; +message ForgeStartReq { + uint32 forge_count = 4; uint32 avatar_id = 5; - uint32 EELGIOHMOEE = 6; + uint32 forge_id = 6; } // CmdId: 2963 @@ -6295,7 +6295,7 @@ enum PlayerDieType { // CmdId: 24935 message BPGHJNABMDN { - FFDHGEAEOND AAIGLBIDOFG = 10; + LunchBoxData lunch_box_data = 10; } // CmdId: 1950 @@ -6365,9 +6365,9 @@ message FJMKKIEBJAG { message EEBHMEMHHFM { bool GHDAIBCGGMI = 806; oneof param { - PBAOGDGPBGJ location_info = 615; + WidgetCreateLocationInfo location_info = 615; OGFGBMPOGDD camera_info = 564; - IGAMKCLFACP creator_info = 777; + WidgetCreatorInfo creator_info = 777; KNJBADPIGFN thunder_bird_feather_info = 320; PIDEINKCANN sorush_info = 141; } @@ -6441,8 +6441,8 @@ message SetPlayerBirthdayReq { Birthday birthday = 2; } -message LOEMJEIFCPM { - GCBKNGHNMAF BEBAHCPHJIK = 4; +message SkyCrystalDetectorQuickUseResult { + SkyCrystalDetectorData sky_crystal_detector_data = 4; int32 retcode = 13; } @@ -6738,9 +6738,9 @@ message ACFKBEAGCNK { } // CmdId: 23681 -message OJHGCEMACGN { - uint32 BJFGKMFJJPN = 1; - BGIMFJLOLAF FKCMDDCNDNP = 9; +message ForgeQueueManipulateReq { + uint32 forge_queue_id = 1; + ForgeQueueManipulateType manipulate_type = 9; } // CmdId: 166 @@ -7159,9 +7159,9 @@ message LLFMHNOJNDL { } // CmdId: 22050 -message PIIPFBPEENH { +message CombineFormulaDataNotify { bool is_locked = 9; - uint32 ANBIDHPHLMN = 10; + uint32 combine_id = 10; } message LEGJMECJIKG { @@ -7294,10 +7294,10 @@ message EMCLHBPFBMB { } // CmdId: 7571 -message LEIDPOPLBPN { - map FFGEKODCBOO = 1; +message ForgeGetQueueDataRsp { + map forge_queue_map = 1; int32 retcode = 11; - uint32 KKAEAPBPNDF = 12; + uint32 max_queue_num = 12; } // CmdId: 26188 @@ -7449,8 +7449,8 @@ message MJAHHBOLICL { } // CmdId: 24393 -message HALNKMBMLDG { - FFDHGEAEOND AAIGLBIDOFG = 5; +message SetUpLunchBoxWidgetRsp { + LunchBoxData lunch_box_data = 5; int32 retcode = 11; } @@ -7835,8 +7835,8 @@ enum IDIILBEDAIC { IDIILBEDAIC_SALVAGE_PREVENT_STOP_AWAY = 6; } -message FNAHFDBGHJM { - uint32 MGOFBGJFDHE = 6; +message WeatherWizardData { + uint32 shield_value = 6; } // CmdId: 9734 @@ -8083,7 +8083,7 @@ message MPCPLIBBCOH { message BKFCEHKJCCA { ForwardType forward_type = 2; uint32 entity_id = 10; - Vector JOIOBNOOFCO = 14; + Vector JOIOBNOOFCO = 14; // 2 } // CmdId: 6967 @@ -8106,15 +8106,15 @@ message CKALAGBHGOM { } // CmdId: 492 -message EBHHLGHJAPM { - repeated ItemParam IILOLKPELPC = 4; - repeated ItemParam KKIJKINAPIG = 5; - repeated ItemParam KGJMEFIEMMI = 6; - uint32 ANBIDHPHLMN = 7; - repeated ItemParam KJJODDPDMAB = 8; +message CombineRsp { + repeated ItemParam IILOLKPELPC = 4; // 1 + repeated ItemParam KKIJKINAPIG = 5; // 1 + repeated ItemParam KGJMEFIEMMI = 6; // 1 + uint32 combine_id = 7; + repeated ItemParam KJJODDPDMAB = 8; // 1 uint64 avatar_guid = 9; - uint32 LKJBLICLDGO = 11; - repeated ItemParam DEIDDMPAAPB = 12; + uint32 combine_count = 11; + repeated ItemParam DEIDDMPAAPB = 12; // 1 repeated ItemParam cost_item_list = 14; int32 retcode = 15; } @@ -8133,10 +8133,10 @@ message NEPOEAHIHBP { // CmdId: 2853 message GLEKKPJGNFM { - repeated ItemParam DANPBPLCDEC = 4; + repeated ItemParam return_item_list = 4; repeated int32 NCIHBINMCJF = 6; - repeated ItemParam JDNOOMMLFID = 7; - repeated ItemParam POJIDKEBPLL = 12; + repeated ItemParam output_item_list = 7; + repeated ItemParam extra_output_item_list = 12; int32 retcode = 13; } @@ -8661,17 +8661,17 @@ message EBCEBDMGJMB { } // CmdId: 25032 -message IHJGCPGECHK { +message MassiveEntityElementOpBatchNotify { uint32 attacker_id = 2; int32 entity_type = 3; - int32 NACKILKGJKM = 5; - float KKEBIIOJDPD = 6; - uint32 LBCLLEHNIAK = 7; + int32 NACKILKGJKM = 5; // 1 + float attack_element_durability = 6; + uint32 user_id = 7; // 2 int32 BKOHEEIOEEA = 11; - uint32 AGOAIEDLAJO = 12; - oneof DJDLIMBBGOL { - FLEAEKELCCK shape_sphere = 4; - IEIAEKDEKPH shape_box = 8; + uint32 op_idx = 12; + oneof shape { + ShapeSphere shape_sphere = 4; + ShapeBox shape_box = 8; } } @@ -8930,7 +8930,7 @@ message EJMPOPCGECB { // CmdId: 5652 message MBGCPACIEIC { uint32 avatar_id = 2; - uint32 BJIEKIFCCLI = 12; + uint32 make_id = 12; } // CmdId: 28745 @@ -8963,9 +8963,9 @@ message HOJELKOKDGH { } // CmdId: 25160 -message BLFCJICOGKP { +message SetWidgetSlotReq { repeated WidgetSlotTag tag_list = 5; - IHPLLJMLPGK op = 9; + WidgetSlotOp op = 9; uint32 material_id = 14; } @@ -9661,9 +9661,9 @@ message UpdateAbilityCreatedMovingPlatformNotify { } // CmdId: 5698 -message FDKNEMGAFHA { - repeated uint32 FMGCAAKFFPL = 3; - map FFGEKODCBOO = 11; +message ForgeQueueDataNotify { + repeated uint32 removed_forge_queue_list = 3; + map forge_queue_map = 11; } // CmdId: 6255 @@ -9893,11 +9893,11 @@ message PolygonRegionSize { } // CmdId: 29426 -message FMJHOCGMDJF { +message SetWidgetSlotRsp { int32 retcode = 1; repeated WidgetSlotTag tag_list = 2; uint32 material_id = 3; - IHPLLJMLPGK op = 8; + WidgetSlotOp op = 8; } message LJFAGOIJNOP { @@ -10098,9 +10098,9 @@ message CPMOGOCPGHN { int32 retcode = 7; } -enum BGIMFJLOLAF { - BGIMFJLOLAF_RECEIVE_OUTPUT = 0; - BGIMFJLOLAF_STOP_FORGE = 1; +enum ForgeQueueManipulateType { + FORGE_QUEUE_MANIPULATE_TYPE_RECEIVE_OUTPUT = 0; + FORGE_QUEUE_MANIPULATE_TYPE_STOP_FORGE = 1; } message JDCAPNGJHDL { @@ -10513,18 +10513,18 @@ message DDHAIIJNAEP { } // CmdId: 28191 -message PFHAADKHHNC { +message GadgetAutoPickDropInfoNotify { repeated Item item_list = 8; } message CreateGadgetInfo { - message FIMBKDCNEGG { + message Chest { uint32 chest_drop_id = 1; bool is_show_cutscene = 2; } GadgetBornType born_type = 1; - FIMBKDCNEGG chest = 2; + Chest chest = 2; } // CmdId: 714 @@ -10982,11 +10982,11 @@ message GBMJHBFLPJA { uint32 DHGMDCIDLCL = 1; } -message IEIAEKDEKPH { +message ShapeBox { Vector center = 1; - Vector NPPMCMAFLGB = 2; - Vector KOPFDELEPGO = 3; - Vector MABKHAKOHLH = 4; + Vector axis0 = 2; + Vector axis1 = 3; + Vector axis3 = 4; Vector extents = 5; } @@ -11046,8 +11046,8 @@ message LIIDMJKPBOD { } // CmdId: 6291 -message GKCKKCHHINC { - repeated NJMDFFKJKJK OLOBEPBDLEM = 10; +message WidgetGadgetAllDataNotify { + repeated WidgetGadgetData widget_gadget_data = 10; } // CmdId: 768 @@ -11426,9 +11426,9 @@ message GachaTransferItem { bool is_transfer_item_new = 14; } -enum IHPLLJMLPGK { - IHPLLJMLPGK_ATTACH = 0; - IHPLLJMLPGK_DETACH = 1; +enum WidgetSlotOp { + WIDGET_SLOT_OP_ATTACH = 0; + WIDGET_SLOT_OP_DETACH = 1; } message EMDJHAOIFCN { @@ -11536,7 +11536,7 @@ message HMGNHLIFACB { // CmdId: 20114 message JNFBJLLIDMG { - GCBKNGHNMAF BEBAHCPHJIK = 13; + SkyCrystalDetectorData sky_crystal_detector_data = 13; } enum NADCIKAMAOJ { @@ -11960,7 +11960,7 @@ message FLGMACEKBLN { // CmdId: 24081 message GEFBBGCLJBE { uint32 FFKOPNLMOOE = 6; - uint32 FNMGKLBCOJJ = 12; + uint32 anchor_point_id = 12; } // CmdId: 22478 @@ -12471,7 +12471,7 @@ message BLFPFJOLNOB { } // CmdId: 4072 -message BNJPANBFBDL { +message MarkTargetInvestigationMonsterNotify { uint32 investigation_monster_id = 1; uint32 monster_id = 3; uint32 scene_id = 6; @@ -12506,9 +12506,9 @@ message GLODABIEDAC { NNCHKIJCDCM ABJBEFCOPBI = 15; } -message IGAMKCLFACP { - PBAOGDGPBGJ GKOFAPHGMOG = 4; - FLOIKBKAJEM op_type = 8; +message WidgetCreatorInfo { + WidgetCreateLocationInfo GKOFAPHGMOG = 4; + WidgetCreatorOpType op_type = 8; uint32 entity_id = 15; } @@ -12637,9 +12637,7 @@ message HECPIBEMAAC { int32 retcode = 1; } - -//AbilityActionGenerateElemBall or AbilityActionCreateGadget -message LNFNHFNNCOP { +message AbilityActionGenerateElemBall { Vector pos = 7; Vector rot = 9; uint32 room_id = 10; @@ -13597,7 +13595,7 @@ message RoutePoint { } } -message DDNBBJPLJCJ { +message ClientCollectorData { uint32 material_id = 7; uint32 DAANCBODMPE = 10; uint32 EACFGCAKDJE = 11; @@ -14426,7 +14424,7 @@ message IMPNFCOBIJM { message FHPGMFFDIMD { uint32 scene_id = 2; string IKFOJIAGCFP = 8; - uint32 PCINBEPDEEC = 14; + uint32 radius = 14; } message HNDOEDDGCIM { @@ -14477,10 +14475,10 @@ message MFNOCJDJEBK { uint32 group_bundle_id = 14; } -message AHMDJOHBEFF { +message WidgetCoolDownData { uint32 id = 4; bool is_success = 10; - uint64 LIEOPNMGEKH = 14; + uint64 cool_down_time = 14; } // CmdId: 4880 @@ -14828,7 +14826,7 @@ message NLEHBHBGBFA { message FHNNBBLIPEK { int32 retcode = 6; uint32 FFKOPNLMOOE = 10; - uint32 FNMGKLBCOJJ = 14; + uint32 anchor_point_id = 14; } // CmdId: 4095 @@ -16919,14 +16917,14 @@ message JLFFJAJMLME { } // CmdId: 29667 -message AANFGCDEDGI { - enum ILHDPNLBCAP { - ILHDPNLBCAP_LUA_OPTION_NONE = 0; - ILHDPNLBCAP_LUA_OPTION_PLAYER_INPUT = 1; +message LuaSetOptionNotify { + enum LuaOptionType { + LUA_OPTION_NONE = 0; + LUA_OPTION_PLAYER_INPUT = 1; } - ILHDPNLBCAP LOCNGDEEIGH = 1; - string AKHNENIBNIB = 9; + LuaOptionType LOCNGDEEIGH = 1; + string lua_set_param = 9; } // CmdId: 6319 @@ -17683,7 +17681,7 @@ message LGIEGNFMJBO { uint32 IHDGMIDEBPN = 4; uint32 BIPGKGPPHDK = 5; uint64 OPKOEHMFNCF = 6; - uint32 LBCLLEHNIAK = 11; + uint32 user_id = 11; uint32 EHFBMBEJKGM = 12; uint32 NPKCFBNDGBJ = 13; uint64 DBDJPIAFJED = 21; @@ -17759,9 +17757,9 @@ message PlayerEnterSceneInfoNotify { } message BFGAJCMGAPE { - uint32 BJIEKIFCCLI = 2; + uint32 make_id = 2; uint32 index = 11; - bool FMDJBIBJDNG = 14; + bool is_fast_finish = 14; } // CmdId: 21496 @@ -18009,7 +18007,7 @@ message DNJGHDKNKPL { uint32 FGHGLBCBIJL = 13; } -// CmdId: 24421 +// CmdId: 24421 ? DigMarkPoint or PlayerLocationInfo message NPPAHHLALEN { Vector rot = 2; uint32 DMBABJMPAMB = 3; @@ -18540,10 +18538,10 @@ message PAHEDIAJAHJ { // CmdId: 7857 message OKBGBICMBAL { int32 retcode = 1; - LCGMFOGLDOD IABEIPFENKI = 3; - repeated ItemParam DANPBPLCDEC = 4; + FurnitureMakeSlot furniture_make_slot = 3; + repeated ItemParam return_item_list = 4; repeated uint32 LOOLMECBGCM = 9; - repeated ItemParam JDNOOMMLFID = 15; + repeated ItemParam output_item_list = 15; } message CLFJPMNBCNH { @@ -18844,12 +18842,12 @@ message MEEPBDINFOL { } // CmdId: 24425 -message NPEECEKGJIL { - repeated ItemParam JDNOOMMLFID = 2; +message ForgeQueueManipulateRsp { + repeated ItemParam output_item_list = 2; int32 retcode = 3; - repeated ItemParam DANPBPLCDEC = 7; - BGIMFJLOLAF FKCMDDCNDNP = 8; - repeated ItemParam POJIDKEBPLL = 11; + repeated ItemParam return_item_list = 7; + ForgeQueueManipulateType manipulate_type = 8; + repeated ItemParam extra_output_item_list = 11; } message SceneReliquaryInfo { @@ -19022,7 +19020,7 @@ message DJKJBFPIBEB { // CmdId: 28844 message OIFFIANHCNK { uint32 entity_id = 5; - Vector FIGOMIOKMFA = 12; + Vector FIGOMIOKMFA = 12; // 1 ForwardType forward_type = 14; } @@ -19997,7 +19995,7 @@ message PBPABICJKNK { } // CmdId: 28880 -message IKKNPDPEIHL { +message QueryCodexMonsterBeKilledNumRsp { int32 retcode = 5; repeated uint32 CBGEHPOFCAK = 13; repeated uint32 codex_id_list = 14; @@ -20047,7 +20045,7 @@ message DEMEIHMNFHH { // CmdId: 4442 message LPNLKDDPLKN { int32 retcode = 10; - LCGMFOGLDOD IABEIPFENKI = 14; + FurnitureMakeSlot furniture_make_slot = 14; } // CmdId: 6956 @@ -20412,8 +20410,7 @@ message BNGLFGCPEOD { } -//AbilityActionGenerateElemBall or AbilityActionCreateGadget -message MGDJNOGCOIB { +message AbilityActionCreateGadget { Vector pos = 6; Vector rot = 8; uint32 room_id = 15; @@ -21340,7 +21337,7 @@ message QuestListNotify { } // CmdId: 22669 -message HECPBJNCDBF { +message WorldChestOpenNotify { uint32 config_id = 3; uint32 scene_id = 9; uint32 group_id = 10; @@ -21851,11 +21848,11 @@ message OKKBKHIGKAF { map fight_prop_map = 13; } -message GCBKNGHNMAF { - Vector MNJJANJIOOL = 2; +message SkyCrystalDetectorData { + Vector hint_center_pos = 2; uint32 config_id = 4; uint32 group_id = 7; - bool MBGMHOANDDF = 9; + bool is_hint_valid = 9; } message LLLLJGKFNPO { @@ -22021,7 +22018,7 @@ message DBBEPEOHNMG { // CmdId: 9079 message NEGMONKAAOG { - LCGMFOGLDOD IABEIPFENKI = 2; + FurnitureMakeSlot furniture_make_slot = 2; int32 retcode = 6; } @@ -22548,8 +22545,8 @@ message LHDHLDODJCE { uint32 APJBJLMHOGM = 10; } -message NJMDFFKJKJK { - repeated uint32 JMLGDLDIMLK = 9; +message WidgetGadgetData { + repeated uint32 gadget_entity_id_list = 9; uint32 gadget_id = 10; } @@ -23402,11 +23399,11 @@ message LCJJJOGPHIP { } // CmdId: 24286 -message LNGIGBFHNBG { +message TriggerCreateGadgetToEquipPartNotify { uint32 entity_id = 7; uint32 gadget_id = 8; uint32 gadget_entity_id = 9; - string JIBLGIOMNDB = 11; + string equip_part = 11; } message LDDHDDOLJDG { @@ -23480,10 +23477,10 @@ message PEDMLJPBKIB { int32 retcode = 1; } -enum FLOIKBKAJEM { - FLOIKBKAJEM_WIDGET_CREATOR_TYPE_NONE = 0; - FLOIKBKAJEM_WIDGET_CREATOR_TYPE_RETRACT = 1; - FLOIKBKAJEM_WIDGET_CREATOR_TYPE_RETRACT_AND_CREATE = 2; +enum WidgetCreatorOpType { + WIDGET_CREATOR_TYPE_NONE = 0; + WIDGET_CREATOR_TYPE_RETRACT = 1; + WIDGET_CREATOR_TYPE_RETRACT_AND_CREATE = 2; } // CmdId: 28139 @@ -23871,8 +23868,8 @@ message NNPJNMJGNKN { } // CmdId: 8543 -message NADJCPKBCLM { - uint32 EELGIOHMOEE = 7; +message ForgeFormulaDataNotify { + uint32 forge_id = 7; bool is_locked = 15; } @@ -24030,14 +24027,14 @@ message JOEMKPKDIOK { bool is_finish = 7; } -message CEIPLLACIIJ { +message GivingRecord { uint32 config_id = 2; - bool DICGNAPCLBE = 3; + bool is_gadget_giving = 3; uint32 giving_id = 5; - map DBLDMNAEMKK = 7; + map material_cnt_map = 7; bool is_finished = 8; uint32 group_id = 9; - uint32 DLAKBKJIOFH = 10; + uint32 last_group_id = 10; } message KHPIGNCKHDH { @@ -24459,7 +24456,7 @@ message NAKOBOPIIKJ { // CmdId: 8519 message BMJPDOLOPFO { - repeated DDNBBJPLJCJ PKJPKNGNIJA = 11; + repeated ClientCollectorData client_collector_data_list = 11; } // CmdId: 26430 @@ -24471,7 +24468,7 @@ message HHHKOEMHBAN { // CmdId: 24239 message PEFPHJLPJMP { - uint32 MGOFBGJFDHE = 2; + uint32 shield_value = 2; } message DBBDBJLCPIF { @@ -24848,8 +24845,8 @@ message GLCHMMFHODH { uint32 stage_id = 15; } -message FFDHGEAEOND { - map ICCONGHBKPE = 5; +message LunchBoxData { + map slot_material_map = 5; } message BENJDJBGBBC { @@ -24871,7 +24868,7 @@ message NFIBLKHAPDP { message HKINAHNDLLO { uint32 circle_camp_id = 1; uint32 config_id = 2; - Vector MNJJANJIOOL = 6; + Vector hint_center_pos = 6; uint32 offering_id = 8; uint32 MKHGDBMDAFI = 10; uint32 ACCJNDBKDFD = 12; @@ -25206,7 +25203,7 @@ message PEKBPLHPADL { } message KNOAKIBLNKL { - uint32 PCINBEPDEEC = 1; + uint32 radius = 1; Vector center = 2; bool JNLLJLGPJEP = 5; uint32 circle_camp_id = 6; @@ -25692,11 +25689,11 @@ message FEPLMJEJAOA { } // CmdId: 8213 -message LPCCGGKDGML { +message WidgetDoBagReq { uint32 material_id = 2; - oneof BEALKKPHHEG { - PBAOGDGPBGJ location_info = 1448; - IGAMKCLFACP widget_creator_info = 1848; + oneof op_info { + WidgetCreateLocationInfo location_info = 1448; + WidgetCreatorInfo widget_creator_info = 1848; } } @@ -25923,10 +25920,10 @@ message PODDFKOCPPH { } // CmdId: 6985 -message HDCGAFLEJII { - uint32 KKAEAPBPNDF = 1; - repeated uint32 BMBMHBJNJMD = 3; - map FFGEKODCBOO = 10; +message ForgeDataNotify { + uint32 max_queue_num = 1; + repeated uint32 forge_id_list = 3; + map forge_queue_map = 10; } message DPIHJACIMGF { @@ -26536,7 +26533,7 @@ message IDNECEPCLFH { message ECLANBCKCCD { bool BJPGFCFLODI = 1; - uint32 PCINBEPDEEC = 6; + uint32 radius = 6; repeated Vector PNBEFLPKFMO = 7; uint32 region_id = 12; Vector BKEMMEPECLA = 13; @@ -26749,7 +26746,7 @@ message GetAllMailRsp { // CmdId: 24493 message DLDCLNJJBFG { - Vector LELKLKFDFBK = 12; + Vector LELKLKFDFBK = 12; // 1 uint32 entity_id = 14; ForwardType forward_type = 15; } @@ -26945,7 +26942,7 @@ message FCNGGNDFILI { // CmdId: 24427 message KOFEBOKFPAH { - LCGMFOGLDOD IABEIPFENKI = 2; + FurnitureMakeSlot furniture_make_slot = 2; BCJLAIODLOB LNGLGCLLHMP = 5; } @@ -27027,8 +27024,8 @@ message HNJJNJCNAEE { repeated uint32 ABLAGNOCKFP = 14; } -message LCGMFOGLDOD { - repeated EEBMDODIBIH KGCEHGDNBFO = 9; +message FurnitureMakeSlot { + repeated FurnitureMakeData furniture_make_data_list = 9; } message BIBPHOBELLG { @@ -27483,7 +27480,7 @@ message DDLDKIHAHNM { // CmdId: 27108 message HLONGHPALAB { - LCGMFOGLDOD IABEIPFENKI = 1; + FurnitureMakeSlot furniture_make_slot = 1; uint32 DIHMDJABKEA = 3; repeated CLCNPLICMHJ AMLPKFBKNOC = 4; repeated BCJLAIODLOB MFKPHKDLJIK = 6; @@ -27504,7 +27501,7 @@ enum IIKLJBGEBGP { } // CmdId: 29112 -message GJKDEOLOKPE { +message AvatarChangeAnimHashRsp { uint64 avatar_guid = 6; uint32 anim_hash = 10; int32 retcode = 11; @@ -27778,8 +27775,8 @@ message MailData { MailCollectState collect_state = 15; } -message ACCKBIMOOKD { - uint32 EELGIOHMOEE = 1; +message ForgeQueueData { + uint32 forge_id = 1; uint32 HDCDJAEHLGH = 5; uint32 BFAPBMFOAMI = 6; uint32 GIIJIBEHOCG = 7; @@ -28156,6 +28153,7 @@ message FMJKPBJPKLP { repeated uint32 KNPCIPDKLFN = 5; } +// EvtSetAttackTargetNotify // CmdId: 26388 message MEKKLOEPJHL { ADPPJOOKBMK KDPBODAELBA = 4; @@ -28753,9 +28751,9 @@ message PIAFLNMHBML { uint32 schedule_id = 3; } -message KCICJPBLKGI { +message AnchorPointData { uint32 scene_id = 6; - uint32 FNMGKLBCOJJ = 7; + uint32 anchor_point_id = 7; uint32 end_time = 8; Vector pos = 14; Vector rot = 15; @@ -29674,13 +29672,13 @@ enum BHKMLMHFKCB { BHKMLMHFKCB_PACMAN_DUNGEON_STOP_FAIL = 6; } -message EEBMDODIBIH { - fixed32 OCMLEJGPMME = 3; +message FurnitureMakeData { + fixed32 accelerate_time = 3; fixed32 begin_time = 6; uint32 index = 8; uint32 avatar_id = 10; - uint32 LDDBOIEHLEI = 12; - uint32 BJIEKIFCCLI = 15; + uint32 dur_time = 12; + uint32 make_id = 15; } message CPPBOPDJOJC { @@ -29790,13 +29788,13 @@ message AvatarSkillInfo { } // CmdId: 22155 -message MIMKEJBMGGH { +message QuickUseWidgetRsp { int32 retcode = 3; uint32 material_id = 10; oneof param { - JBLBNFJPLEJ detector_data = 7; - DDNBBJPLJCJ client_collector_data = 14; - LOEMJEIFCPM sky_crystal_detector_quick_use_result = 207036; + OneoffGatherPointDetectorData detector_data = 7; + ClientCollectorData client_collector_data = 14; + SkyCrystalDetectorQuickUseResult sky_crystal_detector_quick_use_result = 207036; } } @@ -29953,7 +29951,7 @@ message PAJPCGDJLFF { } } -// CmdId: 24635 +// CmdId: 24635x message SceneEntityAppearNotify { repeated SceneEntityInfo entity_list = 13; uint32 param = 9; @@ -29961,22 +29959,22 @@ message SceneEntityAppearNotify { } // CmdId: 9546 -message IFNFOADFFEL { +message AllWidgetDataNotify { repeated WidgetSlotData slot_list = 1; - repeated DDNBBJPLJCJ PKJPKNGNIJA = 2; - FNAHFDBGHJM DJOBNPOPEKM = 3; - repeated KCICJPBLKGI IIAJINOOMHC = 4; - repeated AHMDJOHBEFF BHOECIDMJKF = 5; - JJGPAPCGKKN KOLFBIIEMFE = 6; + repeated ClientCollectorData client_collector_data_list = 2; + WeatherWizardData weather_wizard_data = 3; + repeated AnchorPointData anchor_point_list = 4; + repeated WidgetCoolDownData normal_cool_down_data_list = 5; + JJGPAPCGKKN KOLFBIIEMFE = 6; // ? uint32 MKPJIJDOFNM = 7; - repeated AHMDJOHBEFF ABLMLAKFBPB = 8; + repeated WidgetCoolDownData group_cool_down_data_list = 8; //? repeated uint32 BOKDECMKCJH = 9; - GCBKNGHNMAF BEBAHCPHJIK = 11; - repeated JBLBNFJPLEJ LOMEIBFJHDN = 14; - FFDHGEAEOND AAIGLBIDOFG = 15; + SkyCrystalDetectorData sky_crystal_detector_data = 11; + repeated OneoffGatherPointDetectorData LOMEIBFJHDN = 14; + LunchBoxData lunch_box_data = 15; // OK repeated uint32 MJOFAOMGIPC = 555; uint32 NBMIMHDKNIA = 724; - NNCHKIJCDCM ABJBEFCOPBI = 1470; + NNCHKIJCDCM ABJBEFCOPBI = 1470; // ? } // CmdId: 27578 @@ -30619,7 +30617,7 @@ message GPDNLGFDECM { uint32 city_id = 9; } -message PBAOGDGPBGJ { +message WidgetCreateLocationInfo { Vector pos = 13; Vector rot = 15; } @@ -30647,7 +30645,7 @@ message ADCMKPKPDDG { // CmdId: 2845 message GJGJELJLOBI { - repeated ENGNHOIABCL FNNAEGNBNEH = 4; + repeated PlayerRTTInfo player_rtt_list = 4; } // CmdId: 29009 @@ -30682,12 +30680,12 @@ message EPOGCHFKDPC { repeated FCENMPFGLEH LHBIDKLOLKP = 14; } -enum FGMNINJNLAF { - FGMNINJNLAF_LOG_LEVEL_NONE = 0; - FGMNINJNLAF_LOG_LEVEL_DEBUG = 1; - FGMNINJNLAF_LOG_LEVEL_INFO = 2; - FGMNINJNLAF_LOG_LEVEL_WARNING = 3; - FGMNINJNLAF_LOG_LEVEL_ERROR = 4; +enum ServerLogLevel { + LOG_LEVEL_NONE = 0; + LOG_LEVEL_DEBUG = 1; + LOG_LEVEL_INFO = 2; + LOG_LEVEL_WARNING = 3; + LOG_LEVEL_ERROR = 4; } message HHKCOJLDMJP { @@ -31068,7 +31066,7 @@ message ABONIKPBAAM { } // CmdId: 21437 -message GMFOBFGAGCF { +message QueryCodexMonsterBeKilledNumReq { repeated uint32 codex_id_list = 15; } @@ -31369,7 +31367,7 @@ message DDMFCPPJDEN { // CmdId: 28074 message CCGBLGPHICO { uint32 IJKFEGMMKDL = 1; - repeated KCICJPBLKGI IIAJINOOMHC = 14; + repeated AnchorPointData anchor_point_list = 14; } // CmdId: 25792 @@ -31454,9 +31452,9 @@ message GONJGHIDEBG { uint32 stage_id = 14; } -message FLEAEKELCCK { +message ShapeSphere { Vector center = 1; - float PCINBEPDEEC = 2; + float radius = 2; } // CmdId: 23762 @@ -31465,10 +31463,10 @@ message AIKNBGBIBDH { } // CmdId: 3349 -message AFEJNKGCLBH { - uint32 LKJBLICLDGO = 6; +message CombineReq { + uint32 combine_count = 6; uint64 avatar_guid = 9; - uint32 ANBIDHPHLMN = 10; + uint32 combine_id = 10; } // CmdId: 2355 @@ -32125,7 +32123,7 @@ message JJGPAPCGKKN { bool CPJLHBGNLNJ = 9; } -// CmdId: 27183 +// CmdId: 27183 ? message SceneEntityUpdateNotify { VisionType appear_type = 9; repeated SceneEntityInfo entity_list = 11; @@ -32270,17 +32268,17 @@ message HNDHLHPKPNN { uint64 target_weapon_guid = 13; } -message JBLBNFJPLEJ { +message OneoffGatherPointDetectorData { uint32 ACCJNDBKDFD = 1; uint32 material_id = 2; - Vector MNJJANJIOOL = 4; + Vector hint_center_pos = 4; uint32 MKHGDBMDAFI = 6; uint32 group_id = 7; - bool MBGMHOANDDF = 8; + bool is_hint_valid = 8; uint32 circle_camp_id = 9; uint32 scene_id = 10; uint32 config_id = 11; - bool CNPKBJEFAGM = 13; + bool is_all_collected = 13; } // CmdId: 23549 diff --git a/obfuscated.proto b/obfuscated.proto index 0903a11d..86c0cd63 100644 --- a/obfuscated.proto +++ b/obfuscated.proto @@ -14982,33 +14982,33 @@ message GICJLGOBNGE { bool APDMNMKEGHD = 2; KDOEFCOJDDL ICDHBHPIOLK = 3; uint32 KAECIPNBOJI = 5; - uint32 DMEFLHEBFGE = 6; - uint32 IEFGMPMOMKC = 7; + uint32 DMEFLHEBFGE = 6; // 1 + uint32 IEFGMPMOMKC = 7; // 12 float ANGONOJHONO = 8; int32 NFEFBCKGICC = 9; ABFKJACHPLA AHGLGJCMJOH = 10; - uint32 LONHILAPBAM = 11; + uint32 LONHILAPBAM = 11; // 1 JGICBNNNOGG OJIFDDKJIGD = 12; - uint32 AOIEOMEAENM = 13; + uint32 AOIEOMEAENM = 13; // 1 EDNIAMNLNLA ABPIDJGKNCK = 15; - uint32 KLIGFACEFPN = 23; + uint32 KLIGFACEFPN = 23; // 1 float NMBBCBBEPDA = 54; - uint32 KPKJBIPFJIL = 103; + uint32 KPKJBIPFJIL = 103; // 1 float DJAEOHKJLIM = 114; - uint32 AICABJIPONB = 139; - uint32 OAPLECACBOM = 337; - uint32 FCKAKKLDCJL = 507; - uint32 EPGAHHJONJH = 657; - uint32 HMKBBEKDPCG = 916; + uint32 AICABJIPONB = 139; // 1 + uint32 OAPLECACBOM = 337; // 1 + uint32 FCKAKKLDCJL = 507; // 2 + uint32 EPGAHHJONJH = 657; // 1 + uint32 HMKBBEKDPCG = 916; // 1 bool CGDMLMFOKMH = 1134; - uint32 DFOGGFELDHA = 1524; + uint32 DFOGGFELDHA = 1524; // 1 float PHOMPNBJFAN = 1582; - uint32 ANJADNCHCDD = 1639; + uint32 ANJADNCHCDD = 1639; // 1 bool KNKJCBOBHGA = 1648; - uint32 NFIIKLMBGLL = 1840; + uint32 NFIIKLMBGLL = 1840; // 1 float LABKMPGILDJ = 1969; bool FNGJAODAPHC = 1980; - uint32 NJAMJODILKJ = 2032; + uint32 NJAMJODILKJ = 2032; // 1 } // CmdId: 2977 diff --git a/proto/AbilityMetaSetKilledState.proto b/proto/AbilityMetaSetKilledState.proto index 615779d8..61827669 100644 --- a/proto/AbilityMetaSetKilledState.proto +++ b/proto/AbilityMetaSetKilledState.proto @@ -1,23 +1,7 @@ -// Sorapointa - A server software re-implementation for a certain anime game, and avoid sorapointa. -// Copyright (C) 2023 Sorapointa Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// 4.7.0 message AbilityMetaSetKilledState { - bool killed = 6; + bool killed = 12; } diff --git a/proto/AllWidgetDataNotify.proto b/proto/AllWidgetDataNotify.proto index 676f1d31..3c9ea391 100644 --- a/proto/AllWidgetDataNotify.proto +++ b/proto/AllWidgetDataNotify.proto @@ -5,28 +5,28 @@ import "ClientCollectorData.proto"; import "WidgetCoolDownData.proto"; import "AnchorPointData.proto"; import "LunchBoxData.proto"; -import "LANPHFCMEBN.proto"; +//import "LANPHFCMEBN.proto"; import "SkyCrystalDetectorData.proto"; import "EPIAFADAJAN.proto"; import "WidgetSlotData.proto"; import "WeatherWizardData.proto"; -// 4.7.0 (TODO) +// 4.7.0 TODO // CmdId: 9546 // Obf: IFNFOADFFEL message AllWidgetDataNotify { - repeated OneoffGatherPointDetectorData oneoff_gather_point_detector_data_list = 4; - repeated ClientCollectorData client_collector_data_list = 9; - uint32 CMFPEOMAJLM = 10; - repeated WidgetCoolDownData normalCoolDownDataList = 8; - repeated AnchorPointData anchor_point_list = 15; - LunchBoxData lunch_box_data = 11; - repeated WidgetCoolDownData coolDownGroupDataList = 14; - LANPHFCMEBN ELIOJBDGIMJ = 12; - SkyCrystalDetectorData sky_crystal_detector_data = 1; - repeated uint32 EMPBLGKLCOA = 1790; - EPIAFADAJAN NNPMMJCEJAO = 1715; - uint32 HALAOGOBMKJ = 1816; - repeated WidgetSlotData slot_list = 13; - repeated uint32 background_active_widget_list = 6; - WeatherWizardData weather_wizard_data = 2; + repeated OneoffGatherPointDetectorData oneoff_gather_point_detector_data_list = 14; // OK + repeated ClientCollectorData client_collector_data_list = 2; // ok + //uint32 CMFPEOMAJLM = 10; + repeated WidgetCoolDownData normal_cool_down_data_list = 5; // OK + repeated AnchorPointData anchor_point_list = 4; // OK + LunchBoxData lunch_box_data = 15; // OK + repeated WidgetCoolDownData group_cool_down_data_list = 8; // OK? + //LANPHFCMEBN ELIOJBDGIMJ = 12; + SkyCrystalDetectorData sky_crystal_detector_data = 11; // OK + //repeated uint32 EMPBLGKLCOA = 1790; + //EPIAFADAJAN NNPMMJCEJAO = 1715; + //uint32 HALAOGOBMKJ = 1816; + repeated WidgetSlotData slot_list = 1; // OK + repeated uint32 background_active_widget_list = 555; // OR 9 + WeatherWizardData weather_wizard_data = 3; // OK } diff --git a/proto/AnchorPointData.proto b/proto/AnchorPointData.proto index 335f9ff5..003e2bfb 100644 --- a/proto/AnchorPointData.proto +++ b/proto/AnchorPointData.proto @@ -1,27 +1,12 @@ -// 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: EBCMEKLBHEL +// 4.7.0 +// Obf: KCICJPBLKGI message AnchorPointData { - uint32 scene_id = 11; - uint32 end_time = 12; - uint32 anchor_point_id = 1; - Vector pos = 5; - Vector rot = 7; + uint32 scene_id = 6; + uint32 end_time = 8; + uint32 anchor_point_id = 7; + Vector pos = 14; + Vector rot = 15; } diff --git a/proto/CancelFinishParentQuestNotify.proto b/proto/CancelFinishParentQuestNotify.proto index 890a127a..f47c29a8 100644 --- a/proto/CancelFinishParentQuestNotify.proto +++ b/proto/CancelFinishParentQuestNotify.proto @@ -1,23 +1,7 @@ -// 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: 26708 -// Obf: KDLHCNPHJCO +// CmdId: 8018 or 4473 or 21386 or 25153 or 28109 +// Obf: ? message CancelFinishParentQuestNotify { uint32 parent_quest_id = 3; } diff --git a/proto/ClientCollectorData.proto b/proto/ClientCollectorData.proto index 21d535a1..85831155 100644 --- a/proto/ClientCollectorData.proto +++ b/proto/ClientCollectorData.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"; -// Obf: KGHDHIMBJHP +// 4.7.0 +// Obf: DDNBBJPLJCJ message ClientCollectorData { - uint32 KMCFLNNCFBL = 15; - uint32 material_id = 9; - uint32 DNOGKGIHECO = 3; + //uint32 KMCFLNNCFBL = 15; + uint32 material_id = 7; + //uint32 DNOGKGIHECO = 3; } diff --git a/proto/CombineDataNotify.proto b/proto/CombineDataNotify.proto index fd97818d..712481bb 100644 --- a/proto/CombineDataNotify.proto +++ b/proto/CombineDataNotify.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"; -// CmdId: 4969 -// Obf: HNCKJCIOCPI +// 4.7.0 +// CmdId: 23746 ? +// Obf: IGNLCELCBAG message CombineDataNotify { - repeated uint32 combine_id_list = 6; + repeated uint32 combine_id_list = 8; } diff --git a/proto/CombineFormulaDataNotify.proto b/proto/CombineFormulaDataNotify.proto index d63c1785..c990a3e9 100644 --- a/proto/CombineFormulaDataNotify.proto +++ b/proto/CombineFormulaDataNotify.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: 25832 -// Obf: CCMFELEODNK +// 4.7.0 +// CmdId: 22050 +// Obf: PIIPFBPEENH message CombineFormulaDataNotify { - uint32 combine_id = 14; - bool is_locked = 7; + uint32 combine_id = 10; + bool is_locked = 9; } diff --git a/proto/CombineReq.proto b/proto/CombineReq.proto index c0cedc1a..b75aa4fc 100644 --- a/proto/CombineReq.proto +++ b/proto/CombineReq.proto @@ -1,25 +1,10 @@ -// 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: 753 -// Obf: JIBOADJOLAM +// 4.7.0 +// CmdId: 3349 +// Obf: AFEJNKGCLBH message CombineReq { - uint32 combine_count = 5; - uint64 avatar_guid = 2; - uint32 combine_id = 3; + uint32 combine_count = 6; + uint64 avatar_guid = 9; + uint32 combine_id = 10; } diff --git a/proto/CombineRsp.proto b/proto/CombineRsp.proto index 76abc25b..1c0ea943 100644 --- a/proto/CombineRsp.proto +++ b/proto/CombineRsp.proto @@ -17,17 +17,17 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; -// CmdId: 27346 -// Obf: FPLEFMOIOGE +// CmdId: 492 +// Obf: EBHHLGHJAPM message CombineRsp { uint32 combine_id = 7; - uint32 combine_count = 3; - repeated ItemParam totalExtraItemList = 13; - repeated ItemParam total_return_item_list = 15; - repeated ItemParam totalRandomItemList = 11; - repeated ItemParam uk10 = 10; - uint64 avatar_guid = 5; - int32 retcode = 6; - repeated ItemParam result_item_list = 8; - repeated ItemParam cost_item_list = 4; + uint32 combine_count = 11; + repeated ItemParam totalExtraItemList = 4; + repeated ItemParam total_return_item_list = 5; + repeated ItemParam totalRandomItemList = 6; + //repeated ItemParam uk8 = 8; + uint64 avatar_guid = 9; + int32 retcode = 15; + repeated ItemParam result_item_list = 12; + repeated ItemParam cost_item_list = 14; // OK } diff --git a/proto/CreateEntityInfo.proto b/proto/CreateEntityInfo.proto index 6a3c6de2..9c80ae23 100644 --- a/proto/CreateEntityInfo.proto +++ b/proto/CreateEntityInfo.proto @@ -19,18 +19,21 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; import "CreateGadgetInfo.proto"; // Obf: CIDLLJOHEFL -message CreateEntityInfo { - oneof entity { - uint32 monster_id = 1; - uint32 npc_id = 2; - uint32 gadget_id = 3; - uint32 item_id = 4; - } +message CreateEntityInfo { uint32 level = 5; Vector pos = 6; Vector rot = 7; uint32 scene_id = 10; uint32 room_id = 11; uint32 client_unique_id = 12; - optional CreateGadgetInfo gadget = 13; + oneof entity { + uint32 monster_id = 1; + uint32 npc_id = 2; + uint32 gadget_id = 3; + uint32 item_id = 4; + } + oneof IHAAEBMHLHO { + CreateGadgetInfo gadget = 13; + } + //optional CreateGadgetInfo gadget = 13; ? } diff --git a/proto/CurVehicleInfo.proto b/proto/CurVehicleInfo.proto index 9f607919..a81ea502 100644 --- a/proto/CurVehicleInfo.proto +++ b/proto/CurVehicleInfo.proto @@ -8,7 +8,7 @@ message CurVehicleInfo { uint32 entity_id = 1; uint32 pos = 2; uint32 gadget_id = 3; - Vector AOHJKFLAICK = 4; - uint32 FDCGDBELDGL = 5; - Vector EOMOABFFPAL = 6; + //Vector AOHJKFLAICK = 4; + //uint32 FDCGDBELDGL = 5; + //Vector EOMOABFFPAL = 6; } \ No newline at end of file diff --git a/proto/DungeonEnterPosInfo.proto b/proto/DungeonEnterPosInfo.proto index 2e166858..abbfbbe1 100644 --- a/proto/DungeonEnterPosInfo.proto +++ b/proto/DungeonEnterPosInfo.proto @@ -2,9 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Version: 4.6.0 -// Obfs: KCCNEAHCDBC +// Version: 4.7.0 +// Obfs: ? message DungeonEnterPosInfo { - uint32 point_id = 7; - uint32 quest_id = 12; + uint32 point_id = 8; + uint32 quest_id = 9; } \ No newline at end of file diff --git a/proto/EvtAvatarEnterFocusNotify.proto b/proto/EvtAvatarEnterFocusNotify.proto index ca461dfe..a2033aa7 100644 --- a/proto/EvtAvatarEnterFocusNotify.proto +++ b/proto/EvtAvatarEnterFocusNotify.proto @@ -1,37 +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"; import "Vector.proto"; import "ForwardType.proto"; -// CmdId: 20643 -// Obf: CMOGIHEMPNF +// CmdId: 4109 +// Obf: FOCOJPAIMIG message EvtAvatarEnterFocusNotify { - Vector focus_forward = 13; - ForwardType forward_type = 3; - bool CCKKABKJJGP = 12; - bool MDMOIMDCOPF = 7; - uint32 entity_id = 11; - bool MCNECDNCLCJ = 1; - bool GMLEBIHPOKD = 5; - bool OGOLKMLFFHE = 2; - bool OEMKCENFMIM = 10; - bool DBPHFOKBNCP = 9; - bool PBHFFGHHPMA = 15; - bool EGBLCMOLOMC = 8; - bool NACMCGNGDLN = 6; + Vector focus_forward = 4; + ForwardType forward_type = 12; + //bool CCKKABKJJGP = 12; + //bool MDMOIMDCOPF = 7; + uint32 entity_id = 3; + //bool MCNECDNCLCJ = 1; + //bool GMLEBIHPOKD = 5; + //bool OGOLKMLFFHE = 2; + //bool OEMKCENFMIM = 10; + //bool DBPHFOKBNCP = 9; + //bool PBHFFGHHPMA = 15; + //bool EGBLCMOLOMC = 8; + //bool NACMCGNGDLN = 6; } diff --git a/proto/EvtAvatarExitFocusNotify.proto b/proto/EvtAvatarExitFocusNotify.proto index ec7a6895..3fd2c9d4 100644 --- a/proto/EvtAvatarExitFocusNotify.proto +++ b/proto/EvtAvatarExitFocusNotify.proto @@ -1,27 +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"; import "ForwardType.proto"; -// CmdId: 24354 -// Obf: BDJMGLMLENA +// CmdId: 24809 or 28844? or 24493 +// Obf: OIFFIANHCNK ? message EvtAvatarExitFocusNotify { - Vector finish_forward = 13; - ForwardType forward_type = 12; - uint32 entity_id = 11; + Vector finish_forward = 12; + ForwardType forward_type = 14; + uint32 entity_id = 5; } diff --git a/proto/EvtAvatarUpdateFocusNotify.proto b/proto/EvtAvatarUpdateFocusNotify.proto index 65753bbe..049f4296 100644 --- a/proto/EvtAvatarUpdateFocusNotify.proto +++ b/proto/EvtAvatarUpdateFocusNotify.proto @@ -1,27 +1,12 @@ -// 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"; import "ForwardType.proto"; -// CmdId: 8305 -// Obf: LHFNDLOOJKJ +// 4.7.0 +// CmdId: 3013 +// Obf: OLBHHAFFFCE message EvtAvatarUpdateFocusNotify { - uint32 entity_id = 8; + uint32 entity_id = 6; Vector focus_forward = 14; - ForwardType forward_type = 9; + ForwardType forward_type = 5; } diff --git a/proto/ExecuteGadgetLuaReq.proto b/proto/ExecuteGadgetLuaReq.proto index 465172a0..01757e07 100644 --- a/proto/ExecuteGadgetLuaReq.proto +++ b/proto/ExecuteGadgetLuaReq.proto @@ -1,26 +1,12 @@ -// 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: 5288 -// Obf: BCCHIHOEMNP +// 4.7.0 +// CmdId: 29143 +// Obf: OMLEJENNIJM message ExecuteGadgetLuaReq { - int32 param1 = 2; - int32 param3 = 5; - uint32 source_entity_id = 10; - int32 param2 = 8; + int32 param1 = 6; + int32 param3 = 7; + uint32 source_entity_id = 12; + int32 param2 = 2; + string BMDLHCMBPOA = 13; } diff --git a/proto/ExecuteGadgetLuaRsp.proto b/proto/ExecuteGadgetLuaRsp.proto index b831bc30..0cc2f92e 100644 --- a/proto/ExecuteGadgetLuaRsp.proto +++ b/proto/ExecuteGadgetLuaRsp.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"; -// CmdId: 1263 -// Obf: DPEMGHFBEEK +// 4.7.0 +// CmdId: 2532 ? +// Obf: CBGAMDPCMAM message ExecuteGadgetLuaRsp { - int32 retcode = 14; + int32 retcode = 13; } diff --git a/proto/ForgeDataNotify.proto b/proto/ForgeDataNotify.proto index 691a1c7e..90ffb44d 100644 --- a/proto/ForgeDataNotify.proto +++ b/proto/ForgeDataNotify.proto @@ -1,26 +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 "ForgeQueueData.proto"; -// CmdId: 6813 -// Obf: BFIGHNIEAFO +// 4.7.0 +// CmdId: 6985 +// Obf: HDCGAFLEJII message ForgeDataNotify { - map forge_queue_map = 7; - uint32 max_queue_num = 9; - repeated uint32 forge_id_list = 4; + map forge_queue_map = 10; + uint32 max_queue_num = 1; + repeated uint32 forge_id_list = 3; } diff --git a/proto/ForgeFormulaDataNotify.proto b/proto/ForgeFormulaDataNotify.proto index e02e4eb8..10812e4f 100644 --- a/proto/ForgeFormulaDataNotify.proto +++ b/proto/ForgeFormulaDataNotify.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: 28490 -// Obf: ILMLELNIKGE +// 4.7.0 +// CmdId: 8543 +// Obf: NADJCPKBCLM message ForgeFormulaDataNotify { - bool is_locked = 4; - uint32 forge_id = 2; + bool is_locked = 15; + uint32 forge_id = 7; } diff --git a/proto/ForgeGetQueueDataReq.proto b/proto/ForgeGetQueueDataReq.proto index 3b84314f..362f0761 100644 --- a/proto/ForgeGetQueueDataReq.proto +++ b/proto/ForgeGetQueueDataReq.proto @@ -1,22 +1,7 @@ -// 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: 477 -// Obf: AFDBIGNEOMH +// 4.7.0 +// CmdId: 21724 or 5954 +// Obf: EMCLHBPFBMB ? message ForgeGetQueueDataReq { } diff --git a/proto/ForgeGetQueueDataRsp.proto b/proto/ForgeGetQueueDataRsp.proto index 1ab4f3a7..57d4cb26 100644 --- a/proto/ForgeGetQueueDataRsp.proto +++ b/proto/ForgeGetQueueDataRsp.proto @@ -1,26 +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 "ForgeQueueData.proto"; -// CmdId: 9429 -// Obf: HOLCPCEMEMI +// 4.7.0 +// CmdId: 7571 +// Obf: LEIDPOPLBPN message ForgeGetQueueDataRsp { - uint32 max_queue_num = 3; + uint32 max_queue_num = 12; int32 retcode = 11; - map forge_queue_map = 12; + map forge_queue_map = 1; } diff --git a/proto/ForgeQueueData.proto b/proto/ForgeQueueData.proto index 7c12ac0f..8647b94f 100644 --- a/proto/ForgeQueueData.proto +++ b/proto/ForgeQueueData.proto @@ -1,28 +1,13 @@ -// 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: NBNGELFILMP +// 4.7.0 +// Obf: ACCKBIMOOKD message ForgeQueueData { - uint32 total_finish_timestamp = 13; - uint32 avatar_id = 8; - uint32 finish_count = 3; - uint32 queueId = 14; - uint32 unfinishCount = 11; - uint32 next_finish_timestamp = 4; - uint32 forge_id = 15; + uint32 total_finish_timestamp = 9; // sus + uint32 avatar_id = 8; // OK + uint32 finish_count = 7; // sus + uint32 queueId = 6; // sus + uint32 unfinishCount = 5; // sus + uint32 next_finish_timestamp = 11; // sus + uint32 forge_id = 1; } diff --git a/proto/ForgeQueueDataNotify.proto b/proto/ForgeQueueDataNotify.proto index 04e8204c..924b6d86 100644 --- a/proto/ForgeQueueDataNotify.proto +++ b/proto/ForgeQueueDataNotify.proto @@ -1,25 +1,10 @@ -// 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 "ForgeQueueData.proto"; -// CmdId: 29143 -// Obf: NEHKBDCNEMA +// 4.7.0 +// CmdId: 5698 +// Obf: FDKNEMGAFHA message ForgeQueueDataNotify { map forge_queue_map = 11; - repeated uint32 removed_forge_queue_list = 13; + repeated uint32 removed_forge_queue_list = 3; } diff --git a/proto/ForgeQueueManipulateReq.proto b/proto/ForgeQueueManipulateReq.proto index bd56e37e..5615a84f 100644 --- a/proto/ForgeQueueManipulateReq.proto +++ b/proto/ForgeQueueManipulateReq.proto @@ -1,25 +1,10 @@ -// 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 "ForgeQueueManipulateType.proto"; -// CmdId: 25920 -// Obf: KLKEPLGJNFI +// 4.7.0 +// CmdId: 23681 +// Obf: OJHGCEMACGN message ForgeQueueManipulateReq { uint32 forge_queue_id = 1; - ForgeQueueManipulateType manipulate_type = 5; + ForgeQueueManipulateType manipulate_type = 9; } diff --git a/proto/ForgeQueueManipulateRsp.proto b/proto/ForgeQueueManipulateRsp.proto index c93a1ff2..2be9caa1 100644 --- a/proto/ForgeQueueManipulateRsp.proto +++ b/proto/ForgeQueueManipulateRsp.proto @@ -1,29 +1,14 @@ -// 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 "ItemParam.proto"; import "ForgeQueueManipulateType.proto"; -// CmdId: 4194 -// Obf: JDJJJGPEDHM +// 4.7.0 +// CmdId: 24425 +// Obf: NPEECEKGJIL message ForgeQueueManipulateRsp { - repeated ItemParam output_item_list = 12; - repeated ItemParam extra_output_item_list = 13; - ForgeQueueManipulateType manipulate_type = 5; - repeated ItemParam return_item_list = 4; - int32 retcode = 6; + repeated ItemParam output_item_list = 2; // SUS + repeated ItemParam extra_output_item_list = 11; // ? + ForgeQueueManipulateType manipulate_type = 8; + repeated ItemParam return_item_list = 7; // SUS + int32 retcode = 3; } diff --git a/proto/ForgeQueueManipulateType.proto b/proto/ForgeQueueManipulateType.proto index 8757fde2..24c0527e 100644 --- a/proto/ForgeQueueManipulateType.proto +++ b/proto/ForgeQueueManipulateType.proto @@ -1,22 +1,7 @@ -// 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: DLEFODPKAGI +// 4.7.0 +// Obf: BGIMFJLOLAF enum ForgeQueueManipulateType { FORGE_QUEUE_MANIPULATE_TYPE_RECEIVE_OUTPUT = 0; FORGE_QUEUE_MANIPULATE_TYPE_STOP_FORGE = 1; diff --git a/proto/ForgeStartReq.proto b/proto/ForgeStartReq.proto index 917f589b..38510d6d 100644 --- a/proto/ForgeStartReq.proto +++ b/proto/ForgeStartReq.proto @@ -1,25 +1,10 @@ -// 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: 28979 -// Obf: BKGLNOOLDEJ +// 4.7.0 +// CmdId: 2720 +// Obf: HGGKJAJPIBN message ForgeStartReq { uint32 avatar_id = 5; - uint32 forge_count = 8; - uint32 forge_id = 1; + uint32 forge_count = 4; + uint32 forge_id = 6; } diff --git a/proto/FurnitureMakeData.proto b/proto/FurnitureMakeData.proto index acae82d1..2dbb8fb8 100644 --- a/proto/FurnitureMakeData.proto +++ b/proto/FurnitureMakeData.proto @@ -2,13 +2,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Version: 4.6.0 -// Obfs: KBMGFOFLGCP +// Version: 4.7.0 +// Obfs: EEBMDODIBIH message FurnitureMakeData { - uint32 make_id = 6; - uint32 dur_time = 7; - uint32 index = 9; - fixed32 accelerate_time = 10; - uint32 avatar_id = 12; - fixed32 begin_time = 13; + uint32 make_id = 15; + uint32 dur_time = 12; + uint32 index = 8; + fixed32 accelerate_time = 3; + uint32 avatar_id = 10; + fixed32 begin_time = 6; } \ No newline at end of file diff --git a/proto/FurnitureMakeSlot.proto b/proto/FurnitureMakeSlot.proto index 3232ec48..9fe44ad2 100644 --- a/proto/FurnitureMakeSlot.proto +++ b/proto/FurnitureMakeSlot.proto @@ -1,23 +1,7 @@ -// 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 "FurnitureMakeData.proto"; -// Obf: GINIMPCEHMA +// Obf: LCGMFOGLDOD message FurnitureMakeSlot { - repeated FurnitureMakeData furniture_make_data_list = 7; + repeated FurnitureMakeData furniture_make_data_list = 9; } diff --git a/proto/GadgetAutoPickDropInfoNotify.proto b/proto/GadgetAutoPickDropInfoNotify.proto index 010295dd..b92b0061 100644 --- a/proto/GadgetAutoPickDropInfoNotify.proto +++ b/proto/GadgetAutoPickDropInfoNotify.proto @@ -4,9 +4,9 @@ option java_package = "emu.grasscutter.net.proto"; import "Item.proto"; -// CmdId: 21348 -// Version: 4.6.0 -// Obfs: HAAAAPJJBGF +// CmdId: 28191 +// Version: 4.7.0 +// Obfs: PFHAADKHHNC message GadgetAutoPickDropInfoNotify { - repeated Item item_list = 12; + repeated Item item_list = 8; } \ No newline at end of file diff --git a/proto/GadgetPlayInfo.proto b/proto/GadgetPlayInfo.proto index 19f1fdf5..c6abff26 100644 --- a/proto/GadgetPlayInfo.proto +++ b/proto/GadgetPlayInfo.proto @@ -11,8 +11,8 @@ message GadgetPlayInfo { uint32 start_cd = 4; uint32 start_time = 5; uint32 progress = 6; - optional GadgetCrucibleInfo crucible_info = 21; - //oneof play_info { - // GadgetCrucibleInfo crucible_info = 21; - //} + //optional GadgetCrucibleInfo crucible_info = 21; + oneof play_info { + GadgetCrucibleInfo crucible_info = 21; + } } \ No newline at end of file diff --git a/proto/GadgetStateNotify.proto b/proto/GadgetStateNotify.proto index bf5e3a4e..3c3c4a64 100644 --- a/proto/GadgetStateNotify.proto +++ b/proto/GadgetStateNotify.proto @@ -2,11 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 5911 -// Version: 4.6.0 -// Obfs: IBPEMCDPBHM +// CmdId: 22100 +// Version: 4.7.0 +// Obfs: DJHFBECHIJK message GadgetStateNotify { - uint32 gadget_entity_id = 5; - uint32 gadget_state = 8; - bool is_enable_interact = 15; + uint32 gadget_entity_id = 12; + uint32 gadget_state = 15; + bool is_enable_interact = 14; } \ No newline at end of file diff --git a/proto/GetWidgetSlotReq.proto b/proto/GetWidgetSlotReq.proto index 7ef344c6..38a95fb6 100644 --- a/proto/GetWidgetSlotReq.proto +++ b/proto/GetWidgetSlotReq.proto @@ -1,22 +1,7 @@ -// 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: 24304 -// Obf: BCJMLGNMNHC +// 4.7.0 +// CmdId: 21085 ? +// Obf: LNKPLMHMKAP message GetWidgetSlotReq { } diff --git a/proto/GetWidgetSlotRsp.proto b/proto/GetWidgetSlotRsp.proto index 9b92f5ae..6fd0d59a 100644 --- a/proto/GetWidgetSlotRsp.proto +++ b/proto/GetWidgetSlotRsp.proto @@ -1,25 +1,10 @@ -// 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 "WidgetSlotData.proto"; -// CmdId: 28535 -// Obf: GGCAFNBKPHG +// 4.7.0 +// CmdId: 5626 +// Obf: AKECNEMFPMJ message GetWidgetSlotRsp { - repeated WidgetSlotData slot_list = 7; - int32 retcode = 4; + repeated WidgetSlotData slot_list = 2; + int32 retcode = 14; } diff --git a/proto/GivingRecord.proto b/proto/GivingRecord.proto index 33fa374d..39f371d7 100644 --- a/proto/GivingRecord.proto +++ b/proto/GivingRecord.proto @@ -1,28 +1,13 @@ -// 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: JNJOKGNEKIK +// 4.7.0 +// Obf: CEIPLLACIIJ message GivingRecord { uint32 config_id = 2; - bool is_gadget_giving = 15; - uint32 last_group_id = 14; - uint32 giving_id = 3; - bool is_finished = 6; - map material_cnt_map = 4; - uint32 group_id = 5; + bool is_gadget_giving = 3; + uint32 last_group_id = 10; + uint32 giving_id = 5; + bool is_finished = 8; + map material_cnt_map = 7; + uint32 group_id = 9; } diff --git a/proto/GivingRecordChangeNotify.proto b/proto/GivingRecordChangeNotify.proto index aed447da..2c1a57ed 100644 --- a/proto/GivingRecordChangeNotify.proto +++ b/proto/GivingRecordChangeNotify.proto @@ -1,25 +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"; import "GivingRecord.proto"; -// CmdId: 20863 -// Obf: EFABNIELGHL +// CmdId: 3907 +// Obf: EEGMCPEPNHD message GivingRecordChangeNotify { - GivingRecord giving_record = 9; - bool is_deactive = 6; + GivingRecord giving_record = 13; + bool is_deactive = 5; } diff --git a/proto/GivingRecordNotify.proto b/proto/GivingRecordNotify.proto index 7957652b..5791ac49 100644 --- a/proto/GivingRecordNotify.proto +++ b/proto/GivingRecordNotify.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"; import "GivingRecord.proto"; -// CmdId: 7258 -// Obf: DPEHMENOLIB +// 4.7.0 +// CmdId: 5883 +// Obf: PPBNEEDPIFD message GivingRecordNotify { - repeated GivingRecord giving_record_list = 4; + repeated GivingRecord giving_record_list = 1; } diff --git a/proto/LuaSetOptionNotify.proto b/proto/LuaSetOptionNotify.proto index 6d0e1ed0..5b518c9b 100644 --- a/proto/LuaSetOptionNotify.proto +++ b/proto/LuaSetOptionNotify.proto @@ -1,14 +1,15 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// 4.6.0 -// CmdId: 850 +// 4.7.0 +// CmdId: 29667 +// AANFGCDEDGI message LuaSetOptionNotify { enum LuaOptionType { LUA_OPTION_NONE = 0; LUA_OPTION_PLAYER_INPUT = 1; } - LuaOptionType option_type = 9; - string lua_set_param = 15; + LuaOptionType option_type = 1; + string lua_set_param = 9; } \ No newline at end of file diff --git a/proto/LunchBoxData.proto b/proto/LunchBoxData.proto index 09bc87f0..aff78a56 100644 --- a/proto/LunchBoxData.proto +++ b/proto/LunchBoxData.proto @@ -1,22 +1,7 @@ -// 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: NKDOHGNGCLG +// 4.7.0 +// Obf: FFDHGEAEOND message LunchBoxData { - map slot_material_map = 10; + map slot_material_map = 5; } diff --git a/proto/MassiveEntityElementOpBatchNotify.proto b/proto/MassiveEntityElementOpBatchNotify.proto index 24724e26..c420e95c 100644 --- a/proto/MassiveEntityElementOpBatchNotify.proto +++ b/proto/MassiveEntityElementOpBatchNotify.proto @@ -3,19 +3,19 @@ option java_package = "emu.grasscutter.net.proto"; import "ShapeSphere.proto"; import "ShapeBox.proto"; - -//obf: JHFHDMCIFPP -// CmdId: 9010 +// 4.7.0 +//obf: IHJGCPGECHK +// CmdId: 25032 message MassiveEntityElementOpBatchNotify { - int32 NOMMJMBBCGJ = 3; - uint32 op_idx = 8; - uint32 user_id = 9; - uint32 attacker_id = 11; - int32 entity_type = 12; - float attack_element_durability = 13; - int32 DDPJBEMDEEM = 14; + //int32 NOMMJMBBCGJ = 3; + uint32 op_idx = 12; + uint32 user_id = 7; + uint32 attacker_id = 2; // TODO: or defense_id? + int32 entity_type = 3; + float attack_element_durability = 6; + //int32 DDPJBEMDEEM = 14; oneof shape { - ShapeSphere shape_sphere = 6; - ShapeBox shape_box = 1; + ShapeSphere shape_sphere = 4; + ShapeBox shape_box = 8; } } diff --git a/proto/OneoffGatherPointDetectorData.proto b/proto/OneoffGatherPointDetectorData.proto index 16eeb9c4..a8e2c420 100644 --- a/proto/OneoffGatherPointDetectorData.proto +++ b/proto/OneoffGatherPointDetectorData.proto @@ -1,30 +1,15 @@ -// 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: OAJJEFFIDPJ +// 4.7.0 +// Obf: JBLBNFJPLEJ message OneoffGatherPointDetectorData { - uint32 config_id = 7; - bool is_hint_valid = 10; - Vector hint_center_pos = 1; - uint32 hint_radius = 8; - uint32 material_id = 9; - uint32 group_id = 11; - uint32 HJMMAOMEHOL = 15; - bool is_all_collected = 6; + uint32 config_id = 11; + bool is_hint_valid = 8; + Vector hint_center_pos = 4; + uint32 hint_radius = 1; // 6 + uint32 material_id = 2; + uint32 group_id = 7; + //uint32 HJMMAOMEHOL = 15; + bool is_all_collected = 13; } diff --git a/proto/PlayerQuitDungeonRsp.proto b/proto/PlayerQuitDungeonRsp.proto index 0802fdc2..8ae69155 100644 --- a/proto/PlayerQuitDungeonRsp.proto +++ b/proto/PlayerQuitDungeonRsp.proto @@ -2,9 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// 4.6.0 -// CmdId: 26503 +// 4.7.0 +// CmdId: 29245 +// KKHLCFKDFCF message PlayerQuitDungeonRsp { - int32 retcode = 7; - uint32 point_id = 15; + int32 retcode = 12; + uint32 point_id = 4; } \ No newline at end of file diff --git a/proto/PlayerRTTInfo.proto b/proto/PlayerRTTInfo.proto index 80d1c260..46cd22b5 100644 --- a/proto/PlayerRTTInfo.proto +++ b/proto/PlayerRTTInfo.proto @@ -1,23 +1,7 @@ -// 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: MCDPPKMOEJJ +// Obf: OFNLJENLFEI or CLCNPLICMHJ or PDIGGOLMBHL? or BLDOGODKOHP? or ENGNHOIABCL(lock) message PlayerRTTInfo { - uint32 rtt = 2; - uint32 uid = 1; + uint32 rtt = 4; + uint32 uid = 10; } diff --git a/proto/QueryCodexMonsterBeKilledNumReq.proto b/proto/QueryCodexMonsterBeKilledNumReq.proto index 29993a6d..1a2c10df 100644 --- a/proto/QueryCodexMonsterBeKilledNumReq.proto +++ b/proto/QueryCodexMonsterBeKilledNumReq.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"; -// CmdId: 24690 -// Obf: NACEJFMBMNI +// 4.7.0 +// CmdId: 21437 +// Obf: GMFOBFGAGCF message QueryCodexMonsterBeKilledNumReq { - repeated uint32 codex_id_list = 14; + repeated uint32 codex_id_list = 15; } diff --git a/proto/QueryCodexMonsterBeKilledNumRsp.proto b/proto/QueryCodexMonsterBeKilledNumRsp.proto index b0a86558..a64da40e 100644 --- a/proto/QueryCodexMonsterBeKilledNumRsp.proto +++ b/proto/QueryCodexMonsterBeKilledNumRsp.proto @@ -1,26 +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"; -// CmdId: 9121 -// Obf: FADBFEMALBF +// 4.7.0 +// CmdId: 28880 +// Obf: IKKNPDPEIHL message QueryCodexMonsterBeKilledNumRsp { - repeated uint32 be_killed_num_list = 12; - repeated uint32 be_captured_num_list = 8; - int32 retcode = 15; - repeated uint32 codex_id_list = 5; + repeated uint32 be_killed_num_list = 13; // sus + repeated uint32 be_captured_num_list = 14; // sus + int32 retcode = 5; + repeated uint32 codex_id_list = 15; } diff --git a/proto/QuestCreateEntityReq.proto b/proto/QuestCreateEntityReq.proto index e65e1eeb..75783eba 100644 --- a/proto/QuestCreateEntityReq.proto +++ b/proto/QuestCreateEntityReq.proto @@ -1,27 +1,12 @@ -// 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 "CreateEntityInfo.proto"; -// CmdId: 8019 -// Obf: DEHBJMMBJOK +// 4.7.0 +// CmdId: 28703 +// Obf: ? message QuestCreateEntityReq { - uint32 quest_id = 3; - uint32 parent_quest_id = 10; - bool is_rewind = 7; - CreateEntityInfo entity = 4; + uint32 quest_id = 2; + uint32 parent_quest_id = 15; + bool is_rewind = 5; + CreateEntityInfo entity = 14; } diff --git a/proto/QuestCreateEntityRsp.proto b/proto/QuestCreateEntityRsp.proto index b3203d64..88b031b0 100644 --- a/proto/QuestCreateEntityRsp.proto +++ b/proto/QuestCreateEntityRsp.proto @@ -1,29 +1,14 @@ -// 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 "CreateEntityInfo.proto"; -// CmdId: 4869 -// Obf: CPPCDDEOKGP +// 4.7.0 +// CmdId: 9887 +// Obf: GLKGMGAKGDD ? message QuestCreateEntityRsp { - uint32 entity_id = 8; - uint32 quest_id = 12; - bool is_rewind = 7; - uint32 parent_quest_id = 11; - int32 retcode = 15; - CreateEntityInfo entity = 9; + uint32 entity_id = 14; + uint32 quest_id = 7; + bool is_rewind = 8; + uint32 parent_quest_id = 12; + int32 retcode = 2; + CreateEntityInfo entity = 6; } diff --git a/proto/QuestDelNotify.proto b/proto/QuestDelNotify.proto index 2b281410..cf3b1466 100644 --- a/proto/QuestDelNotify.proto +++ b/proto/QuestDelNotify.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"; -// CmdId: 29185 -// Obf: JJCKCDINJAJ +// 4.7.0 +// CmdId: 21870 or 9734(?) or +// Obf: LCNFPGBNBFP message QuestDelNotify { - uint32 quest_id = 9; + uint32 quest_id = 8; } diff --git a/proto/QuickUseWidgetRsp.proto b/proto/QuickUseWidgetRsp.proto index 689cab5d..b4865523 100644 --- a/proto/QuickUseWidgetRsp.proto +++ b/proto/QuickUseWidgetRsp.proto @@ -1,32 +1,17 @@ -// 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 "OneoffGatherPointDetectorData.proto"; import "ClientCollectorData.proto"; import "SkyCrystalDetectorQuickUseResult.proto"; -// CmdId: 24972 -// Obf: KHPNPEEKKPG +// 4.7.0 +// CmdId: 22155 +// Obf: MIMKEJBMGGH message QuickUseWidgetRsp { - int32 retcode = 11; - uint32 material_id = 6; + int32 retcode = 3; + uint32 material_id = 10; oneof param { - OneoffGatherPointDetectorData detector_data = 5; - ClientCollectorData client_collector_data = 15; - SkyCrystalDetectorQuickUseResult sky_crystal_detector_quick_use_result = 207137; + OneoffGatherPointDetectorData detector_data = 7; + ClientCollectorData client_collector_data = 14; + SkyCrystalDetectorQuickUseResult sky_crystal_detector_quick_use_result = 207036; } } diff --git a/proto/SceneEntityAppearNotify.proto b/proto/SceneEntityAppearNotify.proto index 3fbbbaf7..54ba948f 100644 --- a/proto/SceneEntityAppearNotify.proto +++ b/proto/SceneEntityAppearNotify.proto @@ -5,6 +5,8 @@ import "SceneEntityInfo.proto"; import "VisionType.proto"; // 4.7.0 +// cmdid: 21463? or 24635a or 27183u +// EIIOKNPBJGC or message SceneEntityAppearNotify { repeated SceneEntityInfo entity_list = 13; VisionType appear_type = 10; diff --git a/proto/SceneEntityUpdateNotify.proto b/proto/SceneEntityUpdateNotify.proto index 7164ea0b..155afabd 100644 --- a/proto/SceneEntityUpdateNotify.proto +++ b/proto/SceneEntityUpdateNotify.proto @@ -3,8 +3,8 @@ option java_package = "emu.grasscutter.net.proto"; import "SceneEntityInfo.proto"; import "VisionType.proto"; // 4.7.0 -// cmdid: 27183 -// AMPAJBECEIJ +// cmdid: 27183 or 21463 +// AMPAJBECEIJ or EIIOKNPBJGC message SceneEntityUpdateNotify { repeated SceneEntityInfo entity_list = 11; VisionType appear_type = 9; diff --git a/proto/SeeMonsterReq.proto b/proto/SeeMonsterReq.proto index 357ca1ab..7394b64e 100644 --- a/proto/SeeMonsterReq.proto +++ b/proto/SeeMonsterReq.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"; -// CmdId: 20750 -// Obf: ALGLKMMKJII +// 4.7.0 +// CmdId: 25646 +// Obf: CAEIBHNMIJG message SeeMonsterReq { - uint32 monster_id = 2; + uint32 monster_id = 13; } diff --git a/proto/ServerCondMeetQuestListUpdateNotify.proto b/proto/ServerCondMeetQuestListUpdateNotify.proto index ae199644..294484a4 100644 --- a/proto/ServerCondMeetQuestListUpdateNotify.proto +++ b/proto/ServerCondMeetQuestListUpdateNotify.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: 29009 -// Obf: LCFLOBOJAPC +// 4.7.0 +// CmdId: 28936 or 8955 or 25746(?) or 26221 or 190 or 9044 +// Obf: BJDHFGACHAD ? message ServerCondMeetQuestListUpdateNotify { - repeated uint32 del_quest_id_list = 6; - repeated uint32 add_quest_id_list = 9; + repeated uint32 del_quest_id_list = 9; + repeated uint32 add_quest_id_list = 10; } diff --git a/proto/ServerLogNotify.proto b/proto/ServerLogNotify.proto index 380740d9..f96eb06b 100644 --- a/proto/ServerLogNotify.proto +++ b/proto/ServerLogNotify.proto @@ -4,10 +4,11 @@ option java_package = "emu.grasscutter.net.proto"; import "ServerLogLevel.proto"; import "ServerLogType.proto"; -// 4.6.0 -// CmdId: 24778 +// 4.7.0 +// CmdId: 20727 +// PBFJJLEOJAA message ServerLogNotify { - string server_log = 1; - ServerLogLevel log_level = 8; - ServerLogType log_type = 14; + string server_log = 5; + ServerLogLevel log_level = 10; + ServerLogType log_type = 6; } \ No newline at end of file diff --git a/proto/SetUpLunchBoxWidgetReq.proto b/proto/SetUpLunchBoxWidgetReq.proto index be0dc7e2..570fce51 100644 --- a/proto/SetUpLunchBoxWidgetReq.proto +++ b/proto/SetUpLunchBoxWidgetReq.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"; import "LunchBoxData.proto"; -// CmdId: 20055 -// Obf: GJMHODKMMJN +// 4.7.0 +// CmdId: 24935 +// Obf: BPGHJNABMDN message SetUpLunchBoxWidgetReq { - LunchBoxData lunch_box_data = 9; + LunchBoxData lunch_box_data = 10; } diff --git a/proto/SetUpLunchBoxWidgetRsp.proto b/proto/SetUpLunchBoxWidgetRsp.proto index cb076758..89d3353a 100644 --- a/proto/SetUpLunchBoxWidgetRsp.proto +++ b/proto/SetUpLunchBoxWidgetRsp.proto @@ -1,25 +1,10 @@ -// 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 "LunchBoxData.proto"; -// CmdId: 6360 -// Obf: JHPONNNMJFP +// 4.7.0 +// CmdId: 24393 +// Obf: HALNKMBMLDG message SetUpLunchBoxWidgetRsp { - int32 retcode = 8; - LunchBoxData lunch_box_data = 6; + int32 retcode = 11; + LunchBoxData lunch_box_data = 5; } diff --git a/proto/SetWidgetSlotReq.proto b/proto/SetWidgetSlotReq.proto index a08f947d..85b3bf29 100644 --- a/proto/SetWidgetSlotReq.proto +++ b/proto/SetWidgetSlotReq.proto @@ -8,6 +8,6 @@ import "WidgetSlotOp.proto"; // BLFCJICOGKP message SetWidgetSlotReq { repeated WidgetSlotTag tag_list = 5; - uint32 material_id = 9; - WidgetSlotOp op = 14; + uint32 material_id = 14; + WidgetSlotOp op = 9; } diff --git a/proto/ShapeBox.proto b/proto/ShapeBox.proto index 953d9366..de0eda64 100644 --- a/proto/ShapeBox.proto +++ b/proto/ShapeBox.proto @@ -2,8 +2,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; - -//obf: ACPDAEBLCBA +// 4.7.0 +//obf: IEIAEKDEKPH message ShapeBox { Vector center = 1; Vector axis0 = 2; diff --git a/proto/SkyCrystalDetectorData.proto b/proto/SkyCrystalDetectorData.proto index ad382940..3233c92d 100644 --- a/proto/SkyCrystalDetectorData.proto +++ b/proto/SkyCrystalDetectorData.proto @@ -1,26 +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: CGPNNBOBEKN +// 4.7.0 +// Obf: GCBKNGHNMAF message SkyCrystalDetectorData { - uint32 group_id = 10; - uint32 config_id = 11; - Vector hint_center_pos = 9; - bool is_hint_valid = 2; + uint32 group_id = 7; + uint32 config_id = 4; + Vector hint_center_pos = 2; + bool is_hint_valid = 9; } diff --git a/proto/SkyCrystalDetectorQuickUseResult.proto b/proto/SkyCrystalDetectorQuickUseResult.proto index f3bd4bba..7199af89 100644 --- a/proto/SkyCrystalDetectorQuickUseResult.proto +++ b/proto/SkyCrystalDetectorQuickUseResult.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"; import "SkyCrystalDetectorData.proto"; -// Obf: MDBHGHIINAM +// 4.7.0 +// Obf: LOEMJEIFCPM message SkyCrystalDetectorQuickUseResult { - SkyCrystalDetectorData sky_crystal_detector_data = 2; - int32 retcode = 15; + SkyCrystalDetectorData sky_crystal_detector_data = 4; + int32 retcode = 13; } diff --git a/proto/TakeFurnitureMakeReq.proto b/proto/TakeFurnitureMakeReq.proto index 3f417fad..e38a890c 100644 --- a/proto/TakeFurnitureMakeReq.proto +++ b/proto/TakeFurnitureMakeReq.proto @@ -1,25 +1,10 @@ -// 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: 28389 -// Obf: FCKFFOJJNDH +// 4.7.0 +// CmdId: 7585 +// Obf: KGPNKGFHBNH message TakeFurnitureMakeReq { - uint32 index = 1; - bool is_fast_finish = 7; - uint32 make_id = 13; + uint32 index = 5; + bool is_fast_finish = 11; + uint32 make_id = 10; } diff --git a/proto/TakeFurnitureMakeRsp.proto b/proto/TakeFurnitureMakeRsp.proto index c5491fea..c43ac1ea 100644 --- a/proto/TakeFurnitureMakeRsp.proto +++ b/proto/TakeFurnitureMakeRsp.proto @@ -1,29 +1,14 @@ -// 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 "ItemParam.proto"; import "FurnitureMakeSlot.proto"; -// CmdId: 6814 -// Obf: JHIOLDPMBAC +// 4.7.0 +// CmdId: 28114 +// Obf: DBKEABGBMHN message TakeFurnitureMakeRsp { - repeated ItemParam return_item_list = 4; - FurnitureMakeSlot furniture_make_slot = 3; - repeated ItemParam output_item_list = 6; - uint32 make_id = 13; - int32 retcode = 7; + repeated ItemParam return_item_list = 7; + FurnitureMakeSlot furniture_make_slot = 14; + repeated ItemParam output_item_list = 2; + uint32 make_id = 11; + int32 retcode = 3; } diff --git a/proto/TrifleGadget.proto b/proto/TrifleGadget.proto index b4f2ec7f..7ecee797 100644 --- a/proto/TrifleGadget.proto +++ b/proto/TrifleGadget.proto @@ -6,5 +6,5 @@ import "Item.proto"; // 4.7.0 message TrifleGadget { Item item = 1; - uint32 AOJJLIGMDDP = 2; + //uint32 AOJJLIGMDDP = 2; } \ No newline at end of file diff --git a/proto/TriggerCreateGadgetToEquipPartNotify.proto b/proto/TriggerCreateGadgetToEquipPartNotify.proto index 729d3bd5..54db76d0 100644 --- a/proto/TriggerCreateGadgetToEquipPartNotify.proto +++ b/proto/TriggerCreateGadgetToEquipPartNotify.proto @@ -1,26 +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"; -// CmdId: 3153 -// Obf: HOMMGPCHAMD +// 4.7.0 +// CmdId: 24286 +// Obf: LNGIGBFHNBG message TriggerCreateGadgetToEquipPartNotify { - uint32 entity_id = 2; - uint32 gadget_id = 5; - uint32 gadget_entity_id = 12; - string equip_part = 9; + uint32 entity_id = 7; + uint32 gadget_id = 8; + uint32 gadget_entity_id = 9; + string equip_part = 11; } diff --git a/proto/UnfreezeGroupLimitNotify.proto b/proto/UnfreezeGroupLimitNotify.proto index f1a86f46..501316bb 100644 --- a/proto/UnfreezeGroupLimitNotify.proto +++ b/proto/UnfreezeGroupLimitNotify.proto @@ -2,10 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 1186 -// Version: 4.6.0 -// Obfs: FCHAMHONLJE +// CmdId: 24297 or 28371? +// Version: 4.7.0 +// Obfs: MMPEMIHNEEI message UnfreezeGroupLimitNotify { - uint32 point_id = 5; - uint32 scene_id = 13; + uint32 point_id = 7; + uint32 scene_id = 11; } \ No newline at end of file diff --git a/proto/VehicleInteractRsp.proto b/proto/VehicleInteractRsp.proto index c84fd39f..e43fe58e 100644 --- a/proto/VehicleInteractRsp.proto +++ b/proto/VehicleInteractRsp.proto @@ -1,33 +1,18 @@ -// 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 "VehicleMember.proto"; import "Vector.proto"; import "VehicleInteractType.proto"; -// CmdId: 29349 -// Obf: CFHCGPCDLPA +// 4.7.0 +// CmdId: 27242 +// Obf: ? message VehicleInteractRsp { - int32 retcode = 6; - VehicleMember member = 14; - Vector KKDFCJENDNI = 4; - uint32 entity_id = 5; - VehicleInteractType interact_type = 7; - uint32 gadget_id = 13; - Vector JGOGBMEKOPP = 1; - uint32 CJIMMADJKHD = 10; + int32 retcode = 1; + VehicleMember member = 6; + //Vector KKDFCJENDNI = 4; + uint32 entity_id = 13; + VehicleInteractType interact_type = 5; + uint32 gadget_id = 8; + //Vector JGOGBMEKOPP = 1; + //uint32 CJIMMADJKHD = 10; } diff --git a/proto/VehicleLocationInfo.proto b/proto/VehicleLocationInfo.proto index 67790f0a..30a688f1 100644 --- a/proto/VehicleLocationInfo.proto +++ b/proto/VehicleLocationInfo.proto @@ -4,15 +4,15 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; -// Version: 4.6.0 -// Obfs: HHIDIPNLEIE +// Version: 4.7.0 +// Obfs: ? message VehicleLocationInfo { - uint32 entity_id = 2; - float MKHCMCLJKLN = 5; // seems to be sorush related - float AACAIMICFPI = 6; // seems to be sorush related - uint32 owner_uid = 9; - Vector pos = 11; - repeated uint32 uid_list = 12; - Vector rot = 13; - uint32 gadget_id = 14; + uint32 entity_id = 11; + //float MKHCMCLJKLN = 5; // seems to be sorush related + //float AACAIMICFPI = 6; // seems to be sorush related + uint32 owner_uid = 12; + Vector pos = 8; + repeated uint32 uid_list = 5; + Vector rot = 4; + uint32 gadget_id = 2; } diff --git a/proto/WeatherWizardData.proto b/proto/WeatherWizardData.proto index 39ae29cc..577a5f20 100644 --- a/proto/WeatherWizardData.proto +++ b/proto/WeatherWizardData.proto @@ -1,22 +1,7 @@ -// 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: JLHBJFIOFDB +// 4.7.0 +// Obf: FNAHFDBGHJM message WeatherWizardData { - uint32 shield_value = 2; + uint32 shield_value = 6; } diff --git a/proto/WidgetCoolDownData.proto b/proto/WidgetCoolDownData.proto index dd546182..e04eed20 100644 --- a/proto/WidgetCoolDownData.proto +++ b/proto/WidgetCoolDownData.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"; -// Obf: ANGGPDIPOFF +// 4.7.0 +// Obf: AHMDJOHBEFF ? message WidgetCoolDownData { - uint32 id = 1; + uint32 id = 4; uint64 cool_down_time = 14; - bool is_success = 2; + bool is_success = 10; } diff --git a/proto/WidgetCoolDownNotify.proto b/proto/WidgetCoolDownNotify.proto index 90451d54..9a018267 100644 --- a/proto/WidgetCoolDownNotify.proto +++ b/proto/WidgetCoolDownNotify.proto @@ -1,25 +1,10 @@ -// 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 "WidgetCoolDownData.proto"; -// CmdId: 27222 -// Obf: ANFHONAFACH +// 4.7.0 +// CmdId: 29375 +// Obf: KPLBJBAFPBG message WidgetCoolDownNotify { - repeated WidgetCoolDownData group_cool_down_data_list = 7; - repeated WidgetCoolDownData normal_cool_down_data_list = 10; + repeated WidgetCoolDownData group_cool_down_data_list = 10; + repeated WidgetCoolDownData normal_cool_down_data_list = 8; } diff --git a/proto/WidgetCreateLocationInfo.proto b/proto/WidgetCreateLocationInfo.proto index 66cdb538..ec8e19d7 100644 --- a/proto/WidgetCreateLocationInfo.proto +++ b/proto/WidgetCreateLocationInfo.proto @@ -1,24 +1,10 @@ -// 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: EABFEFDDFEJ +// 4.7.0 +// Obf: PBAOGDGPBGJ message WidgetCreateLocationInfo { - Vector rot = 3; - Vector pos = 6; + Vector rot = 15; + Vector pos = 13; + // TODO: some rot and pos switched } diff --git a/proto/WidgetCreatorInfo.proto b/proto/WidgetCreatorInfo.proto index da19ebdb..db110e68 100644 --- a/proto/WidgetCreatorInfo.proto +++ b/proto/WidgetCreatorInfo.proto @@ -1,26 +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 "WidgetCreatorOpType.proto"; import "WidgetCreateLocationInfo.proto"; -// Obf: CNHLLOFHJEA +// 4.7.0 +// Obf: IGAMKCLFACP message WidgetCreatorInfo { uint32 entity_id = 15; - WidgetCreatorOpType op_type = 9; - WidgetCreateLocationInfo location_info = 5; + WidgetCreatorOpType op_type = 8; + WidgetCreateLocationInfo location_info = 4; } diff --git a/proto/WidgetCreatorOpType.proto b/proto/WidgetCreatorOpType.proto index 596a0100..8df95394 100644 --- a/proto/WidgetCreatorOpType.proto +++ b/proto/WidgetCreatorOpType.proto @@ -1,22 +1,7 @@ -// 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: GCEFDCIHAKA +// 4.7.0 +// Obf: FLOIKBKAJEM enum WidgetCreatorOpType { WIDGET_CREATOR_TYPE_NONE = 0; WIDGET_CREATOR_TYPE_RETRACT = 1; diff --git a/proto/WidgetDoBagReq.proto b/proto/WidgetDoBagReq.proto index 00229d3f..ec6bdbd4 100644 --- a/proto/WidgetDoBagReq.proto +++ b/proto/WidgetDoBagReq.proto @@ -1,29 +1,14 @@ -// 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 "WidgetCreateLocationInfo.proto"; import "WidgetCreatorInfo.proto"; -// CmdId: 2739 -// Obf: KFDNMJHKFAA +// 4.7.0 +// CmdId: 8213 +// Obf: LPCCGGKDGML message WidgetDoBagReq { - uint32 material_id = 15; + uint32 material_id = 2; oneof op_info { - WidgetCreateLocationInfo location_info = 2046; - WidgetCreatorInfo widget_creator_info = 1156; + WidgetCreateLocationInfo location_info = 1448; + WidgetCreatorInfo widget_creator_info = 1848; } } diff --git a/proto/WidgetDoBagRsp.proto b/proto/WidgetDoBagRsp.proto index 1836fbba..6dbeb520 100644 --- a/proto/WidgetDoBagRsp.proto +++ b/proto/WidgetDoBagRsp.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: 8212 -// Obf: PIDNCNBIGBN +// 4.7.0 +// CmdId: 2951x or 21671 or 1415 or 7840? +// Obf: GKMOAEBHCLB message WidgetDoBagRsp { - uint32 material_id = 15; - int32 retcode = 4; + uint32 material_id = 6; + int32 retcode = 14; } diff --git a/proto/WidgetGadgetAllDataNotify.proto b/proto/WidgetGadgetAllDataNotify.proto index e189fcf6..fe9a79d2 100644 --- a/proto/WidgetGadgetAllDataNotify.proto +++ b/proto/WidgetGadgetAllDataNotify.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"; import "WidgetGadgetData.proto"; -// CmdId: 6076 -// Obf: GBEAGNDJKEC +// 4.7.0 +// CmdId: 6291 +// Obf: GKCKKCHHINC message WidgetGadgetAllDataNotify { - repeated WidgetGadgetData widget_gadget_data = 15; + repeated WidgetGadgetData widget_gadget_data = 10; } diff --git a/proto/WidgetGadgetData.proto b/proto/WidgetGadgetData.proto index a3bd5f3c..b7a47c16 100644 --- a/proto/WidgetGadgetData.proto +++ b/proto/WidgetGadgetData.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: ENKCILBBOJN +// 4.7.0 +// Obf: NJMDFFKJKJK message WidgetGadgetData { - repeated uint32 gadget_entity_id_list = 4; - uint32 gadget_id = 3; + repeated uint32 gadget_entity_id_list = 9; + uint32 gadget_id = 10; } diff --git a/proto/WidgetGadgetDataNotify.proto b/proto/WidgetGadgetDataNotify.proto index fcf4c2ae..782946cf 100644 --- a/proto/WidgetGadgetDataNotify.proto +++ b/proto/WidgetGadgetDataNotify.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"; import "WidgetGadgetData.proto"; -// CmdId: 4861 +// 4.7.0 +// CmdId: 9673 // Obf: HCNKGFAPJNC message WidgetGadgetDataNotify { WidgetGadgetData widget_gadget_data = 3; diff --git a/proto/WidgetSlotChangeNotify.proto b/proto/WidgetSlotChangeNotify.proto index 6c283dfb..1a317e2b 100644 --- a/proto/WidgetSlotChangeNotify.proto +++ b/proto/WidgetSlotChangeNotify.proto @@ -1,26 +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 "WidgetSlotData.proto"; import "WidgetSlotOp.proto"; -// CmdId: 26889 -// Obf: GMLDKFNJJCH +// 4.7.0 +// CmdId: 25904 +// Obf: IPDKAOIFKPO message WidgetSlotChangeNotify { - WidgetSlotData slot = 9; - WidgetSlotOp op = 1; + WidgetSlotData slot = 2; + WidgetSlotOp op = 7; } diff --git a/proto/WidgetSlotOp.proto b/proto/WidgetSlotOp.proto index 12b3771c..a58f5764 100644 --- a/proto/WidgetSlotOp.proto +++ b/proto/WidgetSlotOp.proto @@ -1,22 +1,7 @@ -// 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: DPNIPOMNPFI +// 4.7.0 +// Obf: IHPLLJMLPGK enum WidgetSlotOp { WIDGET_SLOT_OP_ATTACH = 0; WIDGET_SLOT_OP_DETACH = 1; diff --git a/proto/WorktopOptionNotify.proto b/proto/WorktopOptionNotify.proto index db00d3f5..2f261238 100644 --- a/proto/WorktopOptionNotify.proto +++ b/proto/WorktopOptionNotify.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: 925 -// Obf: AMKENHADEJN +// 4.7.0 +// CmdId: 5012 +// Obf: GKAGPMCEONE message WorktopOptionNotify { - repeated uint32 option_list = 7; - uint32 gadget_entity_id = 3; + repeated uint32 option_list = 11; + uint32 gadget_entity_id = 6; } diff --git a/proto/WorldChestOpenNotify.proto b/proto/WorldChestOpenNotify.proto index 2075e7c4..2224e271 100644 --- a/proto/WorldChestOpenNotify.proto +++ b/proto/WorldChestOpenNotify.proto @@ -2,11 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 8271 -// Version: 4.6.0 -// Obfs: GNFPLKIBPKM +// CmdId: 22669 ? +// Version: 4.7.0 +// Obfs: HECPBJNCDBF message WorldChestOpenNotify { - uint32 scene_id = 5; - uint32 group_id = 9; - uint32 config_id = 13; + uint32 scene_id = 9; + uint32 group_id = 10; + uint32 config_id = 3; } \ No newline at end of file diff --git a/proto/WorldPlayerRTTNotify.proto b/proto/WorldPlayerRTTNotify.proto index 74a72e5a..0fd76ad5 100644 --- a/proto/WorldPlayerRTTNotify.proto +++ b/proto/WorldPlayerRTTNotify.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"; import "PlayerRTTInfo.proto"; -// CmdId: 421 -// Obf: JNKBKEOBKGL +// 4.7.0 +// CmdId: 2845 +// Obf: GJGJELJLOBI message WorldPlayerRTTNotify { - repeated PlayerRTTInfo player_rtt_list = 6; + repeated PlayerRTTInfo player_rtt_list = 4; }