diff --git a/PacketOpcodes.java b/PacketOpcodes.java index 0b017f86..24ff4b34 100644 --- a/PacketOpcodes.java +++ b/PacketOpcodes.java @@ -1415,7 +1415,7 @@ public class PacketOpcodes { public static final int TowerFloorRecordChangeNotify = 2496; public static final int TowerGetFloorStarRewardReq = 2424; public static final int TowerGetFloorStarRewardRsp = 2431; - public static final int TowerLevelEndNotify = 2481; + public static final int TowerLevelEndNotify = 2466; public static final int TowerLevelStarCondNotify = 2443; public static final int TowerMiddleLevelChangeTeamNotify = 2403; public static final int TowerRecordHandbookReq = 2442; @@ -1433,7 +1433,7 @@ public class PacketOpcodes { public static final int TreasureMapPreTaskDoneNotify = 2196; public static final int TreasureMapRegionActiveNotify = 2065; public static final int TreasureMapRegionInfoNotify = 2034; - public static final int TrialAvatarFirstPassDungeonNotify = 2089; + public static final int TrialAvatarFirstPassDungeonNotify = 2005; public static final int TrialAvatarInDungeonIndexNotify = 2121; public static final int TriggerCreateGadgetToEquipPartNotify = 342; public static final int TriggerRoguelikeCurseNotify = 8958; @@ -1903,9 +1903,9 @@ public class PacketOpcodes { public static final int WidgetSlotChangeNotify = 4296; public static final int WidgetUseAttachAbilityGroupChangeNotify = 4261; public static final int WindSeedClientNotify = 1130; - public static final int WindSeedType1Notify = 23435; - public static final int WindSeedType2Notify = 24656; - public static final int WindSeedType3Notify = 22438; + public static final int WindSeedType1Notify = 23131; + public static final int WindSeedType2Notify = 23432; + public static final int WindSeedType3Notify = 24948; public static final int WorktopOptionNotify = 872; public static final int WorldAllRoutineTypeNotify = 3508; public static final int WorldDataNotify = 3465; @@ -1921,6 +1921,6 @@ public class PacketOpcodes { public static final int WorldRoutineChangeNotify = 3521; public static final int WorldRoutineTypeCloseNotify = 3526; public static final int WorldRoutineTypeRefreshNotify = 3537; - public static final int SkipPlayerGameTimeReq = 123; - public static final int SkipPlayerGameTimeRsp = 130; + public static final int SkipPlayerGameTimeReq = 165; + public static final int SkipPlayerGameTimeRsp = 129; } diff --git a/cmdid.json b/cmdid.json index c59d8f7a..a3c86cbd 100644 --- a/cmdid.json +++ b/cmdid.json @@ -204,7 +204,7 @@ "id": 128 }, { - "name": "MJEGBKCMNIE", + "name": "SkipPlayerGameTimeRsp", "id": 129 }, { @@ -340,7 +340,7 @@ "id": 164 }, { - "name": "CLJNJBDHDEN", + "name": "SkipPlayerGameTimeReq", "id": 165 }, { @@ -2844,7 +2844,7 @@ "id": 2004 }, { - "name": "ACMPPBHOFEN", + "name": "TrialAvatarFirstPassDungeonNotify", "id": 2005 }, { @@ -3492,7 +3492,7 @@ "id": 2464 }, { - "name": "ACPJMJPFENC", + "name": "TowerLevelEndNotify", "id": 2466 }, { @@ -4928,7 +4928,7 @@ "id": 4508 }, { - "name": "ACNCCGPBILN", + "name": "HomeSaveArrangementNoChangeRsp", "id": 4509 }, { @@ -5196,7 +5196,7 @@ "id": 4707 }, { - "name": "JEDIGELMJCL", + "name": "HomeSaveArrangementNoChangeReq", "id": 4718 }, { @@ -6584,11 +6584,11 @@ "id": 6546 }, { - "name": "LBILBIGNGPH", + "name": "LanV3BoatSettleNotify", "id": 6554 }, { - "name": "JLKGIJBKOEI", + "name": "GCGLevelChallengeDeleteNotify", "id": 7014 }, { @@ -6596,7 +6596,7 @@ "id": 7015 }, { - "name": "DCJMMAFGEFD", + "name": "GCGSkillPreviewAskRsp", "id": 7017 }, { @@ -6612,7 +6612,7 @@ "id": 7058 }, { - "name": "DFHFNGDMLCA", + "name": "GCGDSDeckSaveRsp", "id": 7071 }, { @@ -6620,7 +6620,7 @@ "id": 7092 }, { - "name": "DOLLCIEKMJI", + "name": "GCGWorldPlayerGCGStateRsp", "id": 7093 }, { @@ -6628,7 +6628,7 @@ "id": 7097 }, { - "name": "BNGAGMGNFAF", + "name": "GCGBossChallengeUpdateNotify", "id": 7099 }, { @@ -6636,11 +6636,11 @@ "id": 7104 }, { - "name": "BPAKPFAPKMD", + "name": "GCGMessagePackNotify", "id": 7112 }, { - "name": "JFFHJBPBMAL", + "name": "GCGGrowthLevelRewardNotify", "id": 7128 }, { @@ -6648,11 +6648,11 @@ "id": 7137 }, { - "name": "CNICBHJMBGH", + "name": "GCGDSChangeFieldRsp", "id": 7141 }, { - "name": "CHEOBKOCNAJ", + "name": "GCGInitFinishRsp", "id": 7152 }, { @@ -6660,23 +6660,23 @@ "id": 7158 }, { - "name": "AAEFHPMFMGF", + "name": "GCGDebugReplayNotify", "id": 7160 }, { - "name": "LDBNFKGJEIL", + "name": "GCGDSBanCardNotify", "id": 7168 }, { - "name": "JCGFAKDDGJK", + "name": "GCGWorldChallengeUnlockNotify", "id": 7184 }, { - "name": "EGKKGDBOEAP", + "name": "GCGSkillPreviewAskReq", "id": 7193 }, { - "name": "LGEBINHGCCF", + "name": "GCGTCTavernInfoNotify", "id": 7194 }, { @@ -6692,7 +6692,7 @@ "id": 7201 }, { - "name": "DCGKGHOFDMC", + "name": "GCGLevelChallengeFinishNotify", "id": 7207 }, { @@ -6704,11 +6704,11 @@ "id": 7216 }, { - "name": "OLFMBLLJPJJ", + "name": "GCGAskDuelReq", "id": 7230 }, { - "name": "IHOMGBKHOOD", + "name": "GCGDSChangeCurDeckRsp", "id": 7245 }, { @@ -6728,27 +6728,27 @@ "id": 7275 }, { - "name": "PCCJGEGIPDN", + "name": "GCGBackToDuelRsp", "id": 7285 }, { - "name": "GNKKEOBHHDP", + "name": "GCGDSChangeCurDeckReq", "id": 7299 }, { - "name": "NLODGPMIPPA", + "name": "GCGBackToDuelReq", "id": 7300 }, { - "name": "HJKOHPKBMCO", + "name": "GCGDSChangeCardBackReq", "id": 7303 }, { - "name": "CAIHDEJCPHL", + "name": "GCGDSDeckUpdateNotify", "id": 7317 }, { - "name": "MJDLKAIIMNM", + "name": "GCGDSChangeFieldReq", "id": 7321 }, { @@ -6756,15 +6756,15 @@ "id": 7335 }, { - "name": "PPGHMAMMLHN", + "name": "GCGStartChallengeRsp", "id": 7358 }, { - "name": "MHAEEPPGNLN", + "name": "GCGSettleNotify", "id": 7359 }, { - "name": "CAMBLPFGINK", + "name": "GCGTCInviteRsp", "id": 7364 }, { @@ -6772,15 +6772,15 @@ "id": 7366 }, { - "name": "GDGMONKKMCC", + "name": "GCGSettleOptionReq", "id": 7370 }, { - "name": "HHPIKGHBMEC", + "name": "GCGDSDeckUnlockNotify", "id": 7385 }, { - "name": "FDLEMHPMKCF", + "name": "GCGDSChangeDeckNameRsp", "id": 7411 }, { @@ -6788,7 +6788,7 @@ "id": 7416 }, { - "name": "AJDKPAPGPMB", + "name": "GCGWorldPlayerGCGStateReq", "id": 7421 }, { @@ -6800,7 +6800,7 @@ "id": 7426 }, { - "name": "EOFJNHHLIPK", + "name": "GCGDSDataNotify", "id": 7427 }, { @@ -6812,15 +6812,15 @@ "id": 7433 }, { - "name": "LNDFIODJJAK", + "name": "GCGGrowthLevelTakeRewardRsp", "id": 7443 }, { - "name": "EPNLBMDEFLC", + "name": "GCGTCInviteReq", "id": 7449 }, { - "name": "EOLPOJJCOII", + "name": "GCGChallengeUpdateNotify", "id": 7450 }, { @@ -6828,15 +6828,15 @@ "id": 7458 }, { - "name": "NGGCCHMAKHA", + "name": "GCGInviteGuestBattleReq", "id": 7467 }, { - "name": "IOBIPFCILJM", + "name": "GCGTavernNpcInfoNotify", "id": 7468 }, { - "name": "IAHHCOJOHNK", + "name": "GCGDSChangeCardBackRsp", "id": 7490 }, { @@ -6844,7 +6844,7 @@ "id": 7493 }, { - "name": "JHFBIOPAOLG", + "name": "GCGDSDeleteDeckRsp", "id": 7496 }, { @@ -6852,15 +6852,15 @@ "id": 7501 }, { - "name": "FJBOGLHIKLG", + "name": "GCGGameBriefDataNotify", "id": 7506 }, { - "name": "CBOGDEPDNHD", + "name": "GCGBasicDataNotify", "id": 7514 }, { - "name": "KBFCIGIEFLK", + "name": "GCGSkillPreviewNotify", "id": 7519 }, { @@ -6868,7 +6868,7 @@ "id": 7529 }, { - "name": "CLOJNHDBJAP", + "name": "GCGDSChangeCardFaceReq", "id": 7536 }, { @@ -6880,11 +6880,11 @@ "id": 7544 }, { - "name": "PKNJCAHHIBL", + "name": "GCGDSCardFaceUpdateNotify", "id": 7557 }, { - "name": "AOMFGHHCOLO", + "name": "GCGDSCurDeckChangeNotify", "id": 7563 }, { @@ -6896,19 +6896,19 @@ "id": 7571 }, { - "name": "HPEIOOKKAHD", + "name": "GCGDSDeleteDeckReq", "id": 7576 }, { - "name": "IOAEPMIGNBO", + "name": "GCGStartChallengeReq", "id": 7584 }, { - "name": "LEEIALLHGNP", + "name": "GCGGrowthLevelTakeRewardReq", "id": 7586 }, { - "name": "MCPMKDKOMMJ", + "name": "GCGWeekChallengeInfoNotify", "id": 7592 }, { @@ -6916,7 +6916,7 @@ "id": 7596 }, { - "name": "FKCLECCFIKJ", + "name": "GCGLevelChallengeNotify", "id": 7616 }, { @@ -6928,19 +6928,19 @@ "id": 7635 }, { - "name": "AAFNJHFALBA", + "name": "GCGInitFinishReq", "id": 7642 }, { - "name": "JCGBJLLGAEF", + "name": "GCGGameCreateFailReasonNotify", "id": 7645 }, { - "name": "IEHCEMKOPCF", + "name": "GCGAskDuelRsp", "id": 7659 }, { - "name": "IJPKGNKGLLB", + "name": "GCGGameMaxNotify", "id": 7665 }, { @@ -6948,15 +6948,15 @@ "id": 7668 }, { - "name": "IDMBCPPJCFL", + "name": "GCGOperationReq", "id": 7674 }, { - "name": "HKDOBJEEIFB", + "name": "GCGOperationRsp", "id": 7697 }, { - "name": "MPAGMBABPFH", + "name": "GCGStartChallengeByCheckRewardRsp", "id": 7702 }, { @@ -6976,11 +6976,11 @@ "id": 7769 }, { - "name": "NKEGILJDAKE", + "name": "GCGDSCardProficiencyNotify", "id": 7774 }, { - "name": "LLKPACFPMLG", + "name": "GCGTCTavernChallengeDataNotify", "id": 7777 }, { @@ -6992,19 +6992,19 @@ "id": 7788 }, { - "name": "CEBBCAEOLJO", + "name": "GCGDSCardFaceUnlockNotify", "id": 7789 }, { - "name": "IJMBPIHHMFM", + "name": "GCGClientSettleReq", "id": 7796 }, { - "name": "FDJHIDDJHEO", + "name": "GCGInviteBattleNotify", "id": 7803 }, { - "name": "IIMEOILCLMG", + "name": "GCGHeartBeatNotify", "id": 7807 }, { @@ -7012,7 +7012,7 @@ "id": 7833 }, { - "name": "PDIGPHKJHIC", + "name": "GCGDSFieldUnlockNotify", "id": 7845 }, { @@ -7024,11 +7024,11 @@ "id": 7859 }, { - "name": "JJOMMBPKJCM", + "name": "GCGDSCardBackUnlockNotify", "id": 7873 }, { - "name": "OEOMDOMDHLA", + "name": "GCGInviteGuestBattleRsp", "id": 7906 }, { @@ -7036,7 +7036,7 @@ "id": 7908 }, { - "name": "DKMFMOMOHIM", + "name": "GCGStartChallengeByCheckRewardReq", "id": 7916 }, { @@ -7048,7 +7048,7 @@ "id": 7923 }, { - "name": "NFAMOMHMIJH", + "name": "GCGDSChangeDeckNameReq", "id": 7928 }, { @@ -7068,11 +7068,11 @@ "id": 7956 }, { - "name": "IKCDLHONJEL", + "name": "GCGResourceStateNotify", "id": 7970 }, { - "name": "BPPMNLFJGBJ", + "name": "GCGTCTavernChallengeUpdateNotify", "id": 7976 }, { @@ -7080,7 +7080,7 @@ "id": 7995 }, { - "name": "FNGHOONFNDP", + "name": "GCGDSDeckSaveReq", "id": 7998 }, { @@ -8796,7 +8796,7 @@ "id": 20037 }, { - "name": "HELJKHOOFLK", + "name": "ElectroherculesBattleSelectDifficultyReq", "id": 20048 }, { @@ -9164,7 +9164,7 @@ "id": 21953 }, { - "name": "PCPHPBEFMAH", + "name": "TeamChainTakeCostumeRewardRsp", "id": 21956 }, { @@ -9248,7 +9248,7 @@ "id": 22570 }, { - "name": "MLBKBPIDBCF", + "name": "TeamChainTakeCostumeRewardReq", "id": 22589 }, { @@ -9284,7 +9284,7 @@ "id": 22696 }, { - "name": "KCFNLIHPJBG", + "name": "ElectroherculesBattleSettleNotify", "id": 22701 }, { @@ -9344,7 +9344,7 @@ "id": 23124 }, { - "name": "ELJDECFEHLJ", + "name": "WindSeedType1Notify", "id": 23131 }, { @@ -9436,11 +9436,11 @@ "id": 23395 }, { - "name": "GEEEIDAMPNI", + "name": "WindSeedType2Notify", "id": 23432 }, { - "name": "FEPBLOOMKIC", + "name": "TeamChainEnterDungeonRsp", "id": 23443 }, { @@ -9696,7 +9696,7 @@ "id": 24723 }, { - "name": "ALPEGHLBHIH", + "name": "TeamChainRestartDungeonRsp", "id": 24739 }, { @@ -9724,7 +9724,7 @@ "id": 24881 }, { - "name": "FFKACKPHECC", + "name": "ElectroherculesBattleSelectDifficultyRsp", "id": 24886 }, { @@ -9744,7 +9744,7 @@ "id": 24945 }, { - "name": "AAFCAGMOLJA", + "name": "WindSeedType3Notify", "id": 24948 }, { diff --git a/cmdid_gc_nofound.json b/cmdid_gc_nofound.json index 36d9cfa3..779ed508 100644 --- a/cmdid_gc_nofound.json +++ b/cmdid_gc_nofound.json @@ -159,36 +159,8 @@ "name": "PrivateChatSetSequenceRsp", "id": 4957 }, - { - "name": "TowerLevelEndNotify", - "id": 2481 - }, - { - "name": "TrialAvatarFirstPassDungeonNotify", - "id": 2089 - }, { "name": "Unk2700_NGPMINKIOPK", "id": 8956 - }, - { - "name": "WindSeedType1Notify", - "id": 23435 - }, - { - "name": "WindSeedType2Notify", - "id": 24656 - }, - { - "name": "WindSeedType3Notify", - "id": 22438 - }, - { - "name": "SkipPlayerGameTimeReq", - "id": 123 - }, - { - "name": "SkipPlayerGameTimeRsp", - "id": 130 } ] \ No newline at end of file diff --git a/cmdid_gc_update.json b/cmdid_gc_update.json index 6333bedf..a2513be1 100644 --- a/cmdid_gc_update.json +++ b/cmdid_gc_update.json @@ -6979,7 +6979,8 @@ }, { "name": "TowerLevelEndNotify", - "id": 2481 + "id": 2466, + "replace": 2481 }, { "name": "TowerLevelStarCondNotify", @@ -7068,7 +7069,8 @@ }, { "name": "TrialAvatarFirstPassDungeonNotify", - "id": 2089 + "id": 2005, + "replace": 2089 }, { "name": "TrialAvatarInDungeonIndexNotify", @@ -9411,15 +9413,18 @@ }, { "name": "WindSeedType1Notify", - "id": 23435 + "id": 23131, + "replace": 23435 }, { "name": "WindSeedType2Notify", - "id": 24656 + "id": 23432, + "replace": 24656 }, { "name": "WindSeedType3Notify", - "id": 22438 + "id": 24948, + "replace": 22438 }, { "name": "WorktopOptionNotify", @@ -9498,10 +9503,12 @@ }, { "name": "SkipPlayerGameTimeReq", - "id": 123 + "id": 165, + "replace": 123 }, { "name": "SkipPlayerGameTimeRsp", - "id": 130 + "id": 129, + "replace": 130 } ] \ No newline at end of file diff --git a/cmdid_ht_37.json b/cmdid_ht_37.json index 23f5a492..b9c7d213 100644 --- a/cmdid_ht_37.json +++ b/cmdid_ht_37.json @@ -63,7 +63,7 @@ "2170": "EnterTrialAvatarActivityDungeonRsp", "2068": "ReceivedTrialAvatarActivityRewardReq", "2116": "ReceivedTrialAvatarActivityRewardRsp", - "2005": "ACMPPBHOFEN", + "2005": "TrialAvatarFirstPassDungeonNotify", "2121": "TrialAvatarInDungeonIndexNotify", "2024": "TakeDeliveryDailyRewardReq", "2110": "TakeDeliveryDailyRewardRsp", @@ -611,20 +611,20 @@ "23659": "DuelHeartCgEndNotify", "20107": "BKNCOJHMFEC", "24706": "TeamChainEnterDungeonReq", - "23443": "FEPBLOOMKIC", + "23443": "TeamChainEnterDungeonRsp", "24341": "TeamChainRestartDungeonReq", - "24739": "ALPEGHLBHIH", + "24739": "TeamChainRestartDungeonRsp", "21169": "TeamChainDungeonInfoNotify", - "22589": "MLBKBPIDBCF", - "21956": "PCPHPBEFMAH", + "22589": "TeamChainTakeCostumeRewardReq", + "21956": "TeamChainTakeCostumeRewardRsp", "24697": "ENLCIDALHGC", "22795": "GKOBJNLOOND", - "23131": "ELJDECFEHLJ", - "23432": "GEEEIDAMPNI", - "24948": "AAFCAGMOLJA", - "20048": "HELJKHOOFLK", - "24886": "FFKACKPHECC", - "22701": "KCFNLIHPJBG", + "23131": "WindSeedType1Notify", + "23432": "WindSeedType2Notify", + "24948": "WindSeedType3Notify", + "20048": "ElectroherculesBattleSelectDifficultyReq", + "24886": "ElectroherculesBattleSelectDifficultyRsp", + "22701": "ElectroherculesBattleSettleNotify", "21714": "IPCHFMGPLPP", "24763": "JJEHBCBJFLF", "23260": "KNNGOJAGIAL", @@ -1140,90 +1140,90 @@ "5593": "OGMBGMEHLND", "5511": "ADNMEPEENAN", "5571": "KCMKIOKPNPK", - "7674": "IDMBCPPJCFL", - "7697": "HKDOBJEEIFB", - "7112": "BPAKPFAPKMD", - "7230": "OLFMBLLJPJJ", - "7659": "IEHCEMKOPCF", - "7506": "FJBOGLHIKLG", - "7642": "AAFNJHFALBA", - "7152": "CHEOBKOCNAJ", - "7807": "IIMEOILCLMG", - "7519": "KBFCIGIEFLK", - "7193": "EGKKGDBOEAP", - "7017": "DCJMMAFGEFD", - "7450": "EOLPOJJCOII", - "7300": "NLODGPMIPPA", - "7285": "PCCJGEGIPDN", - "7160": "AAEFHPMFMGF", - "7665": "IJPKGNKGLLB", - "7645": "JCGBJLLGAEF", + "7674": "GCGOperationReq", + "7697": "GCGOperationRsp", + "7112": "GCGMessagePackNotify", + "7230": "GCGAskDuelReq", + "7659": "GCGAskDuelRsp", + "7506": "GCGGameBriefDataNotify", + "7642": "GCGInitFinishReq", + "7152": "GCGInitFinishRsp", + "7807": "GCGHeartBeatNotify", + "7519": "GCGSkillPreviewNotify", + "7193": "GCGSkillPreviewAskReq", + "7017": "GCGSkillPreviewAskRsp", + "7450": "GCGChallengeUpdateNotify", + "7300": "GCGBackToDuelReq", + "7285": "GCGBackToDuelRsp", + "7160": "GCGDebugReplayNotify", + "7665": "GCGGameMaxNotify", + "7645": "GCGGameCreateFailReasonNotify", "7956": "BFPIGPNCLEO", "7668": "JGDFLBNLHPM", "7015": "JKEOIDCJIIP", "7738": "BFOHFFGPOJH", - "7427": "EOFJNHHLIPK", - "7873": "JJOMMBPKJCM", - "7845": "PDIGPHKJHIC", - "7789": "CEBBCAEOLJO", + "7427": "GCGDSDataNotify", + "7873": "GCGDSCardBackUnlockNotify", + "7845": "GCGDSFieldUnlockNotify", + "7789": "GCGDSCardFaceUnlockNotify", "7158": "GCGDSCardNumChangeNotify", - "7536": "CLOJNHDBJAP", + "7536": "GCGDSChangeCardFaceReq", "7097": "GCGDSChangeCardFaceRsp", - "7303": "HJKOHPKBMCO", - "7490": "IAHHCOJOHNK", - "7321": "MJDLKAIIMNM", - "7141": "CNICBHJMBGH", - "7928": "NFAMOMHMIJH", - "7411": "FDLEMHPMKCF", - "7998": "FNGHOONFNDP", - "7071": "DFHFNGDMLCA", - "7299": "GNKKEOBHHDP", - "7245": "IHOMGBKHOOD", - "7563": "AOMFGHHCOLO", - "7576": "HPEIOOKKAHD", - "7496": "JHFBIOPAOLG", - "7385": "HHPIKGHBMEC", - "7774": "NKEGILJDAKE", - "7317": "CAIHDEJCPHL", - "7557": "PKNJCAHHIBL", + "7303": "GCGDSChangeCardBackReq", + "7490": "GCGDSChangeCardBackRsp", + "7321": "GCGDSChangeFieldReq", + "7141": "GCGDSChangeFieldRsp", + "7928": "GCGDSChangeDeckNameReq", + "7411": "GCGDSChangeDeckNameRsp", + "7998": "GCGDSDeckSaveReq", + "7071": "GCGDSDeckSaveRsp", + "7299": "GCGDSChangeCurDeckReq", + "7245": "GCGDSChangeCurDeckRsp", + "7563": "GCGDSCurDeckChangeNotify", + "7576": "GCGDSDeleteDeckReq", + "7496": "GCGDSDeleteDeckRsp", + "7385": "GCGDSDeckUnlockNotify", + "7774": "GCGDSCardProficiencyNotify", + "7317": "GCGDSDeckUpdateNotify", + "7557": "GCGDSCardFaceUpdateNotify", "7908": "GCGDSTakeCardProficiencyRewardReq", "7933": "GCGDSTakeCardProficiencyRewardRsp", - "7168": "LDBNFKGJEIL", - "7194": "LGEBINHGCCF", - "7449": "EPNLBMDEFLC", - "7364": "CAMBLPFGINK", - "7777": "LLKPACFPMLG", - "7976": "BPPMNLFJGBJ", + "7168": "GCGDSBanCardNotify", + "7194": "GCGTCTavernInfoNotify", + "7449": "GCGTCInviteReq", + "7364": "GCGTCInviteRsp", + "7777": "GCGTCTavernChallengeDataNotify", + "7976": "GCGTCTavernChallengeUpdateNotify", "7788": "GCGGrowthLevelNotify", - "7128": "JFFHJBPBMAL", - "7586": "LEEIALLHGNP", - "7443": "LNDFIODJJAK", - "7467": "NGGCCHMAKHA", - "7906": "OEOMDOMDHLA", - "7803": "FDJHIDDJHEO", + "7128": "GCGGrowthLevelRewardNotify", + "7586": "GCGGrowthLevelTakeRewardReq", + "7443": "GCGGrowthLevelTakeRewardRsp", + "7467": "GCGInviteGuestBattleReq", + "7906": "GCGInviteGuestBattleRsp", + "7803": "GCGInviteBattleNotify", "7769": "GCGApplyInviteBattleReq", "7923": "GCGApplyInviteBattleRsp", "7433": "GCGApplyInviteBattleNotify", - "7421": "AJDKPAPGPMB", - "7093": "DOLLCIEKMJI", - "7359": "MHAEEPPGNLN", - "7970": "IKCDLHONJEL", - "7796": "IJMBPIHHMFM", + "7421": "GCGWorldPlayerGCGStateReq", + "7093": "GCGWorldPlayerGCGStateRsp", + "7359": "GCGSettleNotify", + "7970": "GCGResourceStateNotify", + "7796": "GCGClientSettleReq", "7944": "GCGClientSettleRsp", - "7370": "GDGMONKKMCC", + "7370": "GCGSettleOptionReq", "7918": "GCGSettleOptionRsp", - "7514": "CBOGDEPDNHD", - "7468": "IOBIPFCILJM", - "7584": "IOAEPMIGNBO", - "7358": "PPGHMAMMLHN", - "7592": "MCPMKDKOMMJ", - "7916": "DKMFMOMOHIM", - "7702": "MPAGMBABPFH", - "7616": "FKCLECCFIKJ", - "7207": "DCGKGHOFDMC", - "7184": "JCGFAKDDGJK", - "7099": "BNGAGMGNFAF", - "7014": "JLKGIJBKOEI", + "7514": "GCGBasicDataNotify", + "7468": "GCGTavernNpcInfoNotify", + "7584": "GCGStartChallengeReq", + "7358": "GCGStartChallengeRsp", + "7592": "GCGWeekChallengeInfoNotify", + "7916": "GCGStartChallengeByCheckRewardReq", + "7702": "GCGStartChallengeByCheckRewardRsp", + "7616": "GCGLevelChallengeNotify", + "7207": "GCGLevelChallengeFinishNotify", + "7184": "GCGWorldChallengeUnlockNotify", + "7099": "GCGBossChallengeUpdateNotify", + "7014": "GCGLevelChallengeDeleteNotify", "7269": "KABIPCCNOEA", "7197": "GLKHPDDFBBG", "7366": "HJJABCDOGOI", @@ -1419,8 +1419,8 @@ "4631": "HomeDeleteBlueprintRsp", "4644": "HomeSearchBlueprintReq", "4815": "HomeSearchBlueprintRsp", - "4718": "JEDIGELMJCL", - "4509": "ACNCCGPBILN", + "4718": "HomeSaveArrangementNoChangeReq", + "4509": "HomeSaveArrangementNoChangeRsp", "4668": "AJDEHNFKEGD", "4765": "PDMAALPDCNI", "4590": "NPKFGKHDGLI", @@ -1680,7 +1680,7 @@ "5365": "BrickBreakerSetChangingRsp", "5329": "BrickBreakerPlayerSetChangingNotify", "6455": "CoinCollectPrepareStageNotify", - "6554": "LBILBIGNGPH", + "6554": "LanV3BoatSettleNotify", "6450": "FKNPJFJINKF", "6546": "ACGAFODFNLP", "575": "NpcTalkReq", @@ -1811,8 +1811,8 @@ "173": "PlayerCompoundMaterialBoostRsp", "104": "PlayerGameTimeByLuaNotify", "191": "PlayerIpRegionNotify", - "165": "CLJNJBDHDEN", - "129": "MJEGBKCMNIE", + "165": "SkipPlayerGameTimeReq", + "129": "SkipPlayerGameTimeRsp", "125": "KMFDGOAOFAD", "186": "IOEJCMJGHCG", "1275": "EntityPropNotify", @@ -2268,7 +2268,7 @@ "2433": "TowerSurrenderRsp", "2424": "TowerGetFloorStarRewardReq", "2431": "TowerGetFloorStarRewardRsp", - "2466": "ACPJMJPFENC", + "2466": "TowerLevelEndNotify", "2443": "TowerLevelStarCondNotify", "2403": "TowerMiddleLevelChangeTeamNotify", "2442": "TowerRecordHandbookReq", diff --git a/proto/AAKNGDKKHDN.proto b/proto/AAKNGDKKHDN.proto new file mode 100644 index 00000000..c0ee71a7 --- /dev/null +++ b/proto/AAKNGDKKHDN.proto @@ -0,0 +1,30 @@ +// 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: 24258 +message AAKNGDKKHDN { + uint32 difficulty = 3; + uint32 score = 9; + uint32 MOGDMPFMGLN = 12; + bool is_new_record = 2; + bool is_success = 10; + uint32 DNKNMEGHIIJ = 13; +} diff --git a/proto/ACKNNJIEGEK.proto b/proto/ACKNNJIEGEK.proto new file mode 100644 index 00000000..b8fb6b2a --- /dev/null +++ b/proto/ACKNNJIEGEK.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "OEHLKBGHEDC.proto"; +message ACKNNJIEGEK { + OEHLKBGHEDC HKBHEOKLEFK = 12; + uint32 level_id = 7; +} diff --git a/proto/AEIMLNONEAP.proto b/proto/AEIMLNONEAP.proto new file mode 100644 index 00000000..cf818b37 --- /dev/null +++ b/proto/AEIMLNONEAP.proto @@ -0,0 +1,30 @@ +// 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"; + + +enum AEIMLNONEAP { + AEIMLNONEAP_PacmanDungeonStopNone = 0; + AEIMLNONEAP_PacmanDungeonStopSuccess = 1; + AEIMLNONEAP_PacmanDungeonStopTimeup = 2; + AEIMLNONEAP_PacmanDungeonStopClientInterrupt = 3; + AEIMLNONEAP_PacmanDungeonStopCancel = 4; + AEIMLNONEAP_PacmanDungeonStopActivityClosed = 5; + AEIMLNONEAP_PacmanDungeonStopFail = 6; +} diff --git a/proto/AKEBNLHDNPG.proto b/proto/AKEBNLHDNPG.proto new file mode 100644 index 00000000..477d9b99 --- /dev/null +++ b/proto/AKEBNLHDNPG.proto @@ -0,0 +1,25 @@ +// 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 "HPFPNKNJIOD.proto"; +message AKEBNLHDNPG { + repeated HPFPNKNJIOD level_info_list = 1; +} diff --git a/proto/AMBJIMENFCF.proto b/proto/AMBJIMENFCF.proto new file mode 100644 index 00000000..0efedcfb --- /dev/null +++ b/proto/AMBJIMENFCF.proto @@ -0,0 +1,27 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +message AMBJIMENFCF { + uint32 level_id = 15; + repeated uint32 MELPDGIIFIP = 2; + uint32 LMCJIONGAAJ = 8; + repeated uint32 APLANIDIEGM = 6; +} diff --git a/proto/AbilityActionGenerateElemBall.proto b/proto/AbilityActionGenerateElemBall.proto index 017bed3d..0469939b 100644 --- a/proto/AbilityActionGenerateElemBall.proto +++ b/proto/AbilityActionGenerateElemBall.proto @@ -1,13 +1,28 @@ +// 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"; - -// Name: ANCKCFFOAID +// Obf: BEHNKFHKEMD message AbilityActionGenerateElemBall { - uint32 room_id = 2; - Vector rot = 9; - Vector pos = 14; + Vector pos = 4; + uint32 room_id = 7; + Vector rot = 15; } - diff --git a/proto/AbilityAppliedAbility.proto b/proto/AbilityAppliedAbility.proto index 19eb2525..5b5d5f05 100644 --- a/proto/AbilityAppliedAbility.proto +++ b/proto/AbilityAppliedAbility.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AbilityString.proto"; import "AbilityScalarValueEntry.proto"; +// Obf: GBOIHEDHOGC message AbilityAppliedAbility { AbilityString ability_name = 1; AbilityString ability_override = 2; diff --git a/proto/AbilityAppliedModifier.proto b/proto/AbilityAppliedModifier.proto index 9821dfc0..82a0a85a 100644 --- a/proto/AbilityAppliedModifier.proto +++ b/proto/AbilityAppliedModifier.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AbilityString.proto"; import "AbilityAttachedModifier.proto"; import "ModifierDurability.proto"; +// Obf: DCPBFOKKPFJ message AbilityAppliedModifier { int32 modifier_local_id = 1; uint32 parent_ability_entity_id = 2; diff --git a/proto/AbilityAttachedModifier.proto b/proto/AbilityAttachedModifier.proto index 788e7501..43f25834 100644 --- a/proto/AbilityAttachedModifier.proto +++ b/proto/AbilityAttachedModifier.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: KLMOHHKFHDB message AbilityAttachedModifier { bool is_invalid = 1; uint32 owner_entity_id = 2; diff --git a/proto/AbilityChangeNotify.proto b/proto/AbilityChangeNotify.proto index 47a513e2..5583d5c4 100644 --- a/proto/AbilityChangeNotify.proto +++ b/proto/AbilityChangeNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AbilityControlBlock.proto"; // CmdId: 1184 +// Obf: PLMKKNIJMEC message AbilityChangeNotify { uint32 entity_id = 10; AbilityControlBlock ability_control_block = 2; diff --git a/proto/AbilityControlBlock.proto b/proto/AbilityControlBlock.proto index ea4d49db..5452cd8a 100644 --- a/proto/AbilityControlBlock.proto +++ b/proto/AbilityControlBlock.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AbilityEmbryo.proto"; +// Obf: OLBGGLMLEBL message AbilityControlBlock { repeated AbilityEmbryo ability_embryo_list = 1; } diff --git a/proto/AbilityEmbryo.proto b/proto/AbilityEmbryo.proto index 755ec304..e9c7b8af 100644 --- a/proto/AbilityEmbryo.proto +++ b/proto/AbilityEmbryo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: JAODNDBPGJA message AbilityEmbryo { uint32 ability_id = 1; fixed32 ability_name_hash = 2; diff --git a/proto/AbilityFireworkBornType.proto b/proto/AbilityFireworkBornType.proto new file mode 100644 index 00000000..1d2c94ee --- /dev/null +++ b/proto/AbilityFireworkBornType.proto @@ -0,0 +1,29 @@ +// 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: IEELHDCPPBO +message AbilityFireworkBornType { + Vector move_dir = 4; + uint32 effect_index = 7; + Vector pos = 2; + Vector rot = 6; +} diff --git a/proto/AbilityGadgetInfo.proto b/proto/AbilityGadgetInfo.proto index 28da62a2..47268bc2 100644 --- a/proto/AbilityGadgetInfo.proto +++ b/proto/AbilityGadgetInfo.proto @@ -1,12 +1,27 @@ +// 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"; -// Name: JDMJNJAJHGI +// Obf: AELEICAJLLG message AbilityGadgetInfo { - uint32 camp_id = 1; - uint32 camp_target_type = 2; - uint32 target_entity_id = 3; + uint32 camp_id = 1; + uint32 camp_target_type = 2; + uint32 target_entity_id = 3; } - diff --git a/proto/AbilityIdentifier.proto b/proto/AbilityIdentifier.proto index fe6322cf..0127cfec 100644 --- a/proto/AbilityIdentifier.proto +++ b/proto/AbilityIdentifier.proto @@ -19,11 +19,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: PIEGLPACNBP message AbilityIdentifier { uint32 instanced_modifier_id = 11; int32 local_id = 2; bool is_serverbuff_modifier = 14; - uint32 GBFNJGFGMBK = 1; - uint32 LPBMHGEADKN = 15; + uint32 PLEOONAACJI = 1; + uint32 DJPMGPMOPIN = 15; uint32 instanced_ability_id = 9; } diff --git a/proto/AbilityInvocationsNotify.proto b/proto/AbilityInvocationsNotify.proto index b6fb3e3e..5899ef71 100644 --- a/proto/AbilityInvocationsNotify.proto +++ b/proto/AbilityInvocationsNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AbilityInvokeEntry.proto"; // CmdId: 1196 +// Obf: PJFLGALPCNO message AbilityInvocationsNotify { repeated AbilityInvokeEntry invokes = 1; } diff --git a/proto/AbilityInvokeArgument.proto b/proto/AbilityInvokeArgument.proto index e9596ea4..8347a328 100644 --- a/proto/AbilityInvokeArgument.proto +++ b/proto/AbilityInvokeArgument.proto @@ -1,76 +1,91 @@ +// 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"; -// Name: OCEIMDJANPL +// Obf: IEGANFCMCNJ enum AbilityInvokeArgument { - ABILITY_INVOKE_ARGUMENT_NONE = 0; - ABILITY_INVOKE_ARGUMENT_META_MODIFIER_CHANGE = 1; - ABILITY_INVOKE_ARGUMENT_META_COMMAND_MODIFIER_CHANGE_REQUEST = 2; - ABILITY_INVOKE_ARGUMENT_META_SPECIAL_FLOAT_ARGUMENT = 3; - ABILITY_INVOKE_ARGUMENT_META_OVERRIDE_PARAM = 4; - ABILITY_INVOKE_ARGUMENT_META_CLEAR_OVERRIDE_PARAM = 5; - ABILITY_INVOKE_ARGUMENT_META_REINIT_OVERRIDEMAP = 6; - ABILITY_INVOKE_ARGUMENT_META_GLOBAL_FLOAT_VALUE = 7; - ABILITY_INVOKE_ARGUMENT_META_CLEAR_GLOBAL_FLOAT_VALUE = 8; - ABILITY_INVOKE_ARGUMENT_META_ABILITY_ELEMENT_STRENGTH = 9; - ABILITY_INVOKE_ARGUMENT_META_ADD_OR_GET_ABILITY_AND_TRIGGER = 10; - ABILITY_INVOKE_ARGUMENT_META_SET_KILLED_SETATE = 11; - ABILITY_INVOKE_ARGUMENT_META_SET_ABILITY_TRIGGER = 12; - ABILITY_INVOKE_ARGUMENT_META_ADD_NEW_ABILITY = 13; - ABILITY_INVOKE_ARGUMENT_META_REMOVE_ABILITY = 14; - ABILITY_INVOKE_ARGUMENT_META_SET_MODIFIER_APPLY_ENTITY = 15; - ABILITY_INVOKE_ARGUMENT_META_MODIFIER_DURABILITY_CHANGE = 16; - ABILITY_INVOKE_ARGUMENT_META_ELEMENT_REACTION_VISUAL = 17; - ABILITY_INVOKE_ARGUMENT_META_SET_POSE_PARAMETER = 18; - ABILITY_INVOKE_ARGUMENT_META_UPDATE_BASE_REACTION_DAMAGE = 19; - ABILITY_INVOKE_ARGUMENT_META_TRIGGER_ELEMENT_REACTION = 20; - ABILITY_INVOKE_ARGUMENT_META_LOSE_HP = 21; - ABILITY_INVOKE_ARGUMENT_META_DURABILITY_IS_ZERO = 22; - ABILITY_INVOKE_ARGUMENT_ACTION_TRIGGER_ABILITY = 50; - ABILITY_INVOKE_ARGUMENT_ACTION_SET_CRASH_DAMAGE = 51; - ABILITY_INVOKE_ARGUMENT_ACTION_EFFECT = 52; - ABILITY_INVOKE_ARGUMENT_ACTION_SUMMON = 53; - ABILITY_INVOKE_ARGUMENT_ACTION_BLINK = 54; - ABILITY_INVOKE_ARGUMENT_ACTION_CREATE_GADGET = 55; - ABILITY_INVOKE_ARGUMENT_ACTION_APPLY_LEVEL_MODIFIER = 56; - ABILITY_INVOKE_ARGUMENT_ACTION_GENERATE_ELEM_BALL = 57; - ABILITY_INVOKE_ARGUMENT_ACTION_SET_RANDOM_OVERRIDE_MAP_VALUE = 58; - ABILITY_INVOKE_ARGUMENT_ACTION_SERVER_MONSTER_LOG = 59; - ABILITY_INVOKE_ARGUMENT_ACTION_CREATE_TILE = 60; - ABILITY_INVOKE_ARGUMENT_ACTION_DESTROY_TILE = 61; - ABILITY_INVOKE_ARGUMENT_ACTION_FIRE_AFTER_IMAGE = 62; - ABILITY_INVOKE_ARGUMENT_ACTION_DEDUCT_STAMINA = 63; - ABILITY_INVOKE_ARGUMENT_ACTION_HIT_EFFECT = 64; - ABILITY_INVOKE_ARGUMENT_ACTION_SET_BULLET_TRACK_TARGET = 65; - ABILITY_INVOKE_ARGUMENT_ACTION_FIREWORK_EFFECT = 66; - ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_STEER_BY_CAMERA = 100; - ABILITY_INVOKE_ARGUMENT_MIXIN_MONSTER_DEFEND = 101; - ABILITY_INVOKE_ARGUMENT_MIXIN_WIND_ZONE = 102; - ABILITY_INVOKE_ARGUMENT_MIXIN_COST_STAMINA = 103; - ABILITY_INVOKE_ARGUMENT_MIXIN_ELITE_SHIELD = 104; - ABILITY_INVOKE_ARGUMENT_MIXIN_ELEMENT_SHIELD = 105; - ABILITY_INVOKE_ARGUMENT_MIXIN_GLOBAL_SHIELD = 106; - ABILITY_INVOKE_ARGUMENT_MIXIN_SHIELD_BAR = 107; - ABILITY_INVOKE_ARGUMENT_MIXIN_WIND_SEED_SPAWNER = 108; - ABILITY_INVOKE_ARGUMENT_MIXIN_DO_ACTION_BY_ELEMENT_REACTION = 109; - ABILITY_INVOKE_ARGUMENT_MIXIN_FIELD_ENTITY_COUNT_CHANGE = 110; - ABILITY_INVOKE_ARGUMENT_MIXIN_SCENE_PROP_SYNC = 111; - ABILITY_INVOKE_ARGUMENT_MIXIN_WIDGET_MP_SUPPORT = 112; - ABILITY_INVOKE_ARGUMENT_MIXIN_DO_ACTION_BY_SELF_MODIFIER_ELEMENT_DURABILITY_INVOKE_ARGUMENT_RATIO = 113; - ABILITY_INVOKE_ARGUMENT_MIXIN_FIREWORKS_LAUNCHER = 114; - ABILITY_INVOKE_ARGUMENT_MIXIN_ATTACK_RESULT_CREATE_COUNT = 115; - ABILITY_INVOKE_ARGUMENT_MIXIN_UGC_TIME_CONTROL = 116; - ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_COMBAT = 117; - ABILITY_INVOKE_ARGUMENT_MIXIN_DEATH_ZONE_REGIONAL_PLAY_MIXIN = 118; - ABILITY_INVOKE_ARGUMENT_MIXIN_UI_INTERACT = 119; - ABILITY_INVOKE_ARGUMENT_MIXIN_SHOOT_FROM_CAMERA = 120; - ABILITY_INVOKE_ARGUMENT_MIXIN_ERASE_BRICK_ACTIVITY = 121; - ABILITY_INVOKE_ARGUMENT_MIXIN_BREAKOUT = 122; - ABILITY_INVOKE_ARGUMENT_MIXIN_DAMAGE_LOAN = 123; - ABILITY_INVOKE_ARGUMENT_MIXIN_BROADCAST_GV = 124; - ABILITY_INVOKE_ARGUMENT_MIXIN_RECEIVE_GV = 125; - ABILITY_INVOKE_ARGUMENT_MIXIN_ENERGY_CRYSTAL_TARGET = 127; + ABILITY_INVOKE_ARGUMENT_NONE = 0; + ABILITY_INVOKE_ARGUMENT_META_MODIFIER_CHANGE = 1; + ABILITY_INVOKE_ARGUMENT_META_COMMAND_MODIFIER_CHANGE_REQUEST = 2; + ABILITY_INVOKE_ARGUMENT_META_SPECIAL_FLOAT_ARGUMENT = 3; + ABILITY_INVOKE_ARGUMENT_META_OVERRIDE_PARAM = 4; + ABILITY_INVOKE_ARGUMENT_META_CLEAR_OVERRIDE_PARAM = 5; + ABILITY_INVOKE_ARGUMENT_META_REINIT_OVERRIDEMAP = 6; + ABILITY_INVOKE_ARGUMENT_META_GLOBAL_FLOAT_VALUE = 7; + ABILITY_INVOKE_ARGUMENT_META_CLEAR_GLOBAL_FLOAT_VALUE = 8; + ABILITY_INVOKE_ARGUMENT_META_ABILITY_ELEMENT_STRENGTH = 9; + ABILITY_INVOKE_ARGUMENT_META_ADD_OR_GET_ABILITY_AND_TRIGGER = 10; + ABILITY_INVOKE_ARGUMENT_META_SET_KILLED_SETATE = 11; + ABILITY_INVOKE_ARGUMENT_META_SET_ABILITY_TRIGGER = 12; + ABILITY_INVOKE_ARGUMENT_META_ADD_NEW_ABILITY = 13; + ABILITY_INVOKE_ARGUMENT_META_REMOVE_ABILITY = 14; + ABILITY_INVOKE_ARGUMENT_META_SET_MODIFIER_APPLY_ENTITY = 15; + ABILITY_INVOKE_ARGUMENT_META_MODIFIER_DURABILITY_CHANGE = 16; + ABILITY_INVOKE_ARGUMENT_META_ELEMENT_REACTION_VISUAL = 17; + ABILITY_INVOKE_ARGUMENT_META_SET_POSE_PARAMETER = 18; + ABILITY_INVOKE_ARGUMENT_META_UPDATE_BASE_REACTION_DAMAGE = 19; + ABILITY_INVOKE_ARGUMENT_META_TRIGGER_ELEMENT_REACTION = 20; + ABILITY_INVOKE_ARGUMENT_META_LOSE_HP = 21; + ABILITY_INVOKE_ARGUMENT_META_DURABILITY_IS_ZERO = 22; + ABILITY_INVOKE_ARGUMENT_ACTION_TRIGGER_ABILITY = 50; + ABILITY_INVOKE_ARGUMENT_ACTION_SET_CRASH_DAMAGE = 51; + ABILITY_INVOKE_ARGUMENT_ACTION_EFFECT = 52; + ABILITY_INVOKE_ARGUMENT_ACTION_SUMMON = 53; + ABILITY_INVOKE_ARGUMENT_ACTION_BLINK = 54; + ABILITY_INVOKE_ARGUMENT_ACTION_CREATE_GADGET = 55; + ABILITY_INVOKE_ARGUMENT_ACTION_APPLY_LEVEL_MODIFIER = 56; + ABILITY_INVOKE_ARGUMENT_ACTION_GENERATE_ELEM_BALL = 57; + ABILITY_INVOKE_ARGUMENT_ACTION_SET_RANDOM_OVERRIDE_MAP_VALUE = 58; + ABILITY_INVOKE_ARGUMENT_ACTION_SERVER_MONSTER_LOG = 59; + ABILITY_INVOKE_ARGUMENT_ACTION_CREATE_TILE = 60; + ABILITY_INVOKE_ARGUMENT_ACTION_DESTROY_TILE = 61; + ABILITY_INVOKE_ARGUMENT_ACTION_FIRE_AFTER_IMAGE = 62; + ABILITY_INVOKE_ARGUMENT_ACTION_DEDUCT_STAMINA = 63; + ABILITY_INVOKE_ARGUMENT_ACTION_HIT_EFFECT = 64; + ABILITY_INVOKE_ARGUMENT_ACTION_SET_BULLET_TRACK_TARGET = 65; + ABILITY_INVOKE_ARGUMENT_ACTION_FIREWORK_EFFECT = 66; + ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_STEER_BY_CAMERA = 100; + ABILITY_INVOKE_ARGUMENT_MIXIN_MONSTER_DEFEND = 101; + ABILITY_INVOKE_ARGUMENT_MIXIN_WIND_ZONE = 102; + ABILITY_INVOKE_ARGUMENT_MIXIN_COST_STAMINA = 103; + ABILITY_INVOKE_ARGUMENT_MIXIN_ELITE_SHIELD = 104; + ABILITY_INVOKE_ARGUMENT_MIXIN_ELEMENT_SHIELD = 105; + ABILITY_INVOKE_ARGUMENT_MIXIN_GLOBAL_SHIELD = 106; + ABILITY_INVOKE_ARGUMENT_MIXIN_SHIELD_BAR = 107; + ABILITY_INVOKE_ARGUMENT_MIXIN_WIND_SEED_SPAWNER = 108; + ABILITY_INVOKE_ARGUMENT_MIXIN_DO_ACTION_BY_ELEMENT_REACTION = 109; + ABILITY_INVOKE_ARGUMENT_MIXIN_FIELD_ENTITY_COUNT_CHANGE = 110; + ABILITY_INVOKE_ARGUMENT_MIXIN_SCENE_PROP_SYNC = 111; + ABILITY_INVOKE_ARGUMENT_MIXIN_WIDGET_MP_SUPPORT = 112; + ABILITY_INVOKE_ARGUMENT_MIXIN_DO_ACTION_BY_SELF_MODIFIER_ELEMENT_DURABILITY_INVOKE_ARGUMENT_RATIO = 113; + ABILITY_INVOKE_ARGUMENT_MIXIN_FIREWORKS_LAUNCHER = 114; + ABILITY_INVOKE_ARGUMENT_MIXIN_ATTACK_RESULT_CREATE_COUNT = 115; + ABILITY_INVOKE_ARGUMENT_MIXIN_UGC_TIME_CONTROL = 116; + ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_COMBAT = 117; + ABILITY_INVOKE_ARGUMENT_MIXIN_DEATH_ZONE_REGIONAL_PLAY_MIXIN = 118; + ABILITY_INVOKE_ARGUMENT_MIXIN_UI_INTERACT = 119; + ABILITY_INVOKE_ARGUMENT_MIXIN_SHOOT_FROM_CAMERA = 120; + ABILITY_INVOKE_ARGUMENT_MIXIN_ERASE_BRICK_ACTIVITY = 121; + ABILITY_INVOKE_ARGUMENT_MIXIN_BREAKOUT = 122; + ABILITY_INVOKE_ARGUMENT_MIXIN_DAMAGE_LOAN = 123; + ABILITY_INVOKE_ARGUMENT_MIXIN_BROADCAST_GV = 124; + ABILITY_INVOKE_ARGUMENT_MIXIN_RECEIVE_GV = 125; + ABILITY_INVOKE_ARGUMENT_MIXIN_ENERGY_CRYSTAL_TARGET = 127; } - diff --git a/proto/AbilityInvokeEntry.proto b/proto/AbilityInvokeEntry.proto index e9944ffa..f4856d4b 100644 --- a/proto/AbilityInvokeEntry.proto +++ b/proto/AbilityInvokeEntry.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AbilityInvokeEntryHead.proto"; import "AbilityInvokeArgument.proto"; import "ForwardType.proto"; +// Obf: ELGIBELOGKF message AbilityInvokeEntry { uint32 event_id = 8; uint32 entity_id = 10; diff --git a/proto/AbilityInvokeEntryHead.proto b/proto/AbilityInvokeEntryHead.proto index 6b345bdc..fd4039d9 100644 --- a/proto/AbilityInvokeEntryHead.proto +++ b/proto/AbilityInvokeEntryHead.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: DPEDKHLIFHF message AbilityInvokeEntryHead { int32 modifier_config_local_id = 8; uint32 target_id = 13; diff --git a/proto/AbilityMetaModifierChange.proto b/proto/AbilityMetaModifierChange.proto index 011240ab..fb19ceee 100644 --- a/proto/AbilityMetaModifierChange.proto +++ b/proto/AbilityMetaModifierChange.proto @@ -1,24 +1,39 @@ +// 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 "AbilityAttachedModifier.proto"; -import "AbilityString.proto"; -import "ModifierAction.proto"; + import "ModifierProperty.proto"; - -// Name: MPIOJLNOMAC +import "ModifierAction.proto"; +import "AbilityString.proto"; +import "AbilityAttachedModifier.proto"; +// Obf: NANLJHBMAGF message AbilityMetaModifierChange { - uint32 server_buff_uid = 13; - bool JAODDPOBICJ = 4; - repeated ModifierProperty properties = 11; - int32 modifier_local_id = 5; - AbilityString parent_ability_override = 6; - bool KJPKHNFAEDC = 14; - bool is_attached_parent_ability = 1; - AbilityAttachedModifier attached_instanced_modifier = 12; - ModifierAction action = 3; - uint32 apply_entity_id = 8; - AbilityString parent_ability_name = 15; + repeated ModifierProperty properties = 14; + ModifierAction action = 4; + uint32 apply_entity_id = 2; + bool is_mute_remote = 15; + bool JGGDMDGLJOP = 8; + AbilityString parent_ability_name = 1; + uint32 server_buff_uid = 7; + AbilityString parent_ability_override = 10; + AbilityAttachedModifier attached_instanced_modifier = 3; + bool DLOLFHNNEKI = 12; + int32 modifier_local_id = 5; } - diff --git a/proto/AbilityMetaReInitOverrideMap.proto b/proto/AbilityMetaReInitOverrideMap.proto index daa4e820..649304d1 100644 --- a/proto/AbilityMetaReInitOverrideMap.proto +++ b/proto/AbilityMetaReInitOverrideMap.proto @@ -1,11 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "AbilityScalarValueEntry.proto"; - -// Name: AHCCOPHKLIK +// Obf: EDIDAGDNOLP message AbilityMetaReInitOverrideMap { - repeated AbilityScalarValueEntry override_map = 5; + repeated AbilityScalarValueEntry override_map = 2; } - diff --git a/proto/AbilityMetaSetPoseParameter.proto b/proto/AbilityMetaSetPoseParameter.proto new file mode 100644 index 00000000..a4a94af8 --- /dev/null +++ b/proto/AbilityMetaSetPoseParameter.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "AnimatorParameterValueInfoPair.proto"; +// Obf: FOHAAJOMMPL +message AbilityMetaSetPoseParameter { + AnimatorParameterValueInfoPair value = 15; +} diff --git a/proto/AbilityMixinRecoverInfo.proto b/proto/AbilityMixinRecoverInfo.proto index 5d88314f..6c7352c6 100644 --- a/proto/AbilityMixinRecoverInfo.proto +++ b/proto/AbilityMixinRecoverInfo.proto @@ -21,14 +21,15 @@ option java_package = "emu.grasscutter.net.proto"; import "MassivePropSyncInfo.proto"; import "BreakoutSnapShot.proto"; +// Obf: PEBNHOCGDFE message AbilityMixinRecoverInfo { uint32 local_id = 3; repeated uint32 data_list = 4; bool is_serverbuff_modifier = 5; repeated MassivePropSyncInfo massive_prop_list = 6; BreakoutSnapShot breakout_snap_shot = 7; - oneof source { - uint32 GPBKHCOAAGG = 1; - uint32 MILDDKOHGDL = 2; + oneof Source { + uint32 instanced_ability_id = 1; + uint32 instanced_modifier_id = 2; } } diff --git a/proto/AbilityScalarType.proto b/proto/AbilityScalarType.proto index be924498..9e9009e9 100644 --- a/proto/AbilityScalarType.proto +++ b/proto/AbilityScalarType.proto @@ -19,12 +19,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: EBCOKIIELIE enum AbilityScalarType { - AbilityScalarType_Unknow = 0; - AbilityScalarType_Float = 1; - AbilityScalarType_Int = 2; - AbilityScalarType_Bool = 3; - AbilityScalarType_Trigger = 4; - AbilityScalarType_string = 5; - AbilityScalarType_Uint = 6; + ABILITY_SCALAR_TYPE_UNKNOW = 0; + ABILITY_SCALAR_TYPE_FLOAT = 1; + ABILITY_SCALAR_TYPE_INT = 2; + ABILITY_SCALAR_TYPE_BOOL = 3; + ABILITY_SCALAR_TYPE_TRIGGER = 4; + ABILITY_SCALAR_TYPE_STRING = 5; + ABILITY_SCALAR_TYPE_UINT = 6; } diff --git a/proto/AbilityScalarValueEntry.proto b/proto/AbilityScalarValueEntry.proto index 15f8d788..6bfc0a63 100644 --- a/proto/AbilityScalarValueEntry.proto +++ b/proto/AbilityScalarValueEntry.proto @@ -1,19 +1,34 @@ +// 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 "AbilityScalarType.proto"; + import "AbilityString.proto"; - -// Name: JLEGECKKDKB +import "AbilityScalarType.proto"; +// Obf: ELHFFNHJCPD message AbilityScalarValueEntry { - AbilityString key = 1; - AbilityScalarType value_type = 2; - oneof value { - float float_value = 3; - string string_value = 4; - int32 int_value = 5; - uint32 uint_value = 6; - } + AbilityString key = 1; + AbilityScalarType value_type = 2; + oneof value { + float float_value = 3; + string string_value = 4; + int32 int_value = 5; + uint32 uint_value = 6; + } } - diff --git a/proto/AbilityString.proto b/proto/AbilityString.proto index ddeaa475..1469b82c 100644 --- a/proto/AbilityString.proto +++ b/proto/AbilityString.proto @@ -1,13 +1,28 @@ +// 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"; -// Name: CPMJBNHKIEA +// Obf: KHIKIFCBPKH message AbilityString { - oneof type { - string str = 1; - uint32 hash = 2; - } + oneof type { + string str = 1; + uint32 hash = 2; + } } - diff --git a/proto/AbilitySyncStateInfo.proto b/proto/AbilitySyncStateInfo.proto index cd96577b..e8b3a3d9 100644 --- a/proto/AbilitySyncStateInfo.proto +++ b/proto/AbilitySyncStateInfo.proto @@ -23,6 +23,7 @@ import "AbilityScalarValueEntry.proto"; import "AbilityAppliedAbility.proto"; import "AbilityAppliedModifier.proto"; import "AbilityMixinRecoverInfo.proto"; +// Obf: LKMIECILJCL message AbilitySyncStateInfo { bool is_inited = 1; repeated AbilityScalarValueEntry dynamic_value_map = 2; diff --git a/proto/Achievement.proto b/proto/Achievement.proto index e9ae01a0..73a4ffb2 100644 --- a/proto/Achievement.proto +++ b/proto/Achievement.proto @@ -20,7 +20,8 @@ import "Status.proto"; option java_package = "emu.grasscutter.net.proto"; -message Achievement { +// Obf: LPAPJAKPDJO +message Achievement { uint32 id = 3; Status status = 10; uint32 total_progress = 14; diff --git a/proto/AchievementAllDataNotify.proto b/proto/AchievementAllDataNotify.proto index 2179ad51..dde755f7 100644 --- a/proto/AchievementAllDataNotify.proto +++ b/proto/AchievementAllDataNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Achievement.proto"; // CmdId: 2678 +// Obf: JGJDJMAOIMP message AchievementAllDataNotify { repeated uint32 reward_taken_goal_id_list = 10; repeated Achievement achievement_list = 4; diff --git a/proto/AchievementUpdateNotify.proto b/proto/AchievementUpdateNotify.proto index 7854df3c..63a29e21 100644 --- a/proto/AchievementUpdateNotify.proto +++ b/proto/AchievementUpdateNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Achievement.proto"; // CmdId: 2658 +// Obf: CHOHAAMOIKE message AchievementUpdateNotify { repeated Achievement achievement_list = 2; } diff --git a/proto/ActivityGetFriendGiftWishListReq.proto b/proto/ActivityGetFriendGiftWishListReq.proto new file mode 100644 index 00000000..d860cd3d --- /dev/null +++ b/proto/ActivityGetFriendGiftWishListReq.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +// CmdId: 8127 +// Obf: KMIKAFFCKAL +message ActivityGetFriendGiftWishListReq { + uint32 schedule_id = 6; +} diff --git a/proto/ActivityInfo.proto b/proto/ActivityInfo.proto index 53a3043b..9a52a74d 100644 --- a/proto/ActivityInfo.proto +++ b/proto/ActivityInfo.proto @@ -1,35 +1,206 @@ +// 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 "ActivityPushTipsData.proto"; + import "ActivityWatcherInfo.proto"; +import "ActivityPushTipsData.proto"; +import "SeaLampActivityDetailInfo.proto"; +import "CrucibleActivityDetailInfo.proto"; +import "SalesmanActivityDetailInfo.proto"; +import "TrialAvatarActivityDetailInfo.proto"; +import "DeliveryActivityDetailInfo.proto"; +import "AsterActivityDetailInfo.proto"; +import "FlightActivityDetailInfo.proto"; +import "DragonSpineActivityDetailInfo.proto"; +import "EffigyActivityDetailInfo.proto"; +import "TreasureMapActivityDetailInfo.proto"; +import "BlessingActivityDetailInfo.proto"; +import "SeaLampActivityInfo.proto"; +import "ExpeditionActivityDetailInfo.proto"; +import "ArenaChallengeActivityDetailInfo.proto"; +import "FleurFairActivityDetailInfo.proto"; +import "WaterSpiritActivityDetailInfo.proto"; +import "ChannelerSlabActivityDetailInfo.proto"; +import "MistTrialActivityDetailInfo.proto"; +import "HideAndSeekActivityDetailInfo.proto"; +import "FindHilichurlDetailInfo.proto"; +import "SummerTimeDetailInfo.proto"; +import "BuoyantCombatDetailInfo.proto"; +import "EchoShellDetailInfo.proto"; +import "BounceConjuringActivityDetailInfo.proto"; +import "BlitzRushActivityDetailInfo.proto"; +import "ChessActivityDetailInfo.proto"; +import "SumoActivityDetailInfo.proto"; +import "MoonfinTrialActivityDetailInfo.proto"; +import "LunaRiteDetailInfo.proto"; +import "PlantFlowerActivityDetailInfo.proto"; import "MusicGameActivityDetailInfo.proto"; - -// 3.6 (HELP) +import "RoguelikeDungeonActivityDetailInfo.proto"; +import "DigActivityDetailInfo.proto"; +import "HachiActivityDetailInfo.proto"; +import "WinterCampActivityDetailInfo.proto"; +import "PotionActivityDetailInfo.proto"; +import "TanukiTravelActivityDetailInfo.proto"; +import "LanternRiteActivityDetailInfo.proto"; +import "MichiaeMatsuriActivityDetailInfo.proto"; +import "BartenderActivityDetailInfo.proto"; +import "UgcActivityDetailInfo.proto"; +import "CrystalLinkActivityDetailInfo.proto"; +import "IrodoriActivityDetailInfo.proto"; +import "PhotoActivityDetailInfo.proto"; +import "SpiceActivityDetailInfo.proto"; +import "GachaActivityDetailInfo.proto"; +import "LuminanceStoneChallengeActivityDetailInfo.proto"; +import "RogueDiaryActivityDetailInfo.proto"; +import "SummerTimeV2DetailInfo.proto"; +import "IslandPartyDetailInfo.proto"; +import "GearActivityDetailInfo.proto"; +import "GravenInnocenceDetailInfo.proto"; +import "InstableSprayDetailInfo.proto"; +import "MuqadasPotionActivityDetailInfo.proto"; +import "TreasureSeelieActivityDetailInfo.proto"; +import "RockBoardExploreDetailInfo.proto"; +import "VintageActivityDetailInfo.proto"; +import "WindFieldDetailInfo.proto"; +import "FungusFighterDetailInfo.proto"; +import "CharAmusementDetailInfo.proto"; +import "EffigyChallengeV2DetailInfo.proto"; +import "CoinCollectDetailInfo.proto"; +import "BrickBreakerDetailInfo.proto"; +import "DuelHeartDetailInfo.proto"; +import "SeaLampV3DetailInfo.proto"; +import "TeamChainDetailInfo.proto"; +import "ElectroherculesBattleDetailInfo.proto"; +import "GCGFestivalDetailInfo.proto"; +import "FleurFairV2DetailInfo.proto"; +import "FungusFighterV2DetailInfo.proto"; +import "AkaFesDetailInfo.proto"; +import "SandwormCannonDetailInfo.proto"; +import "SorushTrialDetailInfo.proto"; +import "MPCBEPPJBHA.proto"; +import "FFKMNCKOPHD.proto"; +import "LFDOHAHCGAN.proto"; +import "DPMOKIKIFAI.proto"; +// Obf: FBLOJKJLOLH message ActivityInfo { - repeated uint32 IMFFKIMJDJH = 13; - uint32 OIBEDADECFB = 238; - uint32 end_time = 10; - uint32 activity_id = 1; - repeated ActivityPushTipsData activity_push_tips_data_list = 1986; - bool DCENNBKGOAH = 1227; - repeated uint32 meet_cond_list = 5; // CGFKLALMOLH - uint32 schedule_id = 2; - bool DNKBDEJAOMC = 6; - bool MPCDIKMJOAC = 2041; - uint32 cur_score = 882; - uint32 activity_type = 11; - bool GODELKHIPDE = 3; - bool DLNNGPNHBFB = 1789; - uint32 first_day_start_time = 617; - uint32 begin_time = 15; - uint32 JAFIBAJIAFF = 540; - bool is_finished = 12; - bool is_starting = 202; - repeated ActivityWatcherInfo watcher_info_list = 4; - oneof detail { - MusicGameActivityDetailInfo music_game_info = 1643; - } + uint32 activity_type = 1; + uint32 end_time = 6; + uint32 begin_time = 7; + uint32 KOHDIPCFMID = 1859; + uint32 first_day_start_time = 533; + bool BMIBLEHMCLP = 888; + bool KLIKNJBHDCK = 1369; + uint32 activity_id = 2; + repeated uint32 JCPFGDCAGFC = 726; + bool OLEFIJABEPB = 1478; + bool GGOIMBPGHJF = 9; + repeated ActivityWatcherInfo watcher_info_list = 14; + repeated uint32 meet_cond_list = 13; + map wish_gift_num_map = 1016; + uint32 cur_score = 1089; + bool is_finished = 15; + map activity_coin_map = 992; + bool DPDFHAIDJPN = 233; + repeated ActivityPushTipsData activity_push_tips_data_list = 1333; + repeated uint32 expire_cond_list = 5; + uint32 MANEEFHEAIA = 925; + repeated uint32 taken_reward_list = 31; + uint32 schedule_id = 12; + bool BNEDNKKLKCL = 11; + oneof detail { + SeaLampActivityDetailInfo sam_lamp_info = 4; + CrucibleActivityDetailInfo crucible_info = 10; + SalesmanActivityDetailInfo salesman_info = 8; + TrialAvatarActivityDetailInfo trial_avatar_info = 3; + DeliveryActivityDetailInfo delivery_info = 1570; + AsterActivityDetailInfo aster_info = 344; + FlightActivityDetailInfo flight_info = 326; + DragonSpineActivityDetailInfo dragon_spine_info = 1821; + EffigyActivityDetailInfo effigy_info = 650; + TreasureMapActivityDetailInfo treasure_map_info = 1080; + BlessingActivityDetailInfo blessing_info = 81; + SeaLampActivityInfo sea_lamp_info = 587; + ExpeditionActivityDetailInfo expedition_info = 1257; + ArenaChallengeActivityDetailInfo arena_challenge_info = 827; + FleurFairActivityDetailInfo fleur_fair_info = 1111; + WaterSpiritActivityDetailInfo water_spirit_info = 975; + ChannelerSlabActivityDetailInfo challneler_slab_info = 2045; + MistTrialActivityDetailInfo mist_trial_activity_info = 742; + HideAndSeekActivityDetailInfo hide_and_seek_info = 1693; + FindHilichurlDetailInfo find_hilichurl_info = 448; + SummerTimeDetailInfo summer_time_info = 1370; + BuoyantCombatDetailInfo buoyant_combat_info = 1400; + EchoShellDetailInfo echo_shell_info = 433; + BounceConjuringActivityDetailInfo bounce_conjuring_info = 166; + BlitzRushActivityDetailInfo blitz_rush_info = 875; + ChessActivityDetailInfo chess_info = 1460; + SumoActivityDetailInfo sumo_info = 1433; + MoonfinTrialActivityDetailInfo moonfin_trial_info = 1010; + LunaRiteDetailInfo luna_rite_info = 921; + PlantFlowerActivityDetailInfo plant_flower_info = 289; + MusicGameActivityDetailInfo music_game_info = 490; + RoguelikeDungeonActivityDetailInfo roguelike_dungoen_info = 108; + DigActivityDetailInfo dig_info = 1721; + HachiActivityDetailInfo hachi_info = 1432; + WinterCampActivityDetailInfo winter_camp_info = 275; + PotionActivityDetailInfo potion_info = 1069; + TanukiTravelActivityDetailInfo tanuki_travel_activity_info = 22; + LanternRiteActivityDetailInfo lantern_rite_activity_info = 1809; + MichiaeMatsuriActivityDetailInfo michiae_matsuri_info = 635; + BartenderActivityDetailInfo bartender_info = 162; + UgcActivityDetailInfo ugc_info = 25; + CrystalLinkActivityDetailInfo crystal_link_info = 1427; + IrodoriActivityDetailInfo irodori_info = 2031; + PhotoActivityDetailInfo photo_info = 1971; + SpiceActivityDetailInfo spice_info = 1463; + GachaActivityDetailInfo gacha_info = 1869; + LuminanceStoneChallengeActivityDetailInfo luminance_stone_challenge_info = 1272; + RogueDiaryActivityDetailInfo rogue_diary_info = 1148; + SummerTimeV2DetailInfo summer_time_v2_info = 1413; + IslandPartyDetailInfo island_party_info = 708; + GearActivityDetailInfo gear_info = 1415; + GravenInnocenceDetailInfo graven_innocence_info = 1508; + InstableSprayDetailInfo instable_spray_info = 1694; + MuqadasPotionActivityDetailInfo muqadas_potion_info = 1232; + TreasureSeelieActivityDetailInfo treasure_seelie_info = 315; + RockBoardExploreDetailInfo rock_board_explore_info = 821; + VintageActivityDetailInfo vintage_info = 1330; + WindFieldDetailInfo wind_field_info = 1399; + FungusFighterDetailInfo fungus_fighter_info = 1549; + CharAmusementDetailInfo char_amusement_info = 1548; + EffigyChallengeV2DetailInfo effigy_challenge_info = 388; + CoinCollectDetailInfo coin_collect_info = 954; + BrickBreakerDetailInfo brick_breaker_info = 2012; + DuelHeartDetailInfo duel_heart_info = 1666; + SeaLampV3DetailInfo sea_lamp_v3_info = 574; + TeamChainDetailInfo team_chain_info = 937; + ElectroherculesBattleDetailInfo electrohercules_battle_info = 116; + GCGFestivalDetailInfo gcg_festival_info = 1486; + FleurFairV2DetailInfo fleur_fair_v2_info = 662; + FungusFighterV2DetailInfo fungus_fighter_v2_info = 790; + AkaFesDetailInfo aka_fes_info = 486; + SandwormCannonDetailInfo sandworm_cannon_detail_info = 1690; + SorushTrialDetailInfo sorush_trial_info = 1147; + MPCBEPPJBHA EOGBJAIIMGD = 1720; + FFKMNCKOPHD GPINLKNMFFK = 618; + LFDOHAHCGAN EIEBOHPGOHB = 1505; + DPMOKIKIFAI ABBKIICBKFG = 1349; + } } - diff --git a/proto/ActivityInfoNotify.proto b/proto/ActivityInfoNotify.proto index 2a059392..c49a7f58 100644 --- a/proto/ActivityInfoNotify.proto +++ b/proto/ActivityInfoNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ActivityInfo.proto"; // CmdId: 2086 +// Obf: LBHPBHMPCND message ActivityInfoNotify { ActivityInfo activity_info = 2; } diff --git a/proto/ActivityPushTipsData.proto b/proto/ActivityPushTipsData.proto index ddcbaf5e..5d36b014 100644 --- a/proto/ActivityPushTipsData.proto +++ b/proto/ActivityPushTipsData.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ActivityPushTipsState.proto"; +// Obf: PAGNHNLLIPL message ActivityPushTipsData { ActivityPushTipsState state = 14; uint32 activity_push_tips_id = 5; diff --git a/proto/ActivityPushTipsState.proto b/proto/ActivityPushTipsState.proto index 849002eb..b8844aa2 100644 --- a/proto/ActivityPushTipsState.proto +++ b/proto/ActivityPushTipsState.proto @@ -19,8 +19,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: OPOLNPOBLMB enum ActivityPushTipsState { - ActivityPushTipsState_None = 0; - ActivityPushTipsState_Start = 1; - ActivityPushTipsState_Read = 2; + ACTIVITY_PUSH_TIPS_STATE_NONE = 0; + ACTIVITY_PUSH_TIPS_STATE_START = 1; + ACTIVITY_PUSH_TIPS_STATE_READ = 2; } diff --git a/proto/ActivityScheduleInfo.proto b/proto/ActivityScheduleInfo.proto index ce9f1df0..8f7dff39 100644 --- a/proto/ActivityScheduleInfo.proto +++ b/proto/ActivityScheduleInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: GJIJNIDNLEF message ActivityScheduleInfo { uint32 schedule_id = 6; uint32 begin_time = 3; diff --git a/proto/ActivityScheduleInfoNotify.proto b/proto/ActivityScheduleInfoNotify.proto index d8444390..54198596 100644 --- a/proto/ActivityScheduleInfoNotify.proto +++ b/proto/ActivityScheduleInfoNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ActivityScheduleInfo.proto"; // CmdId: 2107 +// Obf: HHEIHADMIIN message ActivityScheduleInfoNotify { uint32 remain_fly_sea_lamp_num = 5; repeated ActivityScheduleInfo activity_schedule_list = 12; diff --git a/proto/ActivityShopSheetInfo.proto b/proto/ActivityShopSheetInfo.proto index 6e8a646b..bd25984e 100644 --- a/proto/ActivityShopSheetInfo.proto +++ b/proto/ActivityShopSheetInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: GFKOLJPJAAA message ActivityShopSheetInfo { uint32 sheet_id = 9; uint32 end_time = 3; diff --git a/proto/ActivityTakeWatcherRewardReq.proto b/proto/ActivityTakeWatcherRewardReq.proto index f1ccb5cd..e09a3097 100644 --- a/proto/ActivityTakeWatcherRewardReq.proto +++ b/proto/ActivityTakeWatcherRewardReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2085 +// Obf: LEAMDAPFCIP message ActivityTakeWatcherRewardReq { uint32 watcher_id = 11; uint32 activity_id = 1; diff --git a/proto/ActivityTakeWatcherRewardRsp.proto b/proto/ActivityTakeWatcherRewardRsp.proto index 45a0e645..c91e8aca 100644 --- a/proto/ActivityTakeWatcherRewardRsp.proto +++ b/proto/ActivityTakeWatcherRewardRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2111 +// Obf: BHBNNEDNMOG message ActivityTakeWatcherRewardRsp { int32 retcode = 6; uint32 activity_id = 8; diff --git a/proto/ActivityUpdateWatcherNotify.proto b/proto/ActivityUpdateWatcherNotify.proto index 293f1069..78b7a08a 100644 --- a/proto/ActivityUpdateWatcherNotify.proto +++ b/proto/ActivityUpdateWatcherNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ActivityWatcherInfo.proto"; // CmdId: 2007 +// Obf: JCOLCLFIFCO message ActivityUpdateWatcherNotify { uint32 activity_id = 14; ActivityWatcherInfo watcher_info = 9; diff --git a/proto/ActivityWatcherInfo.proto b/proto/ActivityWatcherInfo.proto index 60935f66..7c0a0953 100644 --- a/proto/ActivityWatcherInfo.proto +++ b/proto/ActivityWatcherInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: IIEEKCMJDAI message ActivityWatcherInfo { uint32 total_progress = 15; uint32 cur_progress = 1; diff --git a/proto/AddBackupAvatarTeamReq.proto b/proto/AddBackupAvatarTeamReq.proto index 0099c497..6ac9b92d 100644 --- a/proto/AddBackupAvatarTeamReq.proto +++ b/proto/AddBackupAvatarTeamReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1638 +// Obf: DHMGMLAKAEN message AddBackupAvatarTeamReq { } diff --git a/proto/AddBackupAvatarTeamRsp.proto b/proto/AddBackupAvatarTeamRsp.proto index cccf929c..e97ec94a 100644 --- a/proto/AddBackupAvatarTeamRsp.proto +++ b/proto/AddBackupAvatarTeamRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1649 +// Obf: NBINNKHJLNA message AddBackupAvatarTeamRsp { int32 retcode = 5; } diff --git a/proto/AddBlacklistRsp.proto b/proto/AddBlacklistRsp.proto new file mode 100644 index 00000000..f2e97271 --- /dev/null +++ b/proto/AddBlacklistRsp.proto @@ -0,0 +1,28 @@ +// 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 "FriendBrief.proto"; +// CmdId: 4005 +// Obf: HJIPHKBMIEL +message AddBlacklistRsp { + FriendBrief target_friend_brief = 9; + int32 retcode = 10; +} diff --git a/proto/AddNoGachaAvatarCardNotify.proto b/proto/AddNoGachaAvatarCardNotify.proto index d8ed5a97..fff23745 100644 --- a/proto/AddNoGachaAvatarCardNotify.proto +++ b/proto/AddNoGachaAvatarCardNotify.proto @@ -21,12 +21,13 @@ option java_package = "emu.grasscutter.net.proto"; import "AddNoGachaAvatarCardTransferItem.proto"; // CmdId: 1794 +// Obf: AGOKHIGKIPO message AddNoGachaAvatarCardNotify { uint32 avatar_id = 7; - uint32 initial_level = 2; + uint32 initial_promote_level = 2; uint32 item_id = 1; uint32 reason = 8; - uint32 initial_promote_level = 5; + uint32 initial_level = 5; bool is_transfer_to_item = 9; repeated AddNoGachaAvatarCardTransferItem transfer_item_list = 14; } diff --git a/proto/AddNoGachaAvatarCardTransferItem.proto b/proto/AddNoGachaAvatarCardTransferItem.proto index eecf82eb..08c13d57 100644 --- a/proto/AddNoGachaAvatarCardTransferItem.proto +++ b/proto/AddNoGachaAvatarCardTransferItem.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: AGNHEKAOCEH message AddNoGachaAvatarCardTransferItem { bool is_new = 5; uint32 count = 14; diff --git a/proto/AddQuestContentProgressReq.proto b/proto/AddQuestContentProgressReq.proto index 378fe494..ad399942 100644 --- a/proto/AddQuestContentProgressReq.proto +++ b/proto/AddQuestContentProgressReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 448 +// Obf: JIFDPGDHNAF message AddQuestContentProgressReq { uint32 add_progress = 11; uint32 content_type = 15; diff --git a/proto/AddQuestContentProgressRsp.proto b/proto/AddQuestContentProgressRsp.proto index 3f106af5..56a22e6b 100644 --- a/proto/AddQuestContentProgressRsp.proto +++ b/proto/AddQuestContentProgressRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 458 +// Obf: LHMBHBPCAIL message AddQuestContentProgressRsp { uint32 content_type = 2; int32 retcode = 10; diff --git a/proto/AddRandTaskInfoNotify.proto b/proto/AddRandTaskInfoNotify.proto new file mode 100644 index 00000000..482135dc --- /dev/null +++ b/proto/AddRandTaskInfoNotify.proto @@ -0,0 +1,28 @@ +// 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"; +// CmdId: 110 +// Obf: HPHBIEGDFGM +message AddRandTaskInfoNotify { + Vector pos = 14; + uint32 rand_task_id = 5; +} diff --git a/proto/AdjustTrackingInfo.proto b/proto/AdjustTrackingInfo.proto index df23c7ff..97534bf6 100644 --- a/proto/AdjustTrackingInfo.proto +++ b/proto/AdjustTrackingInfo.proto @@ -19,11 +19,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: IEMLLFGMPCI message AdjustTrackingInfo { - string EJFLMNNJJAK = 6; - string OEHKOOLEJPI = 5; - string OPMJBGJMAKN = 2; - string FINPNCIHIGE = 9; - string NOEINBFGKKM = 11; - string AFCJKOMEDMK = 15; + string LKKFJNDEIAB = 6; + string DLKIMODBMME = 5; + string JEKNGABCEOG = 2; + string BBLFIMANGAD = 9; + string AJCKEINKHMB = 11; + string PACALGLDIGB = 15; } diff --git a/proto/AiSkillCdInfo.proto b/proto/AiSkillCdInfo.proto index b4b75d36..5443d983 100644 --- a/proto/AiSkillCdInfo.proto +++ b/proto/AiSkillCdInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: EIAFDAJNOBI message AiSkillCdInfo { map skill_cd_map = 1; map skill_group_cd_map = 6; diff --git a/proto/AiSyncInfo.proto b/proto/AiSyncInfo.proto index 08fbc55d..e74a419b 100644 --- a/proto/AiSyncInfo.proto +++ b/proto/AiSyncInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: LDLPBJOIHEO message AiSyncInfo { uint32 entity_id = 2; bool is_self_killing = 7; diff --git a/proto/AiThreatInfo.proto b/proto/AiThreatInfo.proto index d1e9fd1c..f10a9bc1 100644 --- a/proto/AiThreatInfo.proto +++ b/proto/AiThreatInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: IDODLGIKFOA message AiThreatInfo { map ai_threat_map = 4; } diff --git a/proto/AkaFesDetailInfo.proto b/proto/AkaFesDetailInfo.proto new file mode 100644 index 00000000..b7bc79ab --- /dev/null +++ b/proto/AkaFesDetailInfo.proto @@ -0,0 +1,36 @@ +// 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 "CMDMHNMLEBD.proto"; +import "JJFAPPOGLLE.proto"; +import "AKEBNLHDNPG.proto"; +import "EDMLKGMOBLK.proto"; +import "CIAJIBCPGKL.proto"; +import "BKDCMHLFHMC.proto"; +// Obf: EDJJPNEEFNE +message AkaFesDetailInfo { + CMDMHNMLEBD IIAMHKKGHFO = 1; + JJFAPPOGLLE CIEGJJKCJFC = 6; + AKEBNLHDNPG IBIIDGBEANP = 7; + EDMLKGMOBLK potion_info = 13; + CIAJIBCPGKL DNMDFPIOKNM = 5; + BKDCMHLFHMC LGPFKPCHKJA = 2; +} diff --git a/proto/AllWidgetDataNotify.proto b/proto/AllWidgetDataNotify.proto index 4efbe468..0c7da98c 100644 --- a/proto/AllWidgetDataNotify.proto +++ b/proto/AllWidgetDataNotify.proto @@ -26,12 +26,13 @@ import "AnchorPointData.proto"; import "SkyCrystalDetectorData.proto"; import "WidgetSlotData.proto"; import "ClientCollectorData.proto"; -import "FGNNOLDBLNO.proto"; +import "WidgetCameraInfo.proto"; import "OneoffGatherPointDetectorData.proto"; // CmdId: 4274 +// Obf: KKFGPLOAPPM message AllWidgetDataNotify { - uint32 EHHHNEBOJIL = 1745; - uint32 next_anchor_point_usable_time = 9; + uint32 EDDCGLBMNLB = 1745; + uint32 AIOOKJNCEEL = 9; repeated WidgetCoolDownData coolDownGroupDataList = 13; LunchBoxData lunch_box_data = 14; WeatherWizardData weather_wizard_data = 7; @@ -40,8 +41,8 @@ message AllWidgetDataNotify { repeated WidgetSlotData slot_list = 5; repeated ClientCollectorData client_collector_data_list = 15; repeated WidgetCoolDownData normalCoolDownDataList = 8; - repeated uint32 KOGFHEKEJPP = 1276; + repeated uint32 ENNIJLCIBGH = 1276; repeated uint32 background_active_widget_list = 3; - FGNNOLDBLNO FCJNDHLBMOE = 2; + WidgetCameraInfo MHDAHEDKPMG = 2; repeated OneoffGatherPointDetectorData oneoff_gather_point_detector_data_list = 12; } diff --git a/proto/AnchorPointData.proto b/proto/AnchorPointData.proto index 457ddca2..d2137d55 100644 --- a/proto/AnchorPointData.proto +++ b/proto/AnchorPointData.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; +// Obf: JKCHIBPNIHL message AnchorPointData { uint32 anchor_point_id = 8; Vector pos = 11; diff --git a/proto/AnimatorParameterValueInfo.proto b/proto/AnimatorParameterValueInfo.proto index 77341404..4dff5446 100644 --- a/proto/AnimatorParameterValueInfo.proto +++ b/proto/AnimatorParameterValueInfo.proto @@ -19,11 +19,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: OJKLMOMAPKN message AnimatorParameterValueInfo { uint32 para_type = 1; oneof paraVal { - int32 KCLCBKOKNJA = 2; - float POHJNJOIHMK = 3; - bool GJGKGDPJJMM = 4; + int32 int_val = 2; + float float_val = 3; + bool bool_val = 4; } } diff --git a/proto/AnimatorParameterValueInfoPair.proto b/proto/AnimatorParameterValueInfoPair.proto index 81a18bee..e0a7d0b1 100644 --- a/proto/AnimatorParameterValueInfoPair.proto +++ b/proto/AnimatorParameterValueInfoPair.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AnimatorParameterValueInfo.proto"; +// Obf: HDPEDMCMNHN message AnimatorParameterValueInfoPair { int32 name_id = 1; AnimatorParameterValueInfo animator_para = 2; diff --git a/proto/AnnounceData.proto b/proto/AnnounceData.proto index 6bacd8db..511c8092 100644 --- a/proto/AnnounceData.proto +++ b/proto/AnnounceData.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: EJALGEOEIMH message AnnounceData { bool is_center_system_last_5_every_minutes = 14; uint32 end_time = 10; diff --git a/proto/AntiAddictNotify.proto b/proto/AntiAddictNotify.proto index 6cebad39..6672819b 100644 --- a/proto/AntiAddictNotify.proto +++ b/proto/AntiAddictNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 189 +// Obf: AIJFKNJPJNM message AntiAddictNotify { int32 msg_type = 6; string msg = 10; diff --git a/proto/ArenaChallengeActivityDetailInfo.proto b/proto/ArenaChallengeActivityDetailInfo.proto new file mode 100644 index 00000000..897c0d58 --- /dev/null +++ b/proto/ArenaChallengeActivityDetailInfo.proto @@ -0,0 +1,29 @@ +// 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 "ArenaChallengeMonsterLevel.proto"; +// Obf: HMIIGENHBNM +message ArenaChallengeActivityDetailInfo { + bool is_finish_any_level = 8; + uint32 world_level = 4; + repeated ArenaChallengeMonsterLevel level_list = 12; + map level_open_time_map = 1; +} diff --git a/proto/ArenaChallengeMonsterLevel.proto b/proto/ArenaChallengeMonsterLevel.proto new file mode 100644 index 00000000..c04d6f7b --- /dev/null +++ b/proto/ArenaChallengeMonsterLevel.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +// Obf: DEOAPDFEJGL +message ArenaChallengeMonsterLevel { + uint32 DBPEAEAANPG = 11; + uint32 PEPMDOACJNL = 13; +} diff --git a/proto/AskAddFriendNotify.proto b/proto/AskAddFriendNotify.proto index e082bfd8..d6deb2a2 100644 --- a/proto/AskAddFriendNotify.proto +++ b/proto/AskAddFriendNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "FriendBrief.proto"; // CmdId: 4033 +// Obf: FAFJPCFKENC message AskAddFriendNotify { uint32 target_uid = 14; FriendBrief target_friend_brief = 12; diff --git a/proto/AskAddFriendReq.proto b/proto/AskAddFriendReq.proto index 34189b7c..16011958 100644 --- a/proto/AskAddFriendReq.proto +++ b/proto/AskAddFriendReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4055 +// Obf: DFDLEHDMCMD message AskAddFriendReq { uint32 target_uid = 1; } diff --git a/proto/AskAddFriendRsp.proto b/proto/AskAddFriendRsp.proto index 5a0db6ff..98fa90df 100644 --- a/proto/AskAddFriendRsp.proto +++ b/proto/AskAddFriendRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4048 +// Obf: HLILMLBMHLG message AskAddFriendRsp { int32 retcode = 3; uint32 target_uid = 4; diff --git a/proto/AsterActivityDetailInfo.proto b/proto/AsterActivityDetailInfo.proto new file mode 100644 index 00000000..af5b57a3 --- /dev/null +++ b/proto/AsterActivityDetailInfo.proto @@ -0,0 +1,37 @@ +// 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 "AsterProgressDetailInfo.proto"; +import "AsterLittleDetailInfo.proto"; +import "AsterLargeDetailInfo.proto"; +import "AsterMidDetailInfo.proto"; +// Obf: NAIBJIHKMIK +message AsterActivityDetailInfo { + uint32 CBLMAGNNCGK = 6; + AsterProgressDetailInfo aster_progress = 11; + bool is_content_closed = 5; + bool is_special_reward_taken = 4; + AsterLittleDetailInfo aster_little = 3; + AsterLargeDetailInfo aster_large = 7; + AsterMidDetailInfo aster_mid = 8; + uint32 content_close_time = 9; + uint32 CGOCPLCJMBA = 12; +} diff --git a/proto/AsterLargeDetailInfo.proto b/proto/AsterLargeDetailInfo.proto new file mode 100644 index 00000000..1dcdaae0 --- /dev/null +++ b/proto/AsterLargeDetailInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +// Obf: PKLHDBCCFOJ +message AsterLargeDetailInfo { + bool is_open = 11; + uint32 begin_time = 9; +} diff --git a/proto/AsterLittleDetailInfo.proto b/proto/AsterLittleDetailInfo.proto new file mode 100644 index 00000000..1fc44695 --- /dev/null +++ b/proto/AsterLittleDetailInfo.proto @@ -0,0 +1,30 @@ +// 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 "AsterLittleStageState.proto"; +// Obf: LGDFNBJMBAB +message AsterLittleDetailInfo { + uint32 stage_id = 9; + AsterLittleStageState stage_state = 7; + uint32 stage_begin_time = 14; + uint32 begin_time = 4; + bool is_open = 5; +} diff --git a/proto/AsterLittleStageState.proto b/proto/AsterLittleStageState.proto new file mode 100644 index 00000000..978b35f5 --- /dev/null +++ b/proto/AsterLittleStageState.proto @@ -0,0 +1,28 @@ +// 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: KBCJBKKNMMJ +enum AsterLittleStageState { + ASTER_LITTLE_STAGE_NONE = 0; + ASTER_LITTLE_STAGE_UNSTARTED = 1; + ASTER_LITTLE_STAGE_STARTED = 2; + ASTER_LITTLE_STAGE_FINISHED = 3; +} diff --git a/proto/AsterMidCampInfo.proto b/proto/AsterMidCampInfo.proto new file mode 100644 index 00000000..77558a7a --- /dev/null +++ b/proto/AsterMidCampInfo.proto @@ -0,0 +1,27 @@ +// 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: MJEKKMFIINK +message AsterMidCampInfo { + uint32 camp_id = 3; + Vector pos = 14; +} diff --git a/proto/AsterMidDetailInfo.proto b/proto/AsterMidDetailInfo.proto new file mode 100644 index 00000000..3ed9657c --- /dev/null +++ b/proto/AsterMidDetailInfo.proto @@ -0,0 +1,29 @@ +// 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 "AsterMidCampInfo.proto"; +// Obf: LCEADPMNHGH +message AsterMidDetailInfo { + bool is_open = 9; + uint32 collect_count = 4; + uint32 begin_time = 12; + repeated AsterMidCampInfo camp_list = 8; +} diff --git a/proto/AsterProgressDetailInfo.proto b/proto/AsterProgressDetailInfo.proto new file mode 100644 index 00000000..d7c663b1 --- /dev/null +++ b/proto/AsterProgressDetailInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +// Obf: MMEFLEOFLND +message AsterProgressDetailInfo { + uint32 count = 12; + uint32 last_auto_add_time = 1; +} diff --git a/proto/AttackHitEffectResult.proto b/proto/AttackHitEffectResult.proto new file mode 100644 index 00000000..aaedb2ca --- /dev/null +++ b/proto/AttackHitEffectResult.proto @@ -0,0 +1,30 @@ +// 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: PBAFNBPPAND +message AttackHitEffectResult { + float hitHaltTime = 6; + float hitHaltTimeScale = 2; + float retreatStrength = 14; + float airStrength = 13; + uint32 IDJFCEPGOOF = 5; + uint32 ODEDPMCMFNN = 8; +} diff --git a/proto/AttackResult.proto b/proto/AttackResult.proto index f792e74b..0151a8d4 100644 --- a/proto/AttackResult.proto +++ b/proto/AttackResult.proto @@ -19,39 +19,40 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "PBAFNBPPAND.proto"; -import "LFGGJIKICHD.proto"; +import "AttackHitEffectResult.proto"; +import "HitCollision.proto"; import "Vector.proto"; import "AbilityIdentifier.proto"; +// Obf: BEFCMFBPFGN message AttackResult { - uint32 JAKHCJPHJLL = 1198; - uint32 OONEBGMOEAE = 82; - uint32 NNNBJOBCAAG = 1624; - uint32 FLFJCNLIKLN = 6; - float ADMGNLDFHNM = 2018; - uint32 IJKHPENHIBE = 1640; + uint32 GNHFHCDDDBA = 1198; + uint32 BHAPFDKHNPD = 82; + uint32 PJJEEPKBHIM = 1624; + uint32 KDBNEJKOKDB = 6; + float HKDJFJDCKBI = 2018; + uint32 LADOHMHIICA = 1640; int32 hit_retreat_angle_compat = 10; - PBAFNBPPAND JAHOFNMOLNP = 15; - uint32 JJJGHBCJODJ = 1178; - float KMGLDEFLMEC = 804; - bool IBPABJOFDON = 7; + AttackHitEffectResult hit_eff_result = 15; + uint32 HAGEIJIIBAE = 1178; + float GGPOMBNHHCA = 804; + bool KBKKCNLMPHE = 7; uint32 element_type = 8; - uint32 FMEOFJLGHEB = 1597; - uint32 HHLNNKNHNDI = 1235; - bool MMKKDLCEAMF = 78; - uint32 LOAGDOPBKHC = 1; - uint32 PFDPGNNKHIC = 158; + uint32 CNCOJEJPNAH = 1597; + uint32 KDBJJLGHGBD = 1235; + bool IFHLFNMODNC = 78; + uint32 BIIDCDNCFPH = 1; + uint32 AFPDNEPONHN = 158; uint32 attacker_id = 13; uint32 defense_id = 4; string anim_event_id = 5; float damage = 11; - LFGGJIKICHD BDJAOEIOAAG = 2; - bool ANOIGIKGJLP = 1765; - uint32 DOAKEOLAJEM = 1772; + HitCollision hit_collision = 2; + bool PFEKJJINPCE = 1765; + uint32 BNONIMILAAH = 1772; Vector resolved_dir = 3; - uint32 MCDCPBKDBND = 316; - float KGLMAKCMPIH = 979; + uint32 OJPOIAJBPCN = 316; + float EAGHFGPNGHD = 979; AbilityIdentifier ability_identifier = 12; - bool EILCFJCPIPH = 309; - float HAEGEEJHOGG = 1660; + bool GMKBKKOFIPN = 309; + float CBBCOOIFNCP = 1660; } diff --git a/proto/AvatarAddNotify.proto b/proto/AvatarAddNotify.proto index 5d351167..ccce9bff 100644 --- a/proto/AvatarAddNotify.proto +++ b/proto/AvatarAddNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AvatarInfo.proto"; // CmdId: 1758 +// Obf: FPOFHEKPNPK message AvatarAddNotify { bool is_in_team = 9; AvatarInfo avatar = 3; diff --git a/proto/AvatarChangeCostumeNotify.proto b/proto/AvatarChangeCostumeNotify.proto index a945230a..f92b1ad4 100644 --- a/proto/AvatarChangeCostumeNotify.proto +++ b/proto/AvatarChangeCostumeNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "SceneEntityInfo.proto"; // CmdId: 1743 +// Obf: APKBPLBGEOP message AvatarChangeCostumeNotify { SceneEntityInfo entity_info = 9; } diff --git a/proto/AvatarChangeCostumeReq.proto b/proto/AvatarChangeCostumeReq.proto index f67c781f..59ac0b7b 100644 --- a/proto/AvatarChangeCostumeReq.proto +++ b/proto/AvatarChangeCostumeReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1683 +// Obf: CHHPFFOGJEK message AvatarChangeCostumeReq { uint64 avatar_guid = 5; uint32 costume_id = 10; diff --git a/proto/AvatarChangeCostumeRsp.proto b/proto/AvatarChangeCostumeRsp.proto index 05cfb12d..9668105f 100644 --- a/proto/AvatarChangeCostumeRsp.proto +++ b/proto/AvatarChangeCostumeRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1625 +// Obf: LECIDBKINPN message AvatarChangeCostumeRsp { uint64 avatar_guid = 9; int32 retcode = 12; diff --git a/proto/AvatarChangeElementTypeReq.proto b/proto/AvatarChangeElementTypeReq.proto index 3ed5302a..1182de40 100644 --- a/proto/AvatarChangeElementTypeReq.proto +++ b/proto/AvatarChangeElementTypeReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1634 +// Obf: ICBGFMJPIKM message AvatarChangeElementTypeReq { uint32 area_id = 3; uint32 scene_id = 6; diff --git a/proto/AvatarChangeElementTypeRsp.proto b/proto/AvatarChangeElementTypeRsp.proto index 7bfb841f..9c13493d 100644 --- a/proto/AvatarChangeElementTypeRsp.proto +++ b/proto/AvatarChangeElementTypeRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1757 +// Obf: GJCJIIEOIJP message AvatarChangeElementTypeRsp { int32 retcode = 1; } diff --git a/proto/AvatarDataNotify.proto b/proto/AvatarDataNotify.proto index 755c61e5..4c91128c 100644 --- a/proto/AvatarDataNotify.proto +++ b/proto/AvatarDataNotify.proto @@ -23,6 +23,7 @@ import "AvatarRenameInfo.proto"; import "AvatarTeam.proto"; import "AvatarInfo.proto"; // CmdId: 1768 +// Obf: IACLEPKJMNB message AvatarDataNotify { repeated uint32 owned_costume_list = 10; repeated uint32 backup_avatar_team_order_list = 6; diff --git a/proto/AvatarDieAnimationEndReq.proto b/proto/AvatarDieAnimationEndReq.proto index ee575e75..d4542e88 100644 --- a/proto/AvatarDieAnimationEndReq.proto +++ b/proto/AvatarDieAnimationEndReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; // CmdId: 1619 +// Obf: PINLKDHNFPM message AvatarDieAnimationEndReq { Vector reborn_pos = 15; uint32 skill_id = 4; diff --git a/proto/AvatarDieAnimationEndRsp.proto b/proto/AvatarDieAnimationEndRsp.proto index 491727c9..fa1f500f 100644 --- a/proto/AvatarDieAnimationEndRsp.proto +++ b/proto/AvatarDieAnimationEndRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1621 +// Obf: DBPKLLBDNMP message AvatarDieAnimationEndRsp { uint32 skill_id = 10; int32 retcode = 9; diff --git a/proto/AvatarEnterSceneInfo.proto b/proto/AvatarEnterSceneInfo.proto index d5de47b7..8a1ebc8f 100644 --- a/proto/AvatarEnterSceneInfo.proto +++ b/proto/AvatarEnterSceneInfo.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ServerBuff.proto"; import "AbilitySyncStateInfo.proto"; +// Obf: BIMCKGCPDOF message AvatarEnterSceneInfo { repeated ServerBuff server_buff_list = 7; AbilitySyncStateInfo avatar_ability_info = 1; diff --git a/proto/AvatarEquipAffixInfo.proto b/proto/AvatarEquipAffixInfo.proto index 9bdfed46..8fdd5ebc 100644 --- a/proto/AvatarEquipAffixInfo.proto +++ b/proto/AvatarEquipAffixInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: MPLMIMHAFOJ message AvatarEquipAffixInfo { uint32 equip_affix_id = 1; uint32 left_cd_time = 2; diff --git a/proto/AvatarEquipAffixStartNotify.proto b/proto/AvatarEquipAffixStartNotify.proto index d07005ec..bd854b53 100644 --- a/proto/AvatarEquipAffixStartNotify.proto +++ b/proto/AvatarEquipAffixStartNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AvatarEquipAffixInfo.proto"; // CmdId: 1612 +// Obf: LCJLCHOKPMM message AvatarEquipAffixStartNotify { AvatarEquipAffixInfo equip_affix_info = 1; uint64 avatar_guid = 15; diff --git a/proto/AvatarEquipChangeNotify.proto b/proto/AvatarEquipChangeNotify.proto index 0456ba32..7ca629b3 100644 --- a/proto/AvatarEquipChangeNotify.proto +++ b/proto/AvatarEquipChangeNotify.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "SceneReliquaryInfo.proto"; import "SceneWeaponInfo.proto"; // CmdId: 638 +// Obf: FFELKMJCIEF message AvatarEquipChangeNotify { uint32 equip_type = 7; uint64 avatar_guid = 14; diff --git a/proto/AvatarExcelInfo.proto b/proto/AvatarExcelInfo.proto index d496496d..35fb9292 100644 --- a/proto/AvatarExcelInfo.proto +++ b/proto/AvatarExcelInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: NNEHENIKCMK message AvatarExcelInfo { uint64 prefab_path_hash = 1; uint64 prefab_path_remote_hash = 2; diff --git a/proto/AvatarExpeditionAllDataReq.proto b/proto/AvatarExpeditionAllDataReq.proto index aeff2ce2..b8067a7d 100644 --- a/proto/AvatarExpeditionAllDataReq.proto +++ b/proto/AvatarExpeditionAllDataReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1665 +// Obf: PNEIGBDCOON message AvatarExpeditionAllDataReq { } diff --git a/proto/AvatarExpeditionAllDataRsp.proto b/proto/AvatarExpeditionAllDataRsp.proto index 64a551e0..7e7f7b6c 100644 --- a/proto/AvatarExpeditionAllDataRsp.proto +++ b/proto/AvatarExpeditionAllDataRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AvatarExpeditionInfo.proto"; // CmdId: 1722 +// Obf: FIOCIHFCAPH message AvatarExpeditionAllDataRsp { map expedition_info_map = 14; uint32 expedition_count_limit = 10; diff --git a/proto/AvatarExpeditionCallBackReq.proto b/proto/AvatarExpeditionCallBackReq.proto index 57152107..fd2c6751 100644 --- a/proto/AvatarExpeditionCallBackReq.proto +++ b/proto/AvatarExpeditionCallBackReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1796 +// Obf: IGPFBMDCNDC message AvatarExpeditionCallBackReq { repeated uint64 avatar_guid = 11; } diff --git a/proto/AvatarExpeditionCallBackRsp.proto b/proto/AvatarExpeditionCallBackRsp.proto index 8a7c5758..662040d7 100644 --- a/proto/AvatarExpeditionCallBackRsp.proto +++ b/proto/AvatarExpeditionCallBackRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AvatarExpeditionInfo.proto"; // CmdId: 1708 +// Obf: CJLJANJBPEI message AvatarExpeditionCallBackRsp { map expedition_info_map = 12; int32 retcode = 8; diff --git a/proto/AvatarExpeditionDataNotify.proto b/proto/AvatarExpeditionDataNotify.proto index e4ec0cea..98755603 100644 --- a/proto/AvatarExpeditionDataNotify.proto +++ b/proto/AvatarExpeditionDataNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AvatarExpeditionInfo.proto"; // CmdId: 1660 +// Obf: PIBEOOOINOF message AvatarExpeditionDataNotify { map expedition_info_map = 6; } diff --git a/proto/AvatarExpeditionGetRewardReq.proto b/proto/AvatarExpeditionGetRewardReq.proto index cd510883..6e470e75 100644 --- a/proto/AvatarExpeditionGetRewardReq.proto +++ b/proto/AvatarExpeditionGetRewardReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1648 +// Obf: LBDKANCAKAL message AvatarExpeditionGetRewardReq { uint64 avatar_guid = 12; } diff --git a/proto/AvatarExpeditionGetRewardRsp.proto b/proto/AvatarExpeditionGetRewardRsp.proto index 14b3c759..8f1f3e13 100644 --- a/proto/AvatarExpeditionGetRewardRsp.proto +++ b/proto/AvatarExpeditionGetRewardRsp.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AvatarExpeditionInfo.proto"; import "ItemParam.proto"; // CmdId: 1763 +// Obf: OGJINPEMNDO message AvatarExpeditionGetRewardRsp { int32 retcode = 7; map expedition_info_map = 8; diff --git a/proto/AvatarExpeditionInfo.proto b/proto/AvatarExpeditionInfo.proto index df61ea0a..7328951c 100644 --- a/proto/AvatarExpeditionInfo.proto +++ b/proto/AvatarExpeditionInfo.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AvatarExpeditionState.proto"; +// Obf: DPCLGNACIJE message AvatarExpeditionInfo { AvatarExpeditionState state = 1; uint32 exp_id = 2; diff --git a/proto/AvatarExpeditionStartReq.proto b/proto/AvatarExpeditionStartReq.proto index 16849b6a..b9cc926c 100644 --- a/proto/AvatarExpeditionStartReq.proto +++ b/proto/AvatarExpeditionStartReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1691 +// Obf: LONEJHBMOFM message AvatarExpeditionStartReq { uint32 hour_time = 11; uint32 exp_id = 6; diff --git a/proto/AvatarExpeditionStartRsp.proto b/proto/AvatarExpeditionStartRsp.proto index cfc9e134..54a7eff1 100644 --- a/proto/AvatarExpeditionStartRsp.proto +++ b/proto/AvatarExpeditionStartRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AvatarExpeditionInfo.proto"; // CmdId: 1620 +// Obf: NAIJPHNIAIE message AvatarExpeditionStartRsp { int32 retcode = 12; map expedition_info_map = 15; diff --git a/proto/AvatarExpeditionState.proto b/proto/AvatarExpeditionState.proto index d696cb02..9364ace0 100644 --- a/proto/AvatarExpeditionState.proto +++ b/proto/AvatarExpeditionState.proto @@ -19,10 +19,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: LICFNNPLLLA enum AvatarExpeditionState { - AvatarExpeditionState_AvatarExpeditionNone = 0; - AvatarExpeditionState_AvatarExpeditionDoing = 1; - AvatarExpeditionState_AvatarExpeditionFinishWaitReward = 2; - AvatarExpeditionState_AvatarExpeditionCallbackWaitReward = 3; - AvatarExpeditionState_AvatarExpeditionLocked = 4; + AVATAR_EXPEDITION_NONE = 0; + AVATAR_EXPEDITION_DOING = 1; + AVATAR_EXPEDITION_FINISH_WAIT_REWARD = 2; + AVATAR_EXPEDITION_CALLBACK_WAIT_REWARD = 3; + AVATAR_EXPEDITION_LOCKED = 4; } diff --git a/proto/AvatarFetterDataNotify.proto b/proto/AvatarFetterDataNotify.proto index 9993a35b..c4446106 100644 --- a/proto/AvatarFetterDataNotify.proto +++ b/proto/AvatarFetterDataNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AvatarFetterInfo.proto"; // CmdId: 1775 +// Obf: OGBCMAKENBC message AvatarFetterDataNotify { map fetter_info_map = 12; } diff --git a/proto/AvatarFetterInfo.proto b/proto/AvatarFetterInfo.proto index 49854a75..8cfd3411 100644 --- a/proto/AvatarFetterInfo.proto +++ b/proto/AvatarFetterInfo.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "FetterData.proto"; +// Obf: NLBKEEANDPH message AvatarFetterInfo { uint32 exp_number = 1; uint32 exp_level = 2; diff --git a/proto/AvatarFetterLevelRewardReq.proto b/proto/AvatarFetterLevelRewardReq.proto index 4bfe82c8..23b3720b 100644 --- a/proto/AvatarFetterLevelRewardReq.proto +++ b/proto/AvatarFetterLevelRewardReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1656 +// Obf: ELIDOKACJNB message AvatarFetterLevelRewardReq { uint32 fetter_level = 7; uint64 avatar_guid = 2; diff --git a/proto/AvatarFetterLevelRewardRsp.proto b/proto/AvatarFetterLevelRewardRsp.proto index c928db42..6d13e6ec 100644 --- a/proto/AvatarFetterLevelRewardRsp.proto +++ b/proto/AvatarFetterLevelRewardRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1732 +// Obf: CLPAKFGDIPA message AvatarFetterLevelRewardRsp { uint64 avatar_guid = 3; uint32 fetter_level = 12; diff --git a/proto/AvatarFightPropNotify.proto b/proto/AvatarFightPropNotify.proto index 0a665a29..4a4795ed 100644 --- a/proto/AvatarFightPropNotify.proto +++ b/proto/AvatarFightPropNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1255 +// Obf: PGOGFGMAJFD message AvatarFightPropNotify { map fight_prop_map = 2; uint64 avatar_guid = 12; diff --git a/proto/AvatarFightPropUpdateNotify.proto b/proto/AvatarFightPropUpdateNotify.proto index 779a6398..8cfaab90 100644 --- a/proto/AvatarFightPropUpdateNotify.proto +++ b/proto/AvatarFightPropUpdateNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1248 +// Obf: BDCHKNLKJGP message AvatarFightPropUpdateNotify { uint64 avatar_guid = 4; map fight_prop_map = 14; diff --git a/proto/AvatarFlycloakChangeNotify.proto b/proto/AvatarFlycloakChangeNotify.proto index 62db5439..97f78000 100644 --- a/proto/AvatarFlycloakChangeNotify.proto +++ b/proto/AvatarFlycloakChangeNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1692 +// Obf: FAGIELPBEPG message AvatarFlycloakChangeNotify { uint64 avatar_guid = 11; uint32 flycloak_id = 10; diff --git a/proto/AvatarFollowRouteNotify.proto b/proto/AvatarFollowRouteNotify.proto index 519f2b11..d30deda1 100644 --- a/proto/AvatarFollowRouteNotify.proto +++ b/proto/AvatarFollowRouteNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Route.proto"; // CmdId: 3166 +// Obf: BOHDJDBDKHO message AvatarFollowRouteNotify { Route route = 4; uint32 template_id = 13; diff --git a/proto/AvatarGainCostumeNotify.proto b/proto/AvatarGainCostumeNotify.proto index e85c755c..9c369177 100644 --- a/proto/AvatarGainCostumeNotify.proto +++ b/proto/AvatarGainCostumeNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1645 +// Obf: CALPEEFDPGK message AvatarGainCostumeNotify { uint32 costume_id = 1; } diff --git a/proto/AvatarGainFlycloakNotify.proto b/proto/AvatarGainFlycloakNotify.proto index 120dbbfc..b12d3086 100644 --- a/proto/AvatarGainFlycloakNotify.proto +++ b/proto/AvatarGainFlycloakNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1654 +// Obf: OPFMGFIPHEE message AvatarGainFlycloakNotify { uint32 flycloak_id = 6; } diff --git a/proto/AvatarInfo.proto b/proto/AvatarInfo.proto index 46264984..f863fa9d 100644 --- a/proto/AvatarInfo.proto +++ b/proto/AvatarInfo.proto @@ -27,6 +27,7 @@ import "AvatarExpeditionState.proto"; import "AvatarEquipAffixInfo.proto"; import "AvatarExcelInfo.proto"; import "OOOHGLFDFCI.proto"; +// Obf: PLKMIPEBLOO message AvatarInfo { uint32 avatar_id = 1; uint64 guid = 2; @@ -54,5 +55,5 @@ message AvatarInfo { uint32 costume_id = 25; AvatarExcelInfo excel_info = 26; uint32 anim_hash = 27; - OOOHGLFDFCI HAHFIJDCNJH = 28; + OOOHGLFDFCI BAPGEFOMGBH = 28; } diff --git a/proto/AvatarLifeStateChangeNotify.proto b/proto/AvatarLifeStateChangeNotify.proto index 29e9f19b..d2872b7b 100644 --- a/proto/AvatarLifeStateChangeNotify.proto +++ b/proto/AvatarLifeStateChangeNotify.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "PlayerDieType.proto"; import "ServerBuff.proto"; // CmdId: 1235 +// Obf: GNABNGDFLJM message AvatarLifeStateChangeNotify { PlayerDieType die_type = 11; string attack_tag = 4; diff --git a/proto/AvatarPromoteReq.proto b/proto/AvatarPromoteReq.proto index ac7aeb2d..b6f657ce 100644 --- a/proto/AvatarPromoteReq.proto +++ b/proto/AvatarPromoteReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1674 +// Obf: BKHILKDGFFF message AvatarPromoteReq { uint64 guid = 4; } diff --git a/proto/AvatarPromoteRsp.proto b/proto/AvatarPromoteRsp.proto index 8112c943..0210c3e4 100644 --- a/proto/AvatarPromoteRsp.proto +++ b/proto/AvatarPromoteRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1726 +// Obf: HADHOJAJMCO message AvatarPromoteRsp { uint64 guid = 13; int32 retcode = 15; diff --git a/proto/AvatarPropChangeReasonNotify.proto b/proto/AvatarPropChangeReasonNotify.proto index a319a249..8b382651 100644 --- a/proto/AvatarPropChangeReasonNotify.proto +++ b/proto/AvatarPropChangeReasonNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "PropChangeReason.proto"; // CmdId: 1287 +// Obf: AEMDBFPBGMN message AvatarPropChangeReasonNotify { PropChangeReason reason = 9; uint32 prop_type = 4; diff --git a/proto/AvatarPropNotify.proto b/proto/AvatarPropNotify.proto index 7314b48e..00ff7ecb 100644 --- a/proto/AvatarPropNotify.proto +++ b/proto/AvatarPropNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1284 +// Obf: JEKDLLGKIMN message AvatarPropNotify { uint64 avatar_guid = 1; map prop_map = 7; diff --git a/proto/AvatarRenameInfo.proto b/proto/AvatarRenameInfo.proto index eda5ff71..21aab1c6 100644 --- a/proto/AvatarRenameInfo.proto +++ b/proto/AvatarRenameInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: NFELDEIIPPJ message AvatarRenameInfo { uint32 avatar_id = 12; string avatar_name = 10; diff --git a/proto/AvatarRenameInfoNotify.proto b/proto/AvatarRenameInfoNotify.proto index 600fcafe..8b03a378 100644 --- a/proto/AvatarRenameInfoNotify.proto +++ b/proto/AvatarRenameInfoNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AvatarRenameInfo.proto"; // CmdId: 1730 +// Obf: OCMOBFMMGOO message AvatarRenameInfoNotify { repeated AvatarRenameInfo avatar_rename_list = 10; } diff --git a/proto/AvatarSatiationData.proto b/proto/AvatarSatiationData.proto index 2d868f75..9fbdeb69 100644 --- a/proto/AvatarSatiationData.proto +++ b/proto/AvatarSatiationData.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: FFMALMEHHFM message AvatarSatiationData { float finish_time = 14; float penalty_finish_time = 1; diff --git a/proto/AvatarSatiationDataNotify.proto b/proto/AvatarSatiationDataNotify.proto index 1bdc1d43..5bd29e73 100644 --- a/proto/AvatarSatiationDataNotify.proto +++ b/proto/AvatarSatiationDataNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AvatarSatiationData.proto"; // CmdId: 1783 +// Obf: HHNBCCJGEDB message AvatarSatiationDataNotify { repeated AvatarSatiationData satiation_data_list = 6; } diff --git a/proto/AvatarSkillChangeNotify.proto b/proto/AvatarSkillChangeNotify.proto index 1a41a26c..73f877e3 100644 --- a/proto/AvatarSkillChangeNotify.proto +++ b/proto/AvatarSkillChangeNotify.proto @@ -20,11 +20,12 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1034 +// Obf: KOJPEIHKJHL message AvatarSkillChangeNotify { uint32 entity_id = 4; uint64 avatar_guid = 14; uint32 avatar_skill_id = 1; - uint32 old_level = 9; - uint32 cur_level = 7; + uint32 cur_level = 9; + uint32 old_level = 7; uint32 skill_depot_id = 11; } diff --git a/proto/AvatarSkillDepotChangeNotify.proto b/proto/AvatarSkillDepotChangeNotify.proto index 980c2d59..927a8e67 100644 --- a/proto/AvatarSkillDepotChangeNotify.proto +++ b/proto/AvatarSkillDepotChangeNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1072 +// Obf: GIIGEGLFMMB message AvatarSkillDepotChangeNotify { uint64 avatar_guid = 4; uint32 core_proud_skill_level = 1; diff --git a/proto/AvatarSkillInfo.proto b/proto/AvatarSkillInfo.proto index dde2b615..e9652906 100644 --- a/proto/AvatarSkillInfo.proto +++ b/proto/AvatarSkillInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: LJGFAMEDAGO message AvatarSkillInfo { uint32 pass_cd_time = 1; repeated uint32 full_cd_time_list = 2; diff --git a/proto/AvatarSkillInfoNotify.proto b/proto/AvatarSkillInfoNotify.proto index 72b4e827..17b768a8 100644 --- a/proto/AvatarSkillInfoNotify.proto +++ b/proto/AvatarSkillInfoNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AvatarSkillInfo.proto"; // CmdId: 1035 +// Obf: ECFIAOJHBFD message AvatarSkillInfoNotify { map skill_map = 4; uint64 guid = 15; diff --git a/proto/AvatarSkillMaxChargeCountNotify.proto b/proto/AvatarSkillMaxChargeCountNotify.proto index 79248ab6..75f674d7 100644 --- a/proto/AvatarSkillMaxChargeCountNotify.proto +++ b/proto/AvatarSkillMaxChargeCountNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1058 +// Obf: MEHNGPGKFOL message AvatarSkillMaxChargeCountNotify { uint32 max_charge_count = 3; uint64 avatar_guid = 12; diff --git a/proto/AvatarSkillUpgradeReq.proto b/proto/AvatarSkillUpgradeReq.proto index 8a0db3b4..3c72d38f 100644 --- a/proto/AvatarSkillUpgradeReq.proto +++ b/proto/AvatarSkillUpgradeReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1064 +// Obf: MDDPDCJCKCB message AvatarSkillUpgradeReq { uint32 old_level = 10; uint64 avatar_guid = 2; diff --git a/proto/AvatarSkillUpgradeRsp.proto b/proto/AvatarSkillUpgradeRsp.proto index e330ee83..6065b1ab 100644 --- a/proto/AvatarSkillUpgradeRsp.proto +++ b/proto/AvatarSkillUpgradeRsp.proto @@ -20,10 +20,11 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1021 +// Obf: KHCOMHBCLEP message AvatarSkillUpgradeRsp { int32 retcode = 8; uint64 avatar_guid = 6; uint32 cur_level = 12; - uint32 old_level = 3; - uint32 avatar_skill_id = 5; + uint32 avatar_skill_id = 3; + uint32 old_level = 5; } diff --git a/proto/AvatarTeam.proto b/proto/AvatarTeam.proto index 689b2683..553e63f0 100644 --- a/proto/AvatarTeam.proto +++ b/proto/AvatarTeam.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: MPFLGNHCAGM message AvatarTeam { repeated uint64 avatar_guid_list = 11; string team_name = 2; diff --git a/proto/AvatarTeamAllDataNotify.proto b/proto/AvatarTeamAllDataNotify.proto index 926e0ea3..e2e8e85a 100644 --- a/proto/AvatarTeamAllDataNotify.proto +++ b/proto/AvatarTeamAllDataNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AvatarTeam.proto"; // CmdId: 1702 +// Obf: FEKFDJEAMMK message AvatarTeamAllDataNotify { map avatar_team_map = 4; repeated uint32 backup_avatar_team_order_list = 1; diff --git a/proto/AvatarTeamResonanceInfo.proto b/proto/AvatarTeamResonanceInfo.proto index 18e8ac76..9e38b26a 100644 --- a/proto/AvatarTeamResonanceInfo.proto +++ b/proto/AvatarTeamResonanceInfo.proto @@ -19,9 +19,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: NIENBIDGPFK message AvatarTeamResonanceInfo { - repeated uint32 DHFEFDALIJA = 14; - repeated uint32 KAJJKLGMIME = 1; + repeated uint32 add_team_resonance_id_list = 14; + repeated uint32 del_team_resonance_id_list = 1; uint64 avatar_guid = 12; uint32 entity_id = 8; } diff --git a/proto/AvatarTeamUpdateNotify.proto b/proto/AvatarTeamUpdateNotify.proto index dade09a8..439a57e6 100644 --- a/proto/AvatarTeamUpdateNotify.proto +++ b/proto/AvatarTeamUpdateNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AvatarTeam.proto"; // CmdId: 1633 +// Obf: NFCODIPLJGM message AvatarTeamUpdateNotify { repeated uint64 temp_avatar_guid_list = 11; map avatar_team_map = 7; diff --git a/proto/AvatarType.proto b/proto/AvatarType.proto index 8d2d2c03..c791533d 100644 --- a/proto/AvatarType.proto +++ b/proto/AvatarType.proto @@ -19,9 +19,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: GEAOCPFMLEP enum AvatarType { - AvatarType_None = 0; - AvatarType_Formal = 1; - AvatarType_Trial = 2; - AvatarType_Mirror = 3; + AVATAR_TYPE_NONE = 0; + AVATAR_TYPE_FORMAL = 1; + AVATAR_TYPE_TRIAL = 2; + AVATAR_TYPE_MIRROR = 3; } diff --git a/proto/AvatarUnlockTalentNotify.proto b/proto/AvatarUnlockTalentNotify.proto index 1e6f348b..0184558d 100644 --- a/proto/AvatarUnlockTalentNotify.proto +++ b/proto/AvatarUnlockTalentNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1002 +// Obf: EHAHCGECFJH message AvatarUnlockTalentNotify { uint32 talent_id = 7; uint32 skill_depot_id = 15; diff --git a/proto/AvatarUpgradeReq.proto b/proto/AvatarUpgradeReq.proto index a5839686..dbd2f560 100644 --- a/proto/AvatarUpgradeReq.proto +++ b/proto/AvatarUpgradeReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1629 +// Obf: FEBHFJCIKEH message AvatarUpgradeReq { uint64 avatar_guid = 12; uint32 count = 1; diff --git a/proto/AvatarUpgradeRsp.proto b/proto/AvatarUpgradeRsp.proto index ed6b2d13..402a4b29 100644 --- a/proto/AvatarUpgradeRsp.proto +++ b/proto/AvatarUpgradeRsp.proto @@ -20,11 +20,12 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1695 +// Obf: JJBMNICCKDE message AvatarUpgradeRsp { - map cur_fight_prop_map = 12; + map old_fight_prop_map = 12; uint64 avatar_guid = 8; - uint32 old_level = 14; - map old_fight_prop_map = 13; + uint32 cur_level = 14; + map cur_fight_prop_map = 13; int32 retcode = 10; - uint32 cur_level = 4; + uint32 old_level = 4; } diff --git a/proto/AvatarWearFlycloakReq.proto b/proto/AvatarWearFlycloakReq.proto index 8256c745..11712a63 100644 --- a/proto/AvatarWearFlycloakReq.proto +++ b/proto/AvatarWearFlycloakReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1759 +// Obf: KEBBHMNJCFL message AvatarWearFlycloakReq { uint64 avatar_guid = 3; uint32 flycloak_id = 7; diff --git a/proto/AvatarWearFlycloakRsp.proto b/proto/AvatarWearFlycloakRsp.proto index 20d334c8..90a12d46 100644 --- a/proto/AvatarWearFlycloakRsp.proto +++ b/proto/AvatarWearFlycloakRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1733 +// Obf: GMOAIAOMOGM message AvatarWearFlycloakRsp { uint64 avatar_guid = 14; int32 retcode = 9; diff --git a/proto/BKDCMHLFHMC.proto b/proto/BKDCMHLFHMC.proto new file mode 100644 index 00000000..5e4a5386 --- /dev/null +++ b/proto/BKDCMHLFHMC.proto @@ -0,0 +1,25 @@ +// 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 "MLMOJDGCFBN.proto"; +message BKDCMHLFHMC { + repeated MLMOJDGCFBN stage_info_list = 14; +} diff --git a/proto/BackMyWorldRsp.proto b/proto/BackMyWorldRsp.proto index 4744f36e..1dfebe2e 100644 --- a/proto/BackMyWorldRsp.proto +++ b/proto/BackMyWorldRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 213 +// Obf: GGOPGGHJKAH message BackMyWorldRsp { int32 retcode = 2; } diff --git a/proto/BartenderActivityDetailInfo.proto b/proto/BartenderActivityDetailInfo.proto new file mode 100644 index 00000000..1985e52b --- /dev/null +++ b/proto/BartenderActivityDetailInfo.proto @@ -0,0 +1,32 @@ +// 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 "BartenderTaskInfo.proto"; +import "BartenderLevelInfo.proto"; +// Obf: GEBFJGCMKNA +message BartenderActivityDetailInfo { + bool is_develop_module_open = 1; + repeated BartenderTaskInfo unlock_task_list = 5; + repeated BartenderLevelInfo unlock_level_list = 9; + repeated uint32 DNLJPHOBILO = 4; + repeated uint32 GILMKAGINJM = 8; + bool is_content_closed = 7; +} diff --git a/proto/BartenderLevelInfo.proto b/proto/BartenderLevelInfo.proto new file mode 100644 index 00000000..a13090dc --- /dev/null +++ b/proto/BartenderLevelInfo.proto @@ -0,0 +1,27 @@ +// 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: JDJKNHLKPBC +message BartenderLevelInfo { + bool is_finish = 11; + uint32 id = 6; + uint32 max_score = 5; +} diff --git a/proto/BartenderTaskInfo.proto b/proto/BartenderTaskInfo.proto new file mode 100644 index 00000000..ab3b6ffa --- /dev/null +++ b/proto/BartenderTaskInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +// Obf: LPJBJOMDBDA +message BartenderTaskInfo { + bool is_finish = 2; + uint32 id = 4; +} diff --git a/proto/BatchBuyGoodsReq.proto b/proto/BatchBuyGoodsReq.proto index 16cb4fab..b69778ca 100644 --- a/proto/BatchBuyGoodsReq.proto +++ b/proto/BatchBuyGoodsReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "BuyGoodsParam.proto"; // CmdId: 787 +// Obf: FFMEADKDEAL message BatchBuyGoodsReq { uint32 shop_type = 10; repeated BuyGoodsParam buy_goods_list = 5; diff --git a/proto/BatchBuyGoodsRsp.proto b/proto/BatchBuyGoodsRsp.proto index f46355cc..70382cbd 100644 --- a/proto/BatchBuyGoodsRsp.proto +++ b/proto/BatchBuyGoodsRsp.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ShopGoods.proto"; import "BuyGoodsParam.proto"; // CmdId: 730 +// Obf: EIJEMIJEBLP message BatchBuyGoodsRsp { repeated ShopGoods goods_list = 5; int32 retcode = 8; diff --git a/proto/BattlePassAllDataNotify.proto b/proto/BattlePassAllDataNotify.proto index 5777df6a..a99259a5 100644 --- a/proto/BattlePassAllDataNotify.proto +++ b/proto/BattlePassAllDataNotify.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "BattlePassSchedule.proto"; import "BattlePassMission.proto"; // CmdId: 2628 +// Obf: PKMIHDNNEJI message BattlePassAllDataNotify { BattlePassSchedule cur_schedule = 8; repeated BattlePassMission mission_list = 7; diff --git a/proto/BattlePassCurScheduleUpdateNotify.proto b/proto/BattlePassCurScheduleUpdateNotify.proto index 99191896..0c24c6c7 100644 --- a/proto/BattlePassCurScheduleUpdateNotify.proto +++ b/proto/BattlePassCurScheduleUpdateNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "BattlePassSchedule.proto"; // CmdId: 2621 +// Obf: JNGCODHNGLG message BattlePassCurScheduleUpdateNotify { bool have_cur_schedule = 10; BattlePassSchedule cur_schedule = 14; diff --git a/proto/BattlePassCycle.proto b/proto/BattlePassCycle.proto index 7c0bf44b..8352d679 100644 --- a/proto/BattlePassCycle.proto +++ b/proto/BattlePassCycle.proto @@ -1,12 +1,27 @@ +// 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"; -// Name: JNLPHKAEDIO +// Obf: OIFDHDIINHH message BattlePassCycle { - uint32 end_time = 12; - uint32 cycle_idx = 13; - uint32 begin_time = 11; + uint32 begin_time = 14; + uint32 cycle_idx = 7; + uint32 end_time = 8; } - diff --git a/proto/BattlePassMission.proto b/proto/BattlePassMission.proto index 95bc4a75..16046838 100644 --- a/proto/BattlePassMission.proto +++ b/proto/BattlePassMission.proto @@ -19,13 +19,15 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: MACHHBHOKFD message BattlePassMission { + // Obf: GFAOOELANLH enum MissionStatus { - MISSION_STATUS_INVALID = 0; - MISSION_STATUS_UNFINISHED = 1; - MISSION_STATUS_FINISHED = 2; - MISSION_STATUS_POINT_TAKEN = 3; - } + MISSION_STATUS_INVALID = 0; + MISSION_STATUS_UNFINISHED = 1; + MISSION_STATUS_FINISHED = 2; + MISSION_STATUS_POINT_TAKEN = 3; + } uint32 mission_type = 11; uint32 cur_progress = 4; diff --git a/proto/BattlePassMissionDelNotify.proto b/proto/BattlePassMissionDelNotify.proto index cdd8371b..cb011bd4 100644 --- a/proto/BattlePassMissionDelNotify.proto +++ b/proto/BattlePassMissionDelNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2637 +// Obf: EHBCMBGNEAI message BattlePassMissionDelNotify { repeated uint32 del_mission_id_list = 9; } diff --git a/proto/BattlePassMissionUpdateNotify.proto b/proto/BattlePassMissionUpdateNotify.proto index f7b929df..aaeb68e0 100644 --- a/proto/BattlePassMissionUpdateNotify.proto +++ b/proto/BattlePassMissionUpdateNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "BattlePassMission.proto"; // CmdId: 2608 +// Obf: JOKICBOOOGF message BattlePassMissionUpdateNotify { repeated BattlePassMission mission_list = 9; } diff --git a/proto/BattlePassProduct.proto b/proto/BattlePassProduct.proto index 98aa7c5d..38120eba 100644 --- a/proto/BattlePassProduct.proto +++ b/proto/BattlePassProduct.proto @@ -1,12 +1,27 @@ +// 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"; -// Name: ENLKHNPEPCL +// Obf: CMKPIEPINGG message BattlePassProduct { - string normalProductId = 13; - string extraProductId = 10; - string upgradeProductId = 7; + string extra_product_id = 13; + string normal_product_id = 5; + string upgrade_product_id = 4; } - diff --git a/proto/BattlePassRewardTag.proto b/proto/BattlePassRewardTag.proto index 90dbc7cc..3daa6e1c 100644 --- a/proto/BattlePassRewardTag.proto +++ b/proto/BattlePassRewardTag.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "BattlePassUnlockStatus.proto"; +// Obf: ELGNPEENBBA message BattlePassRewardTag { uint32 level = 14; BattlePassUnlockStatus unlock_status = 10; diff --git a/proto/BattlePassRewardTakeOption.proto b/proto/BattlePassRewardTakeOption.proto index a684edb9..db41dcd0 100644 --- a/proto/BattlePassRewardTakeOption.proto +++ b/proto/BattlePassRewardTakeOption.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "BattlePassRewardTag.proto"; +// Obf: ADIBKPFDGAE message BattlePassRewardTakeOption { BattlePassRewardTag tag = 8; uint32 option_idx = 11; diff --git a/proto/BattlePassSchedule.proto b/proto/BattlePassSchedule.proto index f3241443..241cf8ba 100644 --- a/proto/BattlePassSchedule.proto +++ b/proto/BattlePassSchedule.proto @@ -23,17 +23,18 @@ import "BattlePassCycle.proto"; import "BattlePassUnlockStatus.proto"; import "BattlePassProduct.proto"; import "BattlePassRewardTag.proto"; +// Obf: HPPNLINPMJC message BattlePassSchedule { BattlePassCycle cur_cycle = 13; - bool isExtraPaidRewardTaken = 12; + bool is_extra_paid_reward_taken = 12; uint32 point = 6; uint32 level = 5; - uint32 paidPlatformFlags = 14; - bool isViewed = 11; + uint32 cur_cycle_points = 14; + bool is_viewed = 11; BattlePassUnlockStatus unlock_status = 2; uint32 schedule_id = 4; uint32 begin_time = 1; - uint32 curCyclePoints = 15; + uint32 paid_platform_flags = 15; BattlePassProduct product_info = 7; uint32 end_time = 3; repeated BattlePassRewardTag reward_taken_list = 9; diff --git a/proto/BattlePassUnlockStatus.proto b/proto/BattlePassUnlockStatus.proto index 9556281b..c9cfd259 100644 --- a/proto/BattlePassUnlockStatus.proto +++ b/proto/BattlePassUnlockStatus.proto @@ -1,12 +1,27 @@ +// 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"; -// Name: LPJODIDIFIL +// Obf: GIJOJHBPCLK enum BattlePassUnlockStatus { BATTLE_PASS_UNLOCK_STATUS_INVALID = 0; BATTLE_PASS_UNLOCK_STATUS_FREE = 1; BATTLE_PASS_UNLOCK_STATUS_PAID = 2; } - diff --git a/proto/Birthday.proto b/proto/Birthday.proto index 0ad39a7a..53c0600f 100644 --- a/proto/Birthday.proto +++ b/proto/Birthday.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: CKNMHNJLNKL message Birthday { uint32 month = 1; uint32 day = 2; diff --git a/proto/BlessingActivityDetailInfo.proto b/proto/BlessingActivityDetailInfo.proto new file mode 100644 index 00000000..ce8f5246 --- /dev/null +++ b/proto/BlessingActivityDetailInfo.proto @@ -0,0 +1,32 @@ +// 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: ADEHLGOJCCD +message BlessingActivityDetailInfo { + uint32 FPHKONHPKMM = 14; + bool is_activated = 7; + uint32 AAIBFOBIENH = 10; + uint32 content_close_time = 11; + map pic_num_map = 2; + uint32 KPLPJGMNJCP = 4; + uint32 next_refresh_time = 6; + bool is_content_closed = 15; +} diff --git a/proto/BlitzRushActivityDetailInfo.proto b/proto/BlitzRushActivityDetailInfo.proto new file mode 100644 index 00000000..aa65aa82 --- /dev/null +++ b/proto/BlitzRushActivityDetailInfo.proto @@ -0,0 +1,30 @@ +// 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 "BlitzRushStage.proto"; +import "ParkourLevelInfo.proto"; +// Obf: OGOOALBIKDL +message BlitzRushActivityDetailInfo { + repeated BlitzRushStage stage_list = 13; + repeated ParkourLevelInfo parkour_level_info_list = 11; + bool is_content_closed = 8; + uint32 content_close_time = 3; +} diff --git a/proto/BlitzRushStage.proto b/proto/BlitzRushStage.proto new file mode 100644 index 00000000..d5bfee3f --- /dev/null +++ b/proto/BlitzRushStage.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +// Obf: LBDBMDFKMFC +message BlitzRushStage { + bool is_open = 10; + uint32 open_time = 2; +} diff --git a/proto/BlockInfo.proto b/proto/BlockInfo.proto index 2c3cc036..3cf8ea49 100644 --- a/proto/BlockInfo.proto +++ b/proto/BlockInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: DHOCHCOHKNB message BlockInfo { uint32 block_id = 1; uint32 data_version = 2; diff --git a/proto/BlossomBriefInfo.proto b/proto/BlossomBriefInfo.proto index 08d11afd..b9089d46 100644 --- a/proto/BlossomBriefInfo.proto +++ b/proto/BlossomBriefInfo.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; +// Obf: BNLFPPDNIEP message BlossomBriefInfo { uint32 city_id = 3; uint32 scene_id = 15; diff --git a/proto/BlossomBriefInfoNotify.proto b/proto/BlossomBriefInfoNotify.proto index bb913a69..339c84ad 100644 --- a/proto/BlossomBriefInfoNotify.proto +++ b/proto/BlossomBriefInfoNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "BlossomBriefInfo.proto"; // CmdId: 2702 +// Obf: PJJNBCKFMGE message BlossomBriefInfoNotify { repeated BlossomBriefInfo brief_info_list = 14; } diff --git a/proto/BlossomChestInfo.proto b/proto/BlossomChestInfo.proto index b93873a9..e2e8240d 100644 --- a/proto/BlossomChestInfo.proto +++ b/proto/BlossomChestInfo.proto @@ -1,15 +1,30 @@ +// 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"; -// Name: JGBHEKPGJOJ +// Obf: ADMOGMEBELJ message BlossomChestInfo { - uint32 resin = 1; - repeated uint32 qualify_uid_list = 2; - repeated uint32 remain_uid_list = 3; - uint32 dead_time = 4; - uint32 blossom_refresh_type = 5; - uint32 refresh_id = 6; + uint32 resin = 1; + repeated uint32 qualify_uid_list = 2; + repeated uint32 remain_uid_list = 3; + uint32 dead_time = 4; + uint32 blossom_refresh_type = 5; + uint32 refresh_id = 6; } - diff --git a/proto/BonusActivityInfo.proto b/proto/BonusActivityInfo.proto index fea5718f..c82055b2 100644 --- a/proto/BonusActivityInfo.proto +++ b/proto/BonusActivityInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: JOMIHJEJLBP message BonusActivityInfo { uint32 bonus_activity_id = 12; uint32 state = 1; diff --git a/proto/BonusActivityInfoReq.proto b/proto/BonusActivityInfoReq.proto index d108f16f..384d7350 100644 --- a/proto/BonusActivityInfoReq.proto +++ b/proto/BonusActivityInfoReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2521 +// Obf: FBLGPGPKKFK message BonusActivityInfoReq { } diff --git a/proto/BonusActivityInfoRsp.proto b/proto/BonusActivityInfoRsp.proto index f6749d49..4ea6ea52 100644 --- a/proto/BonusActivityInfoRsp.proto +++ b/proto/BonusActivityInfoRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "BonusActivityInfo.proto"; // CmdId: 2534 +// Obf: IPECEELMBPL message BonusActivityInfoRsp { int32 retcode = 7; repeated BonusActivityInfo bonus_activity_info_list = 3; diff --git a/proto/BonusOpActivityInfo.proto b/proto/BonusOpActivityInfo.proto index 5c8bcbca..2af37137 100644 --- a/proto/BonusOpActivityInfo.proto +++ b/proto/BonusOpActivityInfo.proto @@ -1,10 +1,25 @@ +// 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"; -// Name: IKECAOJEKPH +// Obf: MBPEIAOFFNP message BonusOpActivityInfo { - uint32 left_bonus_count = 12; + uint32 left_bonus_count = 11; } - diff --git a/proto/BossChestInfo.proto b/proto/BossChestInfo.proto index 30e643d2..57b10816 100644 --- a/proto/BossChestInfo.proto +++ b/proto/BossChestInfo.proto @@ -1,15 +1,30 @@ +// 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 "WeeklyBossResinDiscountInfo.proto"; - -// Name: COGBGNFGPGI +// Obf: EIFECCBEIPL message BossChestInfo { - uint32 monster_config_id = 1; - uint32 resin = 2; - repeated uint32 remain_uid_list = 3; - repeated uint32 qualify_uid_list = 4; - map uid_discount_map = 5; + uint32 monster_config_id = 1; + uint32 resin = 2; + repeated uint32 remain_uid_list = 3; + repeated uint32 qualify_uid_list = 4; + map uid_discount_map = 5; } - diff --git a/proto/BounceConjuringActivityDetailInfo.proto b/proto/BounceConjuringActivityDetailInfo.proto new file mode 100644 index 00000000..15a1c710 --- /dev/null +++ b/proto/BounceConjuringActivityDetailInfo.proto @@ -0,0 +1,28 @@ +// 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 "BounceConjuringChapterInfo.proto"; +// Obf: CFIHPDHBMCA +message BounceConjuringActivityDetailInfo { + bool is_content_closed = 4; + uint32 content_close_time = 14; + repeated BounceConjuringChapterInfo chapter_info_list = 11; +} diff --git a/proto/BounceConjuringChapterInfo.proto b/proto/BounceConjuringChapterInfo.proto new file mode 100644 index 00000000..3982d895 --- /dev/null +++ b/proto/BounceConjuringChapterInfo.proto @@ -0,0 +1,27 @@ +// 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: KGPOJMNNEAG +message BounceConjuringChapterInfo { + uint32 open_time = 9; + uint32 chapter_id = 11; + uint32 best_score = 10; +} diff --git a/proto/BreakoutAction.proto b/proto/BreakoutAction.proto index 6f015336..6704aa40 100644 --- a/proto/BreakoutAction.proto +++ b/proto/BreakoutAction.proto @@ -20,13 +20,15 @@ option java_package = "emu.grasscutter.net.proto"; import "BreakoutVector2.proto"; +// Obf: LAPCONCKKIG message BreakoutAction { + // Obf: LBKMLLJIKHB enum BreakoutActionType { - ActionTypeNone = 0; - ActionTypeLaunchBall = 1; - ActionTypeDestroyBall = 2; - ActionTypeFallingObject = 3; - ActionTypeMissile = 4; + ACTION_TYPE_NONE = 0; + ACTION_TYPE_LAUNCH_BALL = 1; + ACTION_TYPE_DESTROY_BALL = 2; + ACTION_TYPE_FALLING_OBJECT = 3; + ACTION_TYPE_MISSILE = 4; } BreakoutActionType action_type = 1; @@ -46,5 +48,5 @@ message BreakoutAction { BreakoutVector2 extra_ball_dir = 15; uint32 extra_ball_index = 16; int32 offset = 17; - uint64 ANLINOMCGEE = 18; + uint64 HPPJKHIDMIF = 18; } diff --git a/proto/BreakoutBrickInfo.proto b/proto/BreakoutBrickInfo.proto index 9d14f125..fd3c26db 100644 --- a/proto/BreakoutBrickInfo.proto +++ b/proto/BreakoutBrickInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: GFDMGCCDLMC message BreakoutBrickInfo { uint32 hp = 1; uint32 element_type = 2; diff --git a/proto/BreakoutElementReactionCounter.proto b/proto/BreakoutElementReactionCounter.proto index a9dd7ede..366c5344 100644 --- a/proto/BreakoutElementReactionCounter.proto +++ b/proto/BreakoutElementReactionCounter.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: ECLOAEHKMCA message BreakoutElementReactionCounter { uint32 element_reaction = 1; uint32 count = 2; diff --git a/proto/BreakoutPhysicalObject.proto b/proto/BreakoutPhysicalObject.proto index 922c5d8c..82570518 100644 --- a/proto/BreakoutPhysicalObject.proto +++ b/proto/BreakoutPhysicalObject.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "BreakoutVector2.proto"; import "BreakoutPhysicalObjectModifier.proto"; import "BreakoutBrickInfo.proto"; +// Obf: LKHNDFCFOPP message BreakoutPhysicalObject { uint32 id = 1; uint32 index = 2; diff --git a/proto/BreakoutPhysicalObjectModifier.proto b/proto/BreakoutPhysicalObjectModifier.proto index 98e9cac9..59ce9299 100644 --- a/proto/BreakoutPhysicalObjectModifier.proto +++ b/proto/BreakoutPhysicalObjectModifier.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: MJJIHNCKJAL message BreakoutPhysicalObjectModifier { uint32 type = 1; uint32 id = 2; diff --git a/proto/BreakoutSnapShot.proto b/proto/BreakoutSnapShot.proto index 09fae27a..8d9b9481 100644 --- a/proto/BreakoutSnapShot.proto +++ b/proto/BreakoutSnapShot.proto @@ -24,6 +24,7 @@ import "BreakoutAction.proto"; import "BreakoutSpawnPoint.proto"; import "BreakoutElementReactionCounter.proto"; import "BreakoutSyncConnectUidInfo.proto"; +// Obf: DHLCLOHBMIO message BreakoutSnapShot { uint64 client_game_time = 1; uint64 server_game_time = 2; diff --git a/proto/BreakoutSpawnPoint.proto b/proto/BreakoutSpawnPoint.proto index a2c43fe0..f0288101 100644 --- a/proto/BreakoutSpawnPoint.proto +++ b/proto/BreakoutSpawnPoint.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "BreakoutPhysicalObject.proto"; +// Obf: OCEKCPLEHCI message BreakoutSpawnPoint { uint32 id = 1; uint32 brick_suite_id = 2; diff --git a/proto/BreakoutSyncConnectUidInfo.proto b/proto/BreakoutSyncConnectUidInfo.proto index a83bc2e1..1df5ab8c 100644 --- a/proto/BreakoutSyncConnectUidInfo.proto +++ b/proto/BreakoutSyncConnectUidInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: EKLGADJMNAI message BreakoutSyncConnectUidInfo { uint32 uid = 1; repeated uint32 skill_id_list = 2; diff --git a/proto/BreakoutVector2.proto b/proto/BreakoutVector2.proto index 465c1885..02c54b44 100644 --- a/proto/BreakoutVector2.proto +++ b/proto/BreakoutVector2.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: FBODBKPINBJ message BreakoutVector2 { int32 x = 1; int32 y = 2; diff --git a/proto/BrickBreakerActivityStageInfo.proto b/proto/BrickBreakerActivityStageInfo.proto new file mode 100644 index 00000000..3700ece2 --- /dev/null +++ b/proto/BrickBreakerActivityStageInfo.proto @@ -0,0 +1,27 @@ +// 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: EAPLAEOEHNB +message BrickBreakerActivityStageInfo { + uint32 stage_id = 3; + bool HEGNICKAFFB = 10; + bool GLJHIOPBPNM = 13; +} diff --git a/proto/BrickBreakerDetailInfo.proto b/proto/BrickBreakerDetailInfo.proto new file mode 100644 index 00000000..d2a5b4ed --- /dev/null +++ b/proto/BrickBreakerDetailInfo.proto @@ -0,0 +1,30 @@ +// 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 "BrickBreakerLevelInfo.proto"; +import "BrickBreakerActivityStageInfo.proto"; +// Obf: CEFLLFIKKKH +message BrickBreakerDetailInfo { + repeated BrickBreakerLevelInfo GAAAMLJLIKD = 11; + repeated BrickBreakerActivityStageInfo stage_info_list = 3; + map skill_info_map = 10; + repeated BrickBreakerLevelInfo BIBOJMLPCHL = 13; +} diff --git a/proto/BrickBreakerLevelInfo.proto b/proto/BrickBreakerLevelInfo.proto new file mode 100644 index 00000000..46904e98 --- /dev/null +++ b/proto/BrickBreakerLevelInfo.proto @@ -0,0 +1,30 @@ +// 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: KDBGNEBONLF +message BrickBreakerLevelInfo { + uint32 max_score = 5; + uint32 level_id = 4; + bool BHFCMBEMGIN = 12; + repeated uint32 chosen_avatar_list = 11; + repeated uint32 chosen_skill_list = 15; + bool is_finish = 7; +} diff --git a/proto/BuoyantCombatDailyInfo.proto b/proto/BuoyantCombatDailyInfo.proto new file mode 100644 index 00000000..08865c93 --- /dev/null +++ b/proto/BuoyantCombatDailyInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +// Obf: ILGBPPFLPKF +message BuoyantCombatDailyInfo { + uint32 start_time = 7; + uint32 best_score = 11; +} diff --git a/proto/BuoyantCombatDetailInfo.proto b/proto/BuoyantCombatDetailInfo.proto new file mode 100644 index 00000000..483da309 --- /dev/null +++ b/proto/BuoyantCombatDetailInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "BuoyantCombatDailyInfo.proto"; +// Obf: KKAEOLMAJBG +message BuoyantCombatDetailInfo { + repeated BuoyantCombatDailyInfo daily_info_list = 9; +} diff --git a/proto/BuyBattlePassLevelReq.proto b/proto/BuyBattlePassLevelReq.proto index 1b084515..b2f0d2fb 100644 --- a/proto/BuyBattlePassLevelReq.proto +++ b/proto/BuyBattlePassLevelReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2631 +// Obf: JNGHDEIDOPE message BuyBattlePassLevelReq { uint32 buy_level = 13; } diff --git a/proto/BuyBattlePassLevelRsp.proto b/proto/BuyBattlePassLevelRsp.proto index 28e3c199..f9720267 100644 --- a/proto/BuyBattlePassLevelRsp.proto +++ b/proto/BuyBattlePassLevelRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2610 +// Obf: GGBICCLGPHC message BuyBattlePassLevelRsp { uint32 buy_level = 5; int32 retcode = 2; diff --git a/proto/BuyGoodsParam.proto b/proto/BuyGoodsParam.proto index f7eb86fa..baf7f39b 100644 --- a/proto/BuyGoodsParam.proto +++ b/proto/BuyGoodsParam.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ShopGoods.proto"; +// Obf: LPGBNMHAFFF message BuyGoodsParam { uint32 buy_count = 3; ShopGoods goods = 9; diff --git a/proto/BuyGoodsReq.proto b/proto/BuyGoodsReq.proto index ddb453c8..c634dbb1 100644 --- a/proto/BuyGoodsReq.proto +++ b/proto/BuyGoodsReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ShopGoods.proto"; // CmdId: 702 +// Obf: NJMDFFKEJKO message BuyGoodsReq { uint32 shop_type = 2; uint32 buy_count = 14; diff --git a/proto/BuyGoodsRsp.proto b/proto/BuyGoodsRsp.proto index 7c3a4261..48ed7b50 100644 --- a/proto/BuyGoodsRsp.proto +++ b/proto/BuyGoodsRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ShopGoods.proto"; // CmdId: 772 +// Obf: IBEBDIGLBGI message BuyGoodsRsp { uint32 shop_type = 6; repeated ShopGoods goods_list = 10; diff --git a/proto/BuyResinRsp.proto b/proto/BuyResinRsp.proto index e2004553..b134ce6b 100644 --- a/proto/BuyResinRsp.proto +++ b/proto/BuyResinRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 610 +// Obf: HLAPBCIAOBK message BuyResinRsp { uint32 cur_value = 1; int32 retcode = 15; diff --git a/proto/CCPLHHKMDPJ.proto b/proto/CCPLHHKMDPJ.proto new file mode 100644 index 00000000..250c74be --- /dev/null +++ b/proto/CCPLHHKMDPJ.proto @@ -0,0 +1,27 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +message CCPLHHKMDPJ { + uint32 APNDNCIJLKB = 9; + bool is_finish = 12; + bool is_open = 13; + uint32 level_id = 7; +} diff --git a/proto/CIAJIBCPGKL.proto b/proto/CIAJIBCPGKL.proto new file mode 100644 index 00000000..83bea908 --- /dev/null +++ b/proto/CIAJIBCPGKL.proto @@ -0,0 +1,25 @@ +// 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 "PMKDNBGDCIH.proto"; +message CIAJIBCPGKL { + repeated PMKDNBGDCIH level_info_list = 1; +} diff --git a/proto/CMDMHNMLEBD.proto b/proto/CMDMHNMLEBD.proto new file mode 100644 index 00000000..23ea2b32 --- /dev/null +++ b/proto/CMDMHNMLEBD.proto @@ -0,0 +1,25 @@ +// 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 "AMBJIMENFCF.proto"; +message CMDMHNMLEBD { + repeated AMBJIMENFCF level_info_list = 12; +} diff --git a/proto/CalcWeaponUpgradeReturnItemsReq.proto b/proto/CalcWeaponUpgradeReturnItemsReq.proto index 028b38a5..8ea6afb5 100644 --- a/proto/CalcWeaponUpgradeReturnItemsReq.proto +++ b/proto/CalcWeaponUpgradeReturnItemsReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; // CmdId: 615 +// Obf: CFEFEGAOMBF message CalcWeaponUpgradeReturnItemsReq { uint64 target_weapon_guid = 6; repeated uint64 food_weapon_guid_list = 13; diff --git a/proto/CalcWeaponUpgradeReturnItemsRsp.proto b/proto/CalcWeaponUpgradeReturnItemsRsp.proto index 9f4e38cf..cdb6a23c 100644 --- a/proto/CalcWeaponUpgradeReturnItemsRsp.proto +++ b/proto/CalcWeaponUpgradeReturnItemsRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; // CmdId: 619 +// Obf: KLAJDKIJABJ message CalcWeaponUpgradeReturnItemsRsp { int32 retcode = 10; repeated ItemParam item_param_list = 6; diff --git a/proto/CanUseSkillNotify.proto b/proto/CanUseSkillNotify.proto index f4776f86..b89e2cae 100644 --- a/proto/CanUseSkillNotify.proto +++ b/proto/CanUseSkillNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1016 +// Obf: PBIONEOKAFI message CanUseSkillNotify { bool is_can_use_skill = 10; } diff --git a/proto/CancelFinishParentQuestNotify.proto b/proto/CancelFinishParentQuestNotify.proto index b53f19c4..d4187d4c 100644 --- a/proto/CancelFinishParentQuestNotify.proto +++ b/proto/CancelFinishParentQuestNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 471 +// Obf: DDANCOPHEBB message CancelFinishParentQuestNotify { uint32 parent_quest_id = 10; } diff --git a/proto/CardProductRewardNotify.proto b/proto/CardProductRewardNotify.proto index bc80af1b..18ba70ae 100644 --- a/proto/CardProductRewardNotify.proto +++ b/proto/CardProductRewardNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4121 +// Obf: JJGBMKJCINL message CardProductRewardNotify { uint32 hcoin = 11; string product_id = 8; diff --git a/proto/ChallengeBrief.proto b/proto/ChallengeBrief.proto new file mode 100644 index 00000000..9260dee4 --- /dev/null +++ b/proto/ChallengeBrief.proto @@ -0,0 +1,28 @@ +// 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: HHKBKHDKCAG +message ChallengeBrief { + uint32 challenge_id = 5; + bool is_success = 10; + uint32 cur_progress = 12; + uint32 challenge_index = 4; +} diff --git a/proto/ChallengeDataNotify.proto b/proto/ChallengeDataNotify.proto index 55c9b134..7d9dff88 100644 --- a/proto/ChallengeDataNotify.proto +++ b/proto/ChallengeDataNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 968 +// Obf: LGGFHHBFBIL message ChallengeDataNotify { uint32 challenge_index = 10; uint32 param_index = 6; diff --git a/proto/ChallengeFinishType.proto b/proto/ChallengeFinishType.proto index d68ddb91..b76534e2 100644 --- a/proto/ChallengeFinishType.proto +++ b/proto/ChallengeFinishType.proto @@ -19,9 +19,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: PHCNFEJOOEJ enum ChallengeFinishType { - ChallengeFinishType_None = 0; - ChallengeFinishType_Fail = 1; - ChallengeFinishType_Succ = 2; - ChallengeFinishType_Pause = 3; + CHALLENGE_FINISH_TYPE_NONE = 0; + CHALLENGE_FINISH_TYPE_FAIL = 1; + CHALLENGE_FINISH_TYPE_SUCC = 2; + CHALLENGE_FINISH_TYPE_PAUSE = 3; } diff --git a/proto/ChangeAvatarReq.proto b/proto/ChangeAvatarReq.proto index bc1390df..4215a6c3 100644 --- a/proto/ChangeAvatarReq.proto +++ b/proto/ChangeAvatarReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; // CmdId: 1690 +// Obf: CDONCHPFNAE message ChangeAvatarReq { Vector move_pos = 3; bool is_move = 9; diff --git a/proto/ChangeAvatarRsp.proto b/proto/ChangeAvatarRsp.proto index 91547a1e..b9392fd5 100644 --- a/proto/ChangeAvatarRsp.proto +++ b/proto/ChangeAvatarRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1765 +// Obf: FHCHOLGOHIF message ChangeAvatarRsp { int32 retcode = 3; uint64 cur_guid = 4; diff --git a/proto/ChangeEnergyReason.proto b/proto/ChangeEnergyReason.proto index ca9b29f1..fb2d40d4 100644 --- a/proto/ChangeEnergyReason.proto +++ b/proto/ChangeEnergyReason.proto @@ -1,11 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Name: ELGOIMEMBFO +// Obf: GEHMDJHCOIE enum ChangeEnergyReason { - CHANGE_ENERGY_REASON_NONE = 0; - CHANGE_ENERGY_REASON_SKILL_START = 1; + CHANGE_ENERGY_REASON_NONE = 0; + CHANGE_ENERGY_REASON_SKILL_START = 1; } - diff --git a/proto/ChangeGameTimeReq.proto b/proto/ChangeGameTimeReq.proto index 3f322a9c..8ae47e84 100644 --- a/proto/ChangeGameTimeReq.proto +++ b/proto/ChangeGameTimeReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 187 +// Obf: OHDEMAPHAIN message ChangeGameTimeReq { uint32 game_time = 5; uint32 extra_days = 8; diff --git a/proto/ChangeGameTimeRsp.proto b/proto/ChangeGameTimeRsp.proto index d5d18eeb..53bafa41 100644 --- a/proto/ChangeGameTimeRsp.proto +++ b/proto/ChangeGameTimeRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 130 +// Obf: LABMPLOLGJJ message ChangeGameTimeRsp { int32 retcode = 2; uint32 extra_days = 14; diff --git a/proto/ChangeHpReason.proto b/proto/ChangeHpReason.proto index 056ed8cd..15e94f0b 100644 --- a/proto/ChangeHpReason.proto +++ b/proto/ChangeHpReason.proto @@ -1,40 +1,56 @@ +// 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"; -// Name: GFDBMHNEOFL +// Obf: DKMOJFDCKBB enum ChangeHpReason { - CHANGE_HP_REASON_NONE = 0; - CHANGE_HP_REASON_SUB_AVATAR = 1; - CHANGE_HP_REASON_SUB_MONSTER = 2; - CHANGE_HP_REASON_SUB_GEAR = 3; - CHANGE_HP_REASON_SUB_ENVIR = 4; - CHANGE_HP_REASON_SUB_FALL = 5; - CHANGE_HP_REASON_SUB_DRAWN = 6; - CHANGE_HP_REASON_SUB_ABYSS = 7; - CHANGE_HP_REASON_SUB_ABILITY = 8; - CHANGE_HP_REASON_SUB_SUMMON = 9; - CHANGE_HP_REASON_SUB_SCRIPT = 10; - CHANGE_HP_REASON_SUB_GM = 11; - CHANGE_HP_REASON_SUB_KILL_SELF = 12; - CHANGE_HP_REASON_SUB_CLIMATE_COLD = 13; - CHANGE_HP_REASON_SUB_STORM_LIGHTNING = 14; - CHANGE_HP_REASON_SUB_KILL_SERVER_GADGET = 15; - CHANGE_HP_REASON_SUB_REPLACE = 16; - CHANGE_HP_REASON_SUB_PLAYER_LEAVE = 17; - CHANGE_HP_REASON_ATTACK_BY_ENERGY = 18; - CHANGE_HP_REASON_ATTACK_BY_RECYCLE = 19; - CHANGE_HP_REASON_SUB_PLAYER_BACK = 20; - CHANGE_HP_REASON_BY_LUA = 51; - CHANGE_HP_REASON_ADD_ABILITY = 101; - CHANGE_HP_REASON_ADD_ITEM = 102; - CHANGE_HP_REASON_ADD_REVIVE = 103; - CHANGE_HP_REASON_ADD_UPGRADE = 104; - CHANGE_HP_REASON_ADD_STATUE = 105; - CHANGE_HP_REASON_ADD_BACKGROUND = 106; - CHANGE_HP_REASON_ADD_GM = 107; - CHANGE_HP_REASON_ADD_TRIAL_AVATAR_ACTIVITY = 108; - CHANGE_HP_REASON_ADD_ROGUELIKE_SPRING = 109; + CHANGE_HP_REASON_NONE = 0; + CHANGE_HP_REASON_SUB_AVATAR = 1; + CHANGE_HP_REASON_SUB_MONSTER = 2; + CHANGE_HP_REASON_SUB_GEAR = 3; + CHANGE_HP_REASON_SUB_ENVIR = 4; + CHANGE_HP_REASON_SUB_FALL = 5; + CHANGE_HP_REASON_SUB_DRAWN = 6; + CHANGE_HP_REASON_SUB_ABYSS = 7; + CHANGE_HP_REASON_SUB_ABILITY = 8; + CHANGE_HP_REASON_SUB_SUMMON = 9; + CHANGE_HP_REASON_SUB_SCRIPT = 10; + CHANGE_HP_REASON_SUB_GM = 11; + CHANGE_HP_REASON_SUB_KILL_SELF = 12; + CHANGE_HP_REASON_SUB_CLIMATE_COLD = 13; + CHANGE_HP_REASON_SUB_STORM_LIGHTNING = 14; + CHANGE_HP_REASON_SUB_KILL_SERVER_GADGET = 15; + CHANGE_HP_REASON_SUB_REPLACE = 16; + CHANGE_HP_REASON_SUB_PLAYER_LEAVE = 17; + CHANGE_HP_REASON_ATTACK_BY_ENERGY = 18; + CHANGE_HP_REASON_ATTACK_BY_RECYCLE = 19; + CHANGE_HP_REASON_SUB_PLAYER_BACK = 20; + CHANGE_HP_REASON_SUB_UGC = 21; + CHANGE_HP_REASON_BY_LUA = 51; + CHANGE_HP_REASON_ADD_ABILITY = 101; + CHANGE_HP_REASON_ADD_ITEM = 102; + CHANGE_HP_REASON_ADD_REVIVE = 103; + CHANGE_HP_REASON_ADD_UPGRADE = 104; + CHANGE_HP_REASON_ADD_STATUE = 105; + CHANGE_HP_REASON_ADD_BACKGROUND = 106; + CHANGE_HP_REASON_ADD_GM = 107; + CHANGE_HP_REASON_ADD_TRIAL_AVATAR_ACTIVITY = 108; + CHANGE_HP_REASON_ADD_ROGUELIKE_SPRING = 109; } - diff --git a/proto/ChangeMailStarNotify.proto b/proto/ChangeMailStarNotify.proto index 981cc8c5..8ace5022 100644 --- a/proto/ChangeMailStarNotify.proto +++ b/proto/ChangeMailStarNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1421 +// Obf: MJIPPMLPCIK message ChangeMailStarNotify { repeated uint32 mail_id_list = 13; bool is_star = 14; diff --git a/proto/ChangeMpTeamAvatarReq.proto b/proto/ChangeMpTeamAvatarReq.proto index 558970ed..b0155a7d 100644 --- a/proto/ChangeMpTeamAvatarReq.proto +++ b/proto/ChangeMpTeamAvatarReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1626 +// Obf: ANGFHDEMEFI message ChangeMpTeamAvatarReq { repeated uint64 avatar_guid_list = 10; uint64 cur_avatar_guid = 7; diff --git a/proto/ChangeMpTeamAvatarRsp.proto b/proto/ChangeMpTeamAvatarRsp.proto index a65d968f..5c01fa29 100644 --- a/proto/ChangeMpTeamAvatarRsp.proto +++ b/proto/ChangeMpTeamAvatarRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1628 +// Obf: PDIMFLPCJMC message ChangeMpTeamAvatarRsp { int32 retcode = 13; repeated uint64 avatar_guid_list = 6; diff --git a/proto/ChangeTeamNameReq.proto b/proto/ChangeTeamNameReq.proto index 2aee3361..9bcc0522 100644 --- a/proto/ChangeTeamNameReq.proto +++ b/proto/ChangeTeamNameReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1664 +// Obf: LJCBDKBNGAI message ChangeTeamNameReq { string team_name = 2; int32 team_id = 9; diff --git a/proto/ChangeTeamNameRsp.proto b/proto/ChangeTeamNameRsp.proto index 0540b182..55882db7 100644 --- a/proto/ChangeTeamNameRsp.proto +++ b/proto/ChangeTeamNameRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1670 +// Obf: FPPJFDJHMAA message ChangeTeamNameRsp { string team_name = 4; int32 team_id = 12; diff --git a/proto/ChannelerSlabActivityDetailInfo.proto b/proto/ChannelerSlabActivityDetailInfo.proto new file mode 100644 index 00000000..acda49d8 --- /dev/null +++ b/proto/ChannelerSlabActivityDetailInfo.proto @@ -0,0 +1,31 @@ +// 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 "ChannellerSlabBuffInfo.proto"; +import "ChannelerSlabChallengeStage.proto"; +import "ChannellerSlabLoopDungeonStageInfo.proto"; +// Obf: LMHEEEOPMJJ +message ChannelerSlabActivityDetailInfo { + uint32 play_end_time = 9; + ChannellerSlabBuffInfo buff_info = 1; + repeated ChannelerSlabChallengeStage stage_list = 7; + ChannellerSlabLoopDungeonStageInfo loop_dungeon_stage_info = 4; +} diff --git a/proto/ChannelerSlabCamp.proto b/proto/ChannelerSlabCamp.proto new file mode 100644 index 00000000..e734c651 --- /dev/null +++ b/proto/ChannelerSlabCamp.proto @@ -0,0 +1,29 @@ +// 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: AKPGAHJAFMB +message ChannelerSlabCamp { + uint32 buff_num = 3; + Vector pos = 6; + uint32 group_id = 1; + uint32 reward_id = 12; +} diff --git a/proto/ChannelerSlabChallenge.proto b/proto/ChannelerSlabChallenge.proto new file mode 100644 index 00000000..79326167 --- /dev/null +++ b/proto/ChannelerSlabChallenge.proto @@ -0,0 +1,27 @@ +// 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 "ChannelerSlabCamp.proto"; +// Obf: MGFAOBBLLAD +message ChannelerSlabChallenge { + repeated ChannelerSlabCamp camp_list = 14; + uint32 active_camp_index = 8; +} diff --git a/proto/ChannelerSlabChallengeStage.proto b/proto/ChannelerSlabChallengeStage.proto new file mode 100644 index 00000000..e43f968a --- /dev/null +++ b/proto/ChannelerSlabChallengeStage.proto @@ -0,0 +1,31 @@ +// 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 "ChannelerSlabChallenge.proto"; +import "ChannelerSlabOneoffDungeon.proto"; +// Obf: JMOCJKDIKEB +message ChannelerSlabChallengeStage { + repeated ChannelerSlabChallenge challenge_list = 3; + uint32 open_time = 14; + ChannelerSlabOneoffDungeon dungeon_info = 2; + bool is_open = 15; + uint32 stage_id = 11; +} diff --git a/proto/ChannelerSlabOneoffDungeon.proto b/proto/ChannelerSlabOneoffDungeon.proto new file mode 100644 index 00000000..abad102c --- /dev/null +++ b/proto/ChannelerSlabOneoffDungeon.proto @@ -0,0 +1,27 @@ +// 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: HCIMIDPHFBF +message ChannelerSlabOneoffDungeon { + uint32 reward_id = 3; + uint32 dungeon_id = 8; + bool is_done = 6; +} diff --git a/proto/ChannellerSlabAssistInfo.proto b/proto/ChannellerSlabAssistInfo.proto new file mode 100644 index 00000000..bf2d39c6 --- /dev/null +++ b/proto/ChannellerSlabAssistInfo.proto @@ -0,0 +1,27 @@ +// 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: HKFJGOFLGNH +message ChannellerSlabAssistInfo { + uint32 avatar_level = 10; + uint32 avatar_id = 11; + uint32 uid = 14; +} diff --git a/proto/ChannellerSlabBuffInfo.proto b/proto/ChannellerSlabBuffInfo.proto new file mode 100644 index 00000000..ce2a3002 --- /dev/null +++ b/proto/ChannellerSlabBuffInfo.proto @@ -0,0 +1,30 @@ +// 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 "ChannellerSlabBuffSchemeInfo.proto"; +import "ChannellerSlabAssistInfo.proto"; +// Obf: CAGONPCNIDL +message ChannellerSlabBuffInfo { + ChannellerSlabBuffSchemeInfo AGGNKCMFEJK = 6; + repeated ChannellerSlabAssistInfo assist_info_list = 5; + ChannellerSlabBuffSchemeInfo AHBMAAMGCND = 2; + repeated uint32 buff_id_list = 13; +} diff --git a/proto/ChannellerSlabBuffSchemeInfo.proto b/proto/ChannellerSlabBuffSchemeInfo.proto new file mode 100644 index 00000000..3d757eb8 --- /dev/null +++ b/proto/ChannellerSlabBuffSchemeInfo.proto @@ -0,0 +1,27 @@ +// 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: CHLBOOLNDEN +message ChannellerSlabBuffSchemeInfo { + uint32 DAAFHHDKFOK = 1; + map slot_map = 3; + uint32 DBNLCMLIKGC = 5; +} diff --git a/proto/ChannellerSlabLoopDungeonInfo.proto b/proto/ChannellerSlabLoopDungeonInfo.proto new file mode 100644 index 00000000..c8c9b344 --- /dev/null +++ b/proto/ChannellerSlabLoopDungeonInfo.proto @@ -0,0 +1,30 @@ +// 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: OOAOCDJBACD +message ChannellerSlabLoopDungeonInfo { + bool is_open = 8; + uint32 dungeon_index = 2; + uint32 score = 5; + repeated uint32 last_condition_id_list = 9; + uint32 open_time = 13; + bool is_first_pass_reward_taken = 15; +} diff --git a/proto/ChannellerSlabLoopDungeonResultInfo.proto b/proto/ChannellerSlabLoopDungeonResultInfo.proto index 8774020a..c950bdf6 100644 --- a/proto/ChannellerSlabLoopDungeonResultInfo.proto +++ b/proto/ChannellerSlabLoopDungeonResultInfo.proto @@ -1,14 +1,29 @@ +// 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"; -// Name: OMHFNEJPLIG +// Obf: EBKOOMFFCIP message ChannellerSlabLoopDungeonResultInfo { - uint32 challenge_score = 1; - uint32 dungeon_index = 6; - uint32 challenge_max_score = 10; - bool is_in_time_limit = 9; - bool is_success = 15; + bool is_in_time_limit = 14; + uint32 dungeon_index = 6; + uint32 challenge_max_score = 1; + bool is_success = 5; + uint32 challenge_score = 15; } - diff --git a/proto/ChannellerSlabLoopDungeonStageInfo.proto b/proto/ChannellerSlabLoopDungeonStageInfo.proto new file mode 100644 index 00000000..10846f0d --- /dev/null +++ b/proto/ChannellerSlabLoopDungeonStageInfo.proto @@ -0,0 +1,30 @@ +// 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 "ChannellerSlabLoopDungeonInfo.proto"; +// Obf: EBDILIGFDML +message ChannellerSlabLoopDungeonStageInfo { + repeated ChannellerSlabLoopDungeonInfo dungeon_info_list = 6; + uint32 last_difficulty_id = 14; + repeated uint32 taken_reward_index_list = 1; + bool is_open = 9; + uint32 open_time = 8; +} diff --git a/proto/ChapterState.proto b/proto/ChapterState.proto index c065e690..bef524fe 100644 --- a/proto/ChapterState.proto +++ b/proto/ChapterState.proto @@ -1,13 +1,28 @@ +// 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"; -// Name: FODGEAPLODJ +// Obf: OBEGIEJOPKH enum ChapterState { - CHAPTER_STATE_INVALID = 0; - CHAPTER_STATE_UNABLE_TO_BEGIN = 1; - CHAPTER_STATE_BEGIN = 2; - CHAPTER_STATE_END = 3; + CHAPTER_STATE_INVALID = 0; + CHAPTER_STATE_UNABLE_TO_BEGIN = 1; + CHAPTER_STATE_BEGIN = 2; + CHAPTER_STATE_END = 3; } - diff --git a/proto/ChapterStateNotify.proto b/proto/ChapterStateNotify.proto index d0f43fc4..2da3fb8b 100644 --- a/proto/ChapterStateNotify.proto +++ b/proto/ChapterStateNotify.proto @@ -21,19 +21,20 @@ option java_package = "emu.grasscutter.net.proto"; import "ChapterState.proto"; // CmdId: 416 +// Obf: CLNHLPJKIHO message ChapterStateNotify { message NNBEJPGCIMD { - bool ELEILJHBMPJ = 8; - uint32 HACEFPOMGGG = 1; + bool is_limit = 8; + uint32 configNeedPlayerLevel = 1; } message HDPCHNPCKLP { - uint32 MGPHHJJKLEJ = 4; - bool ELEILJHBMPJ = 7; + uint32 configNeedBeginTime = 4; + bool is_limit = 7; } uint32 chapter_id = 9; - HDPCHNPCKLP PBMFCLIBDKM = 13; - NNBEJPGCIMD GOBGLJNJFPI = 1; + HDPCHNPCKLP need_begin_time = 13; + NNBEJPGCIMD need_player_level = 1; ChapterState chapter_state = 14; } diff --git a/proto/CharAmusementAvatarInfo.proto b/proto/CharAmusementAvatarInfo.proto index ab0d7d86..fab4519f 100644 --- a/proto/CharAmusementAvatarInfo.proto +++ b/proto/CharAmusementAvatarInfo.proto @@ -1,12 +1,27 @@ +// 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"; -// Name: KEBACJLDGHN +// Obf: JBHCEGDJHHD message CharAmusementAvatarInfo { - repeated uint32 avatar_id_list = 3; - uint32 punish_time = 11; - uint32 uid = 8; + uint32 uid = 9; + repeated uint32 avatar_id_list = 15; + uint32 punish_time = 3; } - diff --git a/proto/CharAmusementDetailInfo.proto b/proto/CharAmusementDetailInfo.proto new file mode 100644 index 00000000..aa12ce82 --- /dev/null +++ b/proto/CharAmusementDetailInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "CharAmusementStageData.proto"; +// Obf: PKCJIAMPIJD +message CharAmusementDetailInfo { + repeated CharAmusementStageData stage_data_list = 11; +} diff --git a/proto/CharAmusementStageData.proto b/proto/CharAmusementStageData.proto new file mode 100644 index 00000000..6bc2417b --- /dev/null +++ b/proto/CharAmusementStageData.proto @@ -0,0 +1,27 @@ +// 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: ECELJAAJHEA +message CharAmusementStageData { + bool is_open = 15; + uint32 finish_time = 1; + uint32 stage_id = 9; +} diff --git a/proto/ChatEmojiCollectionData.proto b/proto/ChatEmojiCollectionData.proto index eeaf3c56..c2bf7267 100644 --- a/proto/ChatEmojiCollectionData.proto +++ b/proto/ChatEmojiCollectionData.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: JFCBGLDLECB message ChatEmojiCollectionData { repeated uint32 emoji_id_list = 1; } diff --git a/proto/ChatInfo.proto b/proto/ChatInfo.proto index 87b4abd8..b2f86835 100644 --- a/proto/ChatInfo.proto +++ b/proto/ChatInfo.proto @@ -19,7 +19,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: EEBBPLIOHON message ChatInfo { + // Obf: KGNCKLCKPLN message SystemHint { uint32 type = 13; } diff --git a/proto/CheckAddItemExceedLimitNotify.proto b/proto/CheckAddItemExceedLimitNotify.proto index bb2018a7..fdcf427c 100644 --- a/proto/CheckAddItemExceedLimitNotify.proto +++ b/proto/CheckAddItemExceedLimitNotify.proto @@ -20,17 +20,19 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 644 +// Obf: OCFAOEJLBJE message CheckAddItemExceedLimitNotify { + // Obf: HALLOHEANIB enum ItemExceedLimitMsgType { - ItemExceedLimitMsgDefault = 0; - ItemExceedLimitMsgText = 1; - ItemExceedLimitMsgDialog = 2; - ItemExceedLimitMsgDialogNonblock = 3; + ITEM_EXCEED_LIMIT_MSG_DEFAULT = 0; + ITEM_EXCEED_LIMIT_MSG_TEXT = 1; + ITEM_EXCEED_LIMIT_MSG_DIALOG = 2; + ITEM_EXCEED_LIMIT_MSG_DIALOG_NONBLOCK = 3; } ItemExceedLimitMsgType msg_type = 10; - repeated uint32 JKFLCNGJHCP = 14; - repeated uint32 KLFFMFALKAP = 8; + repeated uint32 JIDEBPPDFAP = 14; + repeated uint32 GGJOANDELMJ = 8; bool is_drop = 2; uint32 reason = 4; } diff --git a/proto/ChessActivityDetailInfo.proto b/proto/ChessActivityDetailInfo.proto new file mode 100644 index 00000000..92c2126a --- /dev/null +++ b/proto/ChessActivityDetailInfo.proto @@ -0,0 +1,33 @@ +// 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: MDCOJLLKODN +message ChessActivityDetailInfo { + uint32 level = 7; + uint32 GPEHFLDFEAA = 13; + repeated uint32 finished_map_id_list = 8; + uint32 LDBPIMIFGNE = 3; + bool is_teach_dungeon_finished = 2; + bool is_content_closed = 1; + uint32 exp = 9; + uint32 punish_over_time = 6; + uint32 content_close_time = 10; +} diff --git a/proto/ChildQuest.proto b/proto/ChildQuest.proto index 8f539591..9f849d76 100644 --- a/proto/ChildQuest.proto +++ b/proto/ChildQuest.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: PGDIMINOAPM message ChildQuest { uint32 state = 1; uint32 quest_id = 11; diff --git a/proto/ChooseCurAvatarTeamReq.proto b/proto/ChooseCurAvatarTeamReq.proto index 4fac58d5..d79a06af 100644 --- a/proto/ChooseCurAvatarTeamReq.proto +++ b/proto/ChooseCurAvatarTeamReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1789 +// Obf: GPOADFMJEGE message ChooseCurAvatarTeamReq { uint32 team_id = 5; } diff --git a/proto/ChooseCurAvatarTeamRsp.proto b/proto/ChooseCurAvatarTeamRsp.proto index 2c0e67e0..3601ea58 100644 --- a/proto/ChooseCurAvatarTeamRsp.proto +++ b/proto/ChooseCurAvatarTeamRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1684 +// Obf: CKMLEGHLEME message ChooseCurAvatarTeamRsp { int32 retcode = 14; uint32 cur_team_id = 4; diff --git a/proto/CityInfo.proto b/proto/CityInfo.proto index 19ce543f..45743183 100644 --- a/proto/CityInfo.proto +++ b/proto/CityInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: POBBFHKEACF message CityInfo { uint32 city_id = 15; uint32 crystal_num = 8; diff --git a/proto/CityReputationQuestInfo.proto b/proto/CityReputationQuestInfo.proto index 254dae88..eb72fee7 100644 --- a/proto/CityReputationQuestInfo.proto +++ b/proto/CityReputationQuestInfo.proto @@ -1,12 +1,27 @@ +// 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"; -// Name: DBHBCEGMAHL +// Obf: OGNIGMMAPNI message CityReputationQuestInfo { - bool is_open = 8; - repeated uint32 GOGAJPFNDDD = 4; - repeated uint32 JMFHFJELJLK = 9; + repeated uint32 ECMOALGJMHK = 14; + repeated uint32 LJEOOGFNFLM = 4; + bool is_open = 10; } - diff --git a/proto/ClientAIStateNotify.proto b/proto/ClientAIStateNotify.proto index e7961530..decb4e6c 100644 --- a/proto/ClientAIStateNotify.proto +++ b/proto/ClientAIStateNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1194 +// Obf: IDPNCKHFLNL message ClientAIStateNotify { uint32 entity_id = 13; uint32 cur_tactic = 4; diff --git a/proto/ClientAbilityChangeNotify.proto b/proto/ClientAbilityChangeNotify.proto index 53cbed0b..a6707b7b 100644 --- a/proto/ClientAbilityChangeNotify.proto +++ b/proto/ClientAbilityChangeNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AbilityInvokeEntry.proto"; // CmdId: 1164 +// Obf: KMBDGMBAPDC message ClientAbilityChangeNotify { bool is_init_hash = 11; repeated AbilityInvokeEntry invokes = 13; diff --git a/proto/ClientAbilityInitFinishNotify.proto b/proto/ClientAbilityInitFinishNotify.proto index 3445cb44..8019e370 100644 --- a/proto/ClientAbilityInitFinishNotify.proto +++ b/proto/ClientAbilityInitFinishNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AbilityInvokeEntry.proto"; // CmdId: 1172 +// Obf: AKLEFDPDDAD message ClientAbilityInitFinishNotify { repeated AbilityInvokeEntry invokes = 9; uint32 entity_id = 2; diff --git a/proto/ClientCollectorData.proto b/proto/ClientCollectorData.proto index a87624c7..5e130087 100644 --- a/proto/ClientCollectorData.proto +++ b/proto/ClientCollectorData.proto @@ -1,12 +1,27 @@ +// 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"; -// Name: IPICMDDHCHD +// Obf: NLEMHBCLPLJ message ClientCollectorData { - uint32 BJAOMANHLNM = 9; - uint32 material_id = 10; - uint32 JCGPKAGJIOF = 11; + uint32 material_id = 8; + uint32 KIAPBPEHAEB = 1; + uint32 KCPIPGHNCNM = 11; } - diff --git a/proto/ClientGadgetInfo.proto b/proto/ClientGadgetInfo.proto index 58ce3f56..dfc8c779 100644 --- a/proto/ClientGadgetInfo.proto +++ b/proto/ClientGadgetInfo.proto @@ -1,18 +1,33 @@ +// 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"; -// Name: OKBKAFDHDFA +// Obf: INJJFHFANAD message ClientGadgetInfo { - uint32 camp_id = 1; - uint32 camp_type = 2; - uint64 guid = 3; - uint32 owner_entity_id = 4; - uint32 target_entity_id = 5; - bool async_load = 6; - bool is_peer_id_from_player = 7; - repeated uint32 target_entity_id_list = 8; - repeated uint32 target_lock_point_index_list = 9; + uint32 camp_id = 1; + uint32 camp_type = 2; + uint64 guid = 3; + uint32 owner_entity_id = 4; + uint32 target_entity_id = 5; + bool async_load = 6; + bool is_peer_id_from_player = 7; + repeated uint32 target_entity_id_list = 8; + repeated uint32 target_lock_point_index_list = 9; } - diff --git a/proto/ClientInputType.proto b/proto/ClientInputType.proto index 277584ea..675279d6 100644 --- a/proto/ClientInputType.proto +++ b/proto/ClientInputType.proto @@ -19,9 +19,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: DFMBCLCIGOD enum ClientInputType { - ClientInputType_ClientInputNone = 0; - ClientInputType_ClientInputKeybordMouse = 1; - ClientInputType_ClientInputGamepad = 2; - ClientInputType_ClientInputTouchPanel = 3; + CLIENT_INPUT_NONE = 0; + CLIENT_INPUT_KEYBORD_MOUSE = 1; + CLIENT_INPUT_GAMEPAD = 2; + CLIENT_INPUT_TOUCH_PANEL = 3; } diff --git a/proto/ClientLoadingCostumeVerificationNotify.proto b/proto/ClientLoadingCostumeVerificationNotify.proto index 968be411..5a020c1f 100644 --- a/proto/ClientLoadingCostumeVerificationNotify.proto +++ b/proto/ClientLoadingCostumeVerificationNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 3377 +// Obf: AKNAHMLPGOO message ClientLoadingCostumeVerificationNotify { uint64 prefab_hash = 1; uint32 costume_id = 6; diff --git a/proto/ClientLockGameTimeNotify.proto b/proto/ClientLockGameTimeNotify.proto index 40d272ac..9ef30976 100644 --- a/proto/ClientLockGameTimeNotify.proto +++ b/proto/ClientLockGameTimeNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 147 +// Obf: GAIGFCMNNHM message ClientLockGameTimeNotify { bool is_lock = 12; } diff --git a/proto/ClosedItemNotify.proto b/proto/ClosedItemNotify.proto index e1bae687..9edbce07 100644 --- a/proto/ClosedItemNotify.proto +++ b/proto/ClosedItemNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 647 +// Obf: IHODBFNNEON message ClosedItemNotify { repeated uint32 item_id_list = 1; } diff --git a/proto/CodexDataFullNotify.proto b/proto/CodexDataFullNotify.proto index 25b41442..f6b1bd89 100644 --- a/proto/CodexDataFullNotify.proto +++ b/proto/CodexDataFullNotify.proto @@ -21,9 +21,10 @@ option java_package = "emu.grasscutter.net.proto"; import "CodexTypeData.proto"; // CmdId: 4207 +// Obf: PHDPIAHJJAB message CodexDataFullNotify { repeated uint32 recent_viewed_pushtips_list = 7; - uint32 IDMAOKCCEGN = 9; - uint32 EEBDJBPEDIL = 2; + uint32 BGFNNPAOPML = 9; + uint32 IAIMLAPJCIN = 2; repeated CodexTypeData type_data_list = 11; } diff --git a/proto/CodexDataUpdateNotify.proto b/proto/CodexDataUpdateNotify.proto index ae6c919b..2942f8cc 100644 --- a/proto/CodexDataUpdateNotify.proto +++ b/proto/CodexDataUpdateNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "CodexType.proto"; // CmdId: 4206 +// Obf: AMEDMFGHJKL message CodexDataUpdateNotify { CodexType type = 7; uint32 id = 4; diff --git a/proto/CodexType.proto b/proto/CodexType.proto index 9f1d6403..2a4195d1 100644 --- a/proto/CodexType.proto +++ b/proto/CodexType.proto @@ -19,14 +19,15 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: BLGBHLOPHLA enum CodexType { - CodexType_CodexNone = 0; - CodexType_CodexQuest = 1; - CodexType_CodexWeapon = 2; - CodexType_CodexAnimal = 3; - CodexType_CodexMaterial = 4; - CodexType_CodexBooks = 5; - CodexType_CodexPushtips = 6; - CodexType_CodexView = 7; - CodexType_CodexReliquary = 8; + CODEX_NONE = 0; + CODEX_QUEST = 1; + CODEX_WEAPON = 2; + CODEX_ANIMAL = 3; + CODEX_MATERIAL = 4; + CODEX_BOOKS = 5; + CODEX_PUSHTIPS = 6; + CODEX_VIEW = 7; + CODEX_RELIQUARY = 8; } diff --git a/proto/CodexTypeData.proto b/proto/CodexTypeData.proto index 2afbf44d..c8dcd3da 100644 --- a/proto/CodexTypeData.proto +++ b/proto/CodexTypeData.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "CodexType.proto"; +// Obf: CAIKLLAMBEJ message CodexTypeData { CodexType type = 2; repeated uint32 codex_id_list = 15; diff --git a/proto/CoinCollectDetailInfo.proto b/proto/CoinCollectDetailInfo.proto new file mode 100644 index 00000000..562f3faf --- /dev/null +++ b/proto/CoinCollectDetailInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "CoinCollectLevelData.proto"; +// Obf: OHDPPODAGHJ +message CoinCollectDetailInfo { + repeated CoinCollectLevelData level_data_list = 7; +} diff --git a/proto/CoinCollectLevelData.proto b/proto/CoinCollectLevelData.proto new file mode 100644 index 00000000..a2d3c64a --- /dev/null +++ b/proto/CoinCollectLevelData.proto @@ -0,0 +1,37 @@ +// 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 "CoinCollectTeamInfoData.proto"; +// Obf: BPIFCPLNNJL +message CoinCollectLevelData { + uint32 JOFGBFDLDAF = 14; + repeated CoinCollectTeamInfoData double_best_team_info_list = 10; + uint32 NHNHIJEMGAC = 9; + uint32 NJLICCIECCN = 13; + uint32 BOIEKLOHHPD = 5; + bool DDMNCCBCKNM = 12; + uint32 MGFFCLFPODP = 4; + bool NFIPGNAFDKH = 1; + CoinCollectTeamInfoData single_best_team_info = 3; + uint32 level_id = 8; + bool is_level_open = 15; + bool HMOBOIEILIF = 2; +} diff --git a/proto/CoinCollectOperatorInfo.proto b/proto/CoinCollectOperatorInfo.proto index cfffa6d8..82efadce 100644 --- a/proto/CoinCollectOperatorInfo.proto +++ b/proto/CoinCollectOperatorInfo.proto @@ -1,10 +1,25 @@ +// 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"; -// Name: JMNGHMOAGEP +// Obf: FNIIINAIIJJ message CoinCollectOperatorInfo { - uint32 level_id = 1; + uint32 level_id = 1; } - diff --git a/proto/CoinCollectTeamAvatarInfo.proto b/proto/CoinCollectTeamAvatarInfo.proto index 9964650a..8cc34902 100644 --- a/proto/CoinCollectTeamAvatarInfo.proto +++ b/proto/CoinCollectTeamAvatarInfo.proto @@ -1,11 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Name: HGKFODIDPHN +// Obf: OFEFIKEPBHJ message CoinCollectTeamAvatarInfo { - uint32 costume_id = 10; - uint32 avatar_id = 1; + uint32 costume_id = 7; + uint32 avatar_id = 4; } - diff --git a/proto/CoinCollectTeamInfoData.proto b/proto/CoinCollectTeamInfoData.proto new file mode 100644 index 00000000..7d01daec --- /dev/null +++ b/proto/CoinCollectTeamInfoData.proto @@ -0,0 +1,30 @@ +// 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: PJFMFEFLOHD +message CoinCollectTeamInfoData { + repeated uint32 JFLEEJGJDBJ = 4; + uint32 choose_skill_no = 14; + uint32 player_uid = 3; + repeated uint32 HNHLEEPCLEC = 5; + bool is_host = 1; + repeated uint32 avatar_id_list = 6; +} diff --git a/proto/CombatInvocationsNotify.proto b/proto/CombatInvocationsNotify.proto index 26b428c1..e88c7b7d 100644 --- a/proto/CombatInvocationsNotify.proto +++ b/proto/CombatInvocationsNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "CombatInvokeEntry.proto"; // CmdId: 310 +// Obf: FLAKGKFNPBM message CombatInvocationsNotify { repeated CombatInvokeEntry invoke_list = 5; } diff --git a/proto/CombatInvokeEntry.proto b/proto/CombatInvokeEntry.proto index f68d0a78..97fa7ac9 100644 --- a/proto/CombatInvokeEntry.proto +++ b/proto/CombatInvokeEntry.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ForwardType.proto"; import "CombatTypeArgument.proto"; +// Obf: GFIELFENIEL message CombatInvokeEntry { bytes combat_data = 6; ForwardType forward_type = 5; diff --git a/proto/CombatTypeArgument.proto b/proto/CombatTypeArgument.proto index 74a5be2b..03c4a0bd 100644 --- a/proto/CombatTypeArgument.proto +++ b/proto/CombatTypeArgument.proto @@ -1,9 +1,25 @@ +// 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"; -// Name: DHGBKMMCECM +// Obf: CBOEAHNFCIJ enum CombatTypeArgument { COMBAT_TYPE_ARGUMENT_NONE = 0; COMBAT_TYPE_ARGUMENT_EVT_BEING_HIT = 1; @@ -25,4 +41,3 @@ enum CombatTypeArgument { COMBAT_TYPE_ARGUMENT_SKILL_ANCHOR_POSITION_NTF = 17; COMBAT_TYPE_ARGUMENT_GRAPPLING_HOOK_MOVE = 18; } - diff --git a/proto/CombineDataNotify.proto b/proto/CombineDataNotify.proto index c532726a..c6a0c062 100644 --- a/proto/CombineDataNotify.proto +++ b/proto/CombineDataNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 640 +// Obf: DCIKPMMCEAB message CombineDataNotify { repeated uint32 combine_id_list = 15; } diff --git a/proto/CombineFormulaDataNotify.proto b/proto/CombineFormulaDataNotify.proto index c22876d0..8cf3a486 100644 --- a/proto/CombineFormulaDataNotify.proto +++ b/proto/CombineFormulaDataNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 678 +// Obf: JFJDDJBLOLF message CombineFormulaDataNotify { bool is_locked = 15; uint32 combine_id = 10; diff --git a/proto/CombineReq.proto b/proto/CombineReq.proto index 8cf9c379..a518679e 100644 --- a/proto/CombineReq.proto +++ b/proto/CombineReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 607 +// Obf: FPPKDCOOBKP message CombineReq { uint32 combine_count = 9; uint64 avatar_guid = 12; diff --git a/proto/CombineRsp.proto b/proto/CombineRsp.proto index 3ab6c8e7..6cdf106e 100644 --- a/proto/CombineRsp.proto +++ b/proto/CombineRsp.proto @@ -21,14 +21,15 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; // CmdId: 698 +// Obf: BKHCHIAKGAO message CombineRsp { uint32 combine_id = 3; uint64 avatar_guid = 9; uint32 combine_count = 7; - repeated ItemParam total_random_item_list = 10; + repeated ItemParam totalExtraItemList = 10; repeated ItemParam cost_item_list = 1; - repeated ItemParam total_return_item_list = 11; + repeated ItemParam result_item_list = 11; int32 retcode = 13; - repeated ItemParam result_item_list = 4; - repeated ItemParam total_extra_item_list = 8; + repeated ItemParam totalRandomItemList = 4; + repeated ItemParam total_return_item_list = 8; } diff --git a/proto/CompoundBoostTakeStatusType.proto b/proto/CompoundBoostTakeStatusType.proto index 0fee29d0..58c7c20c 100644 --- a/proto/CompoundBoostTakeStatusType.proto +++ b/proto/CompoundBoostTakeStatusType.proto @@ -19,9 +19,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: KBJDBGIEOHI enum CompoundBoostTakeStatusType { - CompoundBoostTakeStatusType_CompoundBoostTakeStatusNone = 0; - CompoundBoostTakeStatusType_CompoundBoostTakeStatusBoostOnly = 1; - CompoundBoostTakeStatusType_CompoundBoostTakeStatusBoostAndTake = 2; - CompoundBoostTakeStatusType_CompoundBoostTakeStatusBagFull = 3; + COMPOUND_BOOST_TAKE_STATUS_NONE = 0; + COMPOUND_BOOST_TAKE_STATUS_BOOST_ONLY = 1; + COMPOUND_BOOST_TAKE_STATUS_BOOST_AND_TAKE = 2; + COMPOUND_BOOST_TAKE_STATUS_BAG_FULL = 3; } diff --git a/proto/CompoundDataNotify.proto b/proto/CompoundDataNotify.proto index e32e029a..ee5803ad 100644 --- a/proto/CompoundDataNotify.proto +++ b/proto/CompoundDataNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "CompoundQueueData.proto"; // CmdId: 180 +// Obf: BGHIMPKEDMG message CompoundDataNotify { repeated uint32 unlockCompoundList = 4; repeated CompoundQueueData compoundQueueDataList = 6; diff --git a/proto/CompoundQueueData.proto b/proto/CompoundQueueData.proto index 0938e8a2..dfb8c514 100644 --- a/proto/CompoundQueueData.proto +++ b/proto/CompoundQueueData.proto @@ -19,9 +19,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: IDINDPJAHOO message CompoundQueueData { uint32 compound_id = 8; - uint32 outputCount = 15; - uint32 outputTime = 9; - uint32 waitCount = 12; + uint32 waitCount = 15; + uint32 outputCount = 9; + uint32 outputTime = 12; } diff --git a/proto/CookDataNotify.proto b/proto/CookDataNotify.proto index a53ba9f1..f597a627 100644 --- a/proto/CookDataNotify.proto +++ b/proto/CookDataNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "CookRecipeData.proto"; // CmdId: 166 +// Obf: NGIJDCAGGII message CookDataNotify { repeated CookRecipeData recipe_data_list = 10; uint32 grade = 7; diff --git a/proto/CookRecipeData.proto b/proto/CookRecipeData.proto index 6742c881..7fd0d027 100644 --- a/proto/CookRecipeData.proto +++ b/proto/CookRecipeData.proto @@ -19,7 +19,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: DLDJOMHIENO message CookRecipeData { - uint32 proficiency = 6; - uint32 recipe_id = 12; + uint32 recipe_id = 6; + uint32 proficiency = 12; } diff --git a/proto/CookRecipeDataNotify.proto b/proto/CookRecipeDataNotify.proto index 65848fb1..e614720d 100644 --- a/proto/CookRecipeDataNotify.proto +++ b/proto/CookRecipeDataNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "CookRecipeData.proto"; // CmdId: 143 +// Obf: GABHMDEGHOJ message CookRecipeDataNotify { CookRecipeData recipe_data = 8; } diff --git a/proto/CreateEntityInfo.proto b/proto/CreateEntityInfo.proto index 7ea6f207..6c3e1cb8 100644 --- a/proto/CreateEntityInfo.proto +++ b/proto/CreateEntityInfo.proto @@ -1,26 +1,39 @@ +// 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 "CreateGadgetInfo.proto"; + import "Vector.proto"; - -// Name: KKJAKFLICEJ +import "CreateGadgetInfo.proto"; +// Obf: MLAIAFGGNLF message CreateEntityInfo { - uint32 level = 5; - Vector pos = 6; - Vector rot = 7; - uint32 scene_id = 10; - uint32 room_id = 11; - uint32 client_unique_id = 12; - oneof entity { - uint32 monster_id = 1; - uint32 npc_id = 2; - uint32 gadget_id = 3; - uint32 item_id = 4; - } - oneof entity_create_info { - CreateGadgetInfo gadget = 13; - } + uint32 level = 5; + Vector pos = 6; + Vector rot = 7; + uint32 scene_id = 10; + uint32 room_id = 11; + uint32 client_unique_id = 12; + oneof entity { + uint32 monster_id = 1; + uint32 npc_id = 2; + uint32 gadget_id = 3; + uint32 item_id = 4; + } + optional CreateGadgetInfo gadget = 13; } - diff --git a/proto/CreateGadgetInfo.proto b/proto/CreateGadgetInfo.proto index a87a6282..f4a0883e 100644 --- a/proto/CreateGadgetInfo.proto +++ b/proto/CreateGadgetInfo.proto @@ -1,18 +1,33 @@ +// 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 "GadgetBornType.proto"; - -// Name: DMLOGFGNFCA +// Obf: NCOOFLCLKIP message CreateGadgetInfo { - // Name: ACFOEFOCAOB - message Chest { - uint32 chest_drop_id = 1; - bool is_show_cutscene = 2; - } - - GadgetBornType born_type = 1; - Chest chest = 2; + // Obf: MEEFCKCOLKE + message Chest { + uint32 chest_drop_id = 1; + bool is_show_cutscene = 2; + } + + GadgetBornType born_type = 1; + Chest chest = 2; } - diff --git a/proto/CreateVehicleReq.proto b/proto/CreateVehicleReq.proto index b49ae6f9..a888bded 100644 --- a/proto/CreateVehicleReq.proto +++ b/proto/CreateVehicleReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; // CmdId: 831 +// Obf: MBCKGODOAMI message CreateVehicleReq { Vector pos = 12; uint32 scene_point_id = 4; diff --git a/proto/CreateVehicleRsp.proto b/proto/CreateVehicleRsp.proto index d27ced83..696284c4 100644 --- a/proto/CreateVehicleRsp.proto +++ b/proto/CreateVehicleRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 876 +// Obf: JLDKEFIDBEK message CreateVehicleRsp { uint32 vehicle_id = 1; uint32 entity_id = 4; diff --git a/proto/CrucibleActivityDetailInfo.proto b/proto/CrucibleActivityDetailInfo.proto new file mode 100644 index 00000000..4af5d616 --- /dev/null +++ b/proto/CrucibleActivityDetailInfo.proto @@ -0,0 +1,30 @@ +// 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 "CrucibleBattleUidInfo.proto"; +// Obf: GKNCGFLIHAF +message CrucibleActivityDetailInfo { + Vector pos = 3; + repeated CrucibleBattleUidInfo uid_info_list = 10; + uint32 cost_time = 5; + uint32 battle_world_level = 12; +} diff --git a/proto/CrucibleBattleUidInfo.proto b/proto/CrucibleBattleUidInfo.proto new file mode 100644 index 00000000..7bdc5f03 --- /dev/null +++ b/proto/CrucibleBattleUidInfo.proto @@ -0,0 +1,30 @@ +// 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 "ProfilePicture.proto"; +// Obf: LFPLMPFDIHK +message CrucibleBattleUidInfo { + uint32 icon = 3; + uint32 uid = 13; + ProfilePicture profile_picture = 14; + string online_id = 7; + string nickname = 12; +} diff --git a/proto/CrystalLinkActivityDetailInfo.proto b/proto/CrystalLinkActivityDetailInfo.proto new file mode 100644 index 00000000..d7f18238 --- /dev/null +++ b/proto/CrystalLinkActivityDetailInfo.proto @@ -0,0 +1,27 @@ +// 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 "CrystalLinkLevelInfo.proto"; +// Obf: BOFIFGCOAAB +message CrystalLinkActivityDetailInfo { + repeated CrystalLinkLevelInfo level_info_list = 2; + uint32 difficulty_id = 15; +} diff --git a/proto/CrystalLinkAvatarInfo.proto b/proto/CrystalLinkAvatarInfo.proto index 7f98410b..58152159 100644 --- a/proto/CrystalLinkAvatarInfo.proto +++ b/proto/CrystalLinkAvatarInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: MAANKHLADDM message CrystalLinkAvatarInfo { uint64 avatar_id = 4; bool is_trial = 3; diff --git a/proto/CrystalLinkBuffInfo.proto b/proto/CrystalLinkBuffInfo.proto new file mode 100644 index 00000000..36dc85aa --- /dev/null +++ b/proto/CrystalLinkBuffInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +// Obf: PHGJADJONIC +message CrystalLinkBuffInfo { + uint32 DBKGEODHPNC = 7; + uint32 OECGHFDFIII = 2; +} diff --git a/proto/CrystalLinkDungeonAvatarInfo.proto b/proto/CrystalLinkDungeonAvatarInfo.proto index 14e1251c..aa59081b 100644 --- a/proto/CrystalLinkDungeonAvatarInfo.proto +++ b/proto/CrystalLinkDungeonAvatarInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: MEOEEOOKNAA message CrystalLinkDungeonAvatarInfo { bool is_trial = 10; uint64 avatar_guid = 14; diff --git a/proto/CrystalLinkDungeonSettleInfo.proto b/proto/CrystalLinkDungeonSettleInfo.proto new file mode 100644 index 00000000..d6349782 --- /dev/null +++ b/proto/CrystalLinkDungeonSettleInfo.proto @@ -0,0 +1,31 @@ +// 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: KOGBOGMJFFA +message CrystalLinkDungeonSettleInfo { + uint32 difficulty_id = 4; + bool MFGGJPMOMHL = 11; + uint32 DNKNMEGHIIJ = 1; + uint32 level_id = 2; + uint32 GNJHGMHMBDK = 14; + bool is_new_record = 12; + uint32 final_score = 7; +} diff --git a/proto/CrystalLinkLevelInfo.proto b/proto/CrystalLinkLevelInfo.proto new file mode 100644 index 00000000..dfdde441 --- /dev/null +++ b/proto/CrystalLinkLevelInfo.proto @@ -0,0 +1,29 @@ +// 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 "CrystalLinkTeamInfo.proto"; +// Obf: PONPFBOKPIH +message CrystalLinkLevelInfo { + bool is_open = 8; + repeated CrystalLinkTeamInfo team_info_list = 10; + uint32 level_id = 2; + uint32 best_score = 11; +} diff --git a/proto/CrystalLinkTeamInfo.proto b/proto/CrystalLinkTeamInfo.proto new file mode 100644 index 00000000..85d61f9a --- /dev/null +++ b/proto/CrystalLinkTeamInfo.proto @@ -0,0 +1,28 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "CrystalLinkBuffInfo.proto"; +import "CrystalLinkAvatarInfo.proto"; +// Obf: EPPFIDECGAF +message CrystalLinkTeamInfo { + repeated CrystalLinkBuffInfo buff_info_list = 9; + repeated CrystalLinkAvatarInfo avatar_info_list = 14; +} diff --git a/proto/CurVehicleInfo.proto b/proto/CurVehicleInfo.proto index dd2290fc..a330cdfe 100644 --- a/proto/CurVehicleInfo.proto +++ b/proto/CurVehicleInfo.proto @@ -1,16 +1,31 @@ +// 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"; - -// Name: LLBAHDBLEPH +// Obf: IEDNAPEHNEN message CurVehicleInfo { - uint32 entity_id = 1; - uint32 pos = 2; - uint32 gadget_id = 3; - Vector DNJIMMEONNI = 4; - uint32 PDEPBDNGIAB = 5; - Vector MAKPDIBNPAP = 6; + uint32 entity_id = 1; + uint32 pos = 2; + uint32 gadget_id = 3; + Vector MBJJPEGEDME = 4; + uint32 IDLLLBLACAE = 5; + Vector KPLLINDPCBJ = 6; } - diff --git a/proto/CustomCommonNodeInfo.proto b/proto/CustomCommonNodeInfo.proto index 3f50f0ae..ae50b1c3 100644 --- a/proto/CustomCommonNodeInfo.proto +++ b/proto/CustomCommonNodeInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: COEBLBLIGHJ message CustomCommonNodeInfo { int32 parent_index = 1; uint32 config_id = 2; diff --git a/proto/CustomDungeonFinishType.proto b/proto/CustomDungeonFinishType.proto new file mode 100644 index 00000000..d6dc2b84 --- /dev/null +++ b/proto/CustomDungeonFinishType.proto @@ -0,0 +1,28 @@ +// 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: HPPKOKPKAHJ +enum CustomDungeonFinishType { + CUSTOM_DUNGEON_FINISH_PLAY_NORMAL = 0; + CUSTOM_DUNGEON_FINISH_PLAY_TRY = 1; + CUSTOM_DUNGEON_FINISH_EDIT_TRY = 2; + CUSTOM_DUNGEON_FINISH_SELF_PLAY_NORMAL = 3; +} diff --git a/proto/CustomDungeonResultInfo.proto b/proto/CustomDungeonResultInfo.proto new file mode 100644 index 00000000..b628ceb7 --- /dev/null +++ b/proto/CustomDungeonResultInfo.proto @@ -0,0 +1,34 @@ +// 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 "ChallengeBrief.proto"; +import "CustomDungeonFinishType.proto"; +// Obf: CHHLEGLKLJL +message CustomDungeonResultInfo { + bool HKNCBLBMNBC = 15; + uint32 time_cost = 5; + uint64 dungeon_guid = 3; + bool is_arrive_finish = 10; + uint32 got_coin_num = 4; + bool OBIPMOKDBMH = 14; + repeated ChallengeBrief child_challenge_list = 2; + CustomDungeonFinishType finish_type = 9; +} diff --git a/proto/CustomGadgetTreeInfo.proto b/proto/CustomGadgetTreeInfo.proto index 36e94a43..f49ddaeb 100644 --- a/proto/CustomGadgetTreeInfo.proto +++ b/proto/CustomGadgetTreeInfo.proto @@ -1,11 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "CustomCommonNodeInfo.proto"; - -// Name: BJGMHMHDCGE +// Obf: DPOLIKKKKLA message CustomGadgetTreeInfo { - repeated CustomCommonNodeInfo node_list = 1; + repeated CustomCommonNodeInfo node_list = 1; } - diff --git a/proto/CutSceneBeginNotify.proto b/proto/CutSceneBeginNotify.proto index 5d0cb134..24f8d013 100644 --- a/proto/CutSceneBeginNotify.proto +++ b/proto/CutSceneBeginNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "CutSceneExtraParam.proto"; // CmdId: 285 +// Obf: PNGBGNKECJP message CutSceneBeginNotify { repeated CutSceneExtraParam extra_param_list = 9; uint32 cutscene_id = 13; diff --git a/proto/CutSceneExtraParam.proto b/proto/CutSceneExtraParam.proto index 321e1ec0..43b0dd62 100644 --- a/proto/CutSceneExtraParam.proto +++ b/proto/CutSceneExtraParam.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: PLCAMHHOHAM message CutSceneExtraParam { repeated double detail_param_list = 9; } diff --git a/proto/DFPKDLNGDGK.proto b/proto/DFPKDLNGDGK.proto new file mode 100644 index 00000000..936591e9 --- /dev/null +++ b/proto/DFPKDLNGDGK.proto @@ -0,0 +1,28 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +message DFPKDLNGDGK { + bool is_level_open = 5; + uint64 MCAPHJOEKDB = 8; + uint32 level_id = 3; + uint32 best_score = 6; + bool is_finished = 11; +} diff --git a/proto/DGDDOPJOOIH.proto b/proto/DGDDOPJOOIH.proto new file mode 100644 index 00000000..a74547f9 --- /dev/null +++ b/proto/DGDDOPJOOIH.proto @@ -0,0 +1,25 @@ +// 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 "IFONLLKBEAC.proto"; +message DGDDOPJOOIH { + repeated IFONLLKBEAC level_info_list = 5; +} diff --git a/proto/DMFPJALOPBI.proto b/proto/DMFPJALOPBI.proto new file mode 100644 index 00000000..521d766a --- /dev/null +++ b/proto/DMFPJALOPBI.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +message DMFPJALOPBI { + repeated uint32 CJJHPMLNGHK = 10; + repeated uint32 HBMDFOMKAHO = 2; + repeated uint32 OFGAICIHAMD = 12; +} diff --git a/proto/DPMOKIKIFAI.proto b/proto/DPMOKIKIFAI.proto new file mode 100644 index 00000000..9738b017 --- /dev/null +++ b/proto/DPMOKIKIFAI.proto @@ -0,0 +1,27 @@ +// 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 "DFPKDLNGDGK.proto"; +message DPMOKIKIFAI { + bool LHKHBFDMHIJ = 14; + repeated DFPKDLNGDGK HFKPAJLOKAM = 11; + bool EJFPGMBDIJL = 6; +} diff --git a/proto/DailyDungeonEntryInfo.proto b/proto/DailyDungeonEntryInfo.proto index a786ea37..c068c1ec 100644 --- a/proto/DailyDungeonEntryInfo.proto +++ b/proto/DailyDungeonEntryInfo.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "DungeonEntryInfo.proto"; +// Obf: POHDOBJJPPO message DailyDungeonEntryInfo { DungeonEntryInfo recommend_dungeon_entry_info = 12; uint32 dungeon_entry_config_id = 10; diff --git a/proto/DailyTaskDataNotify.proto b/proto/DailyTaskDataNotify.proto index 06a4c80a..55ee8067 100644 --- a/proto/DailyTaskDataNotify.proto +++ b/proto/DailyTaskDataNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 156 +// Obf: LKFOLMKGHDK message DailyTaskDataNotify { uint32 finished_num = 6; uint32 score_reward_id = 9; diff --git a/proto/DailyTaskFilterCityReq.proto b/proto/DailyTaskFilterCityReq.proto index 1d593a45..7fc37aff 100644 --- a/proto/DailyTaskFilterCityReq.proto +++ b/proto/DailyTaskFilterCityReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 132 +// Obf: FGIIGEAAJGI message DailyTaskFilterCityReq { uint32 city_id = 8; } diff --git a/proto/DailyTaskFilterCityRsp.proto b/proto/DailyTaskFilterCityRsp.proto index df1bfaa2..fb9e646d 100644 --- a/proto/DailyTaskFilterCityRsp.proto +++ b/proto/DailyTaskFilterCityRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 183 +// Obf: JIEKKJEKJDG message DailyTaskFilterCityRsp { int32 retcode = 15; uint32 city_id = 4; diff --git a/proto/DailyTaskInfo.proto b/proto/DailyTaskInfo.proto index bddef5fd..d53bc552 100644 --- a/proto/DailyTaskInfo.proto +++ b/proto/DailyTaskInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: DCPMGKODFKH message DailyTaskInfo { uint32 daily_task_id = 9; uint32 progress = 11; diff --git a/proto/DailyTaskProgressNotify.proto b/proto/DailyTaskProgressNotify.proto index 046a0807..41e68fe0 100644 --- a/proto/DailyTaskProgressNotify.proto +++ b/proto/DailyTaskProgressNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "DailyTaskInfo.proto"; // CmdId: 163 +// Obf: PKNBMIJGAGF message DailyTaskProgressNotify { DailyTaskInfo info = 15; } diff --git a/proto/DailyTaskUnlockedCitiesNotify.proto b/proto/DailyTaskUnlockedCitiesNotify.proto index a72e6721..9d257f63 100644 --- a/proto/DailyTaskUnlockedCitiesNotify.proto +++ b/proto/DailyTaskUnlockedCitiesNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 127 +// Obf: MAFKBKGEIBB message DailyTaskUnlockedCitiesNotify { repeated uint32 unlocked_city_list = 5; } diff --git a/proto/DealAddFriendReq.proto b/proto/DealAddFriendReq.proto index 82e7ada2..2316d332 100644 --- a/proto/DealAddFriendReq.proto +++ b/proto/DealAddFriendReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "DealAddFriendResultType.proto"; // CmdId: 4058 +// Obf: PIAFDFFMOBK message DealAddFriendReq { uint32 target_uid = 15; DealAddFriendResultType deal_add_friend_result = 4; diff --git a/proto/DealAddFriendResultType.proto b/proto/DealAddFriendResultType.proto index 5c80e95e..ff2bb6e4 100644 --- a/proto/DealAddFriendResultType.proto +++ b/proto/DealAddFriendResultType.proto @@ -1,11 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Name: POFNPDMFDFB +// Obf: ABPPEJELBNL enum DealAddFriendResultType { DEAL_ADD_FRIEND_RESULT_TYPE_REJECT = 0; DEAL_ADD_FRIEND_RESULT_TYPE_ACCEPT = 1; } - diff --git a/proto/DealAddFriendRsp.proto b/proto/DealAddFriendRsp.proto index bddf4f8f..753eca82 100644 --- a/proto/DealAddFriendRsp.proto +++ b/proto/DealAddFriendRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "DealAddFriendResultType.proto"; // CmdId: 4035 +// Obf: KFFFGHCHFCP message DealAddFriendRsp { DealAddFriendResultType deal_add_friend_result = 6; int32 retcode = 7; diff --git a/proto/DelBackupAvatarTeamReq.proto b/proto/DelBackupAvatarTeamReq.proto index ae601312..2cae4032 100644 --- a/proto/DelBackupAvatarTeamReq.proto +++ b/proto/DelBackupAvatarTeamReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1609 +// Obf: FNOGALIBLFO message DelBackupAvatarTeamReq { uint32 backup_avatar_team_id = 12; } diff --git a/proto/DelBackupAvatarTeamRsp.proto b/proto/DelBackupAvatarTeamRsp.proto index 7fb8862f..2404c0ac 100644 --- a/proto/DelBackupAvatarTeamRsp.proto +++ b/proto/DelBackupAvatarTeamRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1777 +// Obf: DJGKPJONOAN message DelBackupAvatarTeamRsp { uint32 backup_avatar_team_id = 4; int32 retcode = 11; diff --git a/proto/DelMailReq.proto b/proto/DelMailReq.proto index ae36cec8..db16dfc7 100644 --- a/proto/DelMailReq.proto +++ b/proto/DelMailReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1448 +// Obf: POFLFHOCBCI message DelMailReq { repeated uint32 mail_id_list = 3; } diff --git a/proto/DelMailRsp.proto b/proto/DelMailRsp.proto index f4d0a92d..48ec8e7f 100644 --- a/proto/DelMailRsp.proto +++ b/proto/DelMailRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1458 +// Obf: KPGMOMOANOE message DelMailRsp { int32 retcode = 15; repeated uint32 mail_id_list = 5; diff --git a/proto/DelTeamEntityNotify.proto b/proto/DelTeamEntityNotify.proto index 54224d65..77f7f450 100644 --- a/proto/DelTeamEntityNotify.proto +++ b/proto/DelTeamEntityNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 369 +// Obf: IBMDDFGACLA message DelTeamEntityNotify { repeated uint32 del_entity_id_list = 13; uint32 scene_id = 4; diff --git a/proto/DeleteFriendNotify.proto b/proto/DeleteFriendNotify.proto index 8b841896..504f9624 100644 --- a/proto/DeleteFriendNotify.proto +++ b/proto/DeleteFriendNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4068 +// Obf: KJMHHBBMIDO message DeleteFriendNotify { uint32 target_uid = 7; } diff --git a/proto/DeleteFriendReq.proto b/proto/DeleteFriendReq.proto index 87313696..b5104940 100644 --- a/proto/DeleteFriendReq.proto +++ b/proto/DeleteFriendReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4084 +// Obf: CPGJHGFGGBD message DeleteFriendReq { uint32 target_uid = 15; } diff --git a/proto/DeleteFriendRsp.proto b/proto/DeleteFriendRsp.proto index bee90efe..206a12a8 100644 --- a/proto/DeleteFriendRsp.proto +++ b/proto/DeleteFriendRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4064 +// Obf: HEJGCCBJAFF message DeleteFriendRsp { int32 retcode = 13; uint32 target_uid = 8; diff --git a/proto/DeliveryActivityDetailInfo.proto b/proto/DeliveryActivityDetailInfo.proto new file mode 100644 index 00000000..efbec161 --- /dev/null +++ b/proto/DeliveryActivityDetailInfo.proto @@ -0,0 +1,27 @@ +// 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: IOHOBABPFDF +message DeliveryActivityDetailInfo { + uint32 day_index = 12; + bool is_taken_reward = 1; + repeated uint32 finished_delivery_quest_index = 8; +} diff --git a/proto/DeshretObeliskGadgetInfo.proto b/proto/DeshretObeliskGadgetInfo.proto index fa309a7f..10da541d 100644 --- a/proto/DeshretObeliskGadgetInfo.proto +++ b/proto/DeshretObeliskGadgetInfo.proto @@ -1,10 +1,25 @@ +// 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"; -// Name: ADDCBCDDJIL +// Obf: LGFNBNFIONC message DeshretObeliskGadgetInfo { - repeated uint32 argument_list = 1; + repeated uint32 argument_list = 1; } - diff --git a/proto/DestroyMaterialReq.proto b/proto/DestroyMaterialReq.proto index 8d3021fa..356ba472 100644 --- a/proto/DestroyMaterialReq.proto +++ b/proto/DestroyMaterialReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "MaterialInfo.proto"; // CmdId: 697 +// Obf: AFOBMEMONBP message DestroyMaterialReq { repeated MaterialInfo material_list = 9; } diff --git a/proto/DestroyMaterialRsp.proto b/proto/DestroyMaterialRsp.proto index f17bb363..63ba8fd3 100644 --- a/proto/DestroyMaterialRsp.proto +++ b/proto/DestroyMaterialRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 670 +// Obf: IGGKOFLKOID message DestroyMaterialRsp { repeated uint32 item_id_list = 6; repeated uint32 item_count_list = 5; diff --git a/proto/DigActivityDetailInfo.proto b/proto/DigActivityDetailInfo.proto new file mode 100644 index 00000000..49bcd38e --- /dev/null +++ b/proto/DigActivityDetailInfo.proto @@ -0,0 +1,28 @@ +// 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 "DigMarkPoint.proto"; +// Obf: BGOEADLCCNF +message DigActivityDetailInfo { + uint32 stage_id = 6; + repeated uint32 stage_id_list = 1; + repeated DigMarkPoint dig_mark_point_list = 13; +} diff --git a/proto/DigMarkPoint.proto b/proto/DigMarkPoint.proto new file mode 100644 index 00000000..5f2ccd68 --- /dev/null +++ b/proto/DigMarkPoint.proto @@ -0,0 +1,28 @@ +// 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: NLKAGPEGIKH +message DigMarkPoint { + Vector rot = 8; + Vector pos = 7; + uint32 bundle_id = 6; +} diff --git a/proto/DoGachaReq.proto b/proto/DoGachaReq.proto index e19e6220..a555db15 100644 --- a/proto/DoGachaReq.proto +++ b/proto/DoGachaReq.proto @@ -20,10 +20,11 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1502 +// Obf: HHMFFFGMBJP message DoGachaReq { - uint32 gachaType = 15; - uint32 gachaRandom = 9; - string gacha_tag = 14; - uint32 gachaTimes = 12; - uint32 gachaScheduleId = 1; + uint32 gachaRandom = 15; + uint32 gachaScheduleId = 9; + string gachaTag = 14; + uint32 gachaType = 12; + uint32 gachaTimes = 1; } diff --git a/proto/DoGachaRsp.proto b/proto/DoGachaRsp.proto index 153b4950..50557575 100644 --- a/proto/DoGachaRsp.proto +++ b/proto/DoGachaRsp.proto @@ -1,28 +1,45 @@ +// 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 "GachaItem.proto"; -// 3.6 HELP +import "GachaItem.proto"; +// CmdId: 1572 +// Obf: MPPONHMOAGA message DoGachaRsp { - bool Unk3300_HFEKPDOKLDK = 823; - uint32 gacha_type = 7; - uint32 wishProgress = 5; - bool Unk3300_PKOIBFIOLAO = 651; - uint32 tenCostItemNum = 8; - repeated GachaItem gacha_item_list = 4; - int32 retcode = 10; - uint32 gacha_times = 9; - uint32 gachaTimesLimit = 1; - uint32 curScheduleDailyGachaTimes = 845; - uint32 costItemId = 14; - uint32 leftGachaTimes = 3; - uint32 tenCostItemId = 15; - uint32 gacha_schedule_id = 2; - uint32 wishItemId = 12; - uint32 newGachaRandom = 965; //PKPENDLDPKI - uint32 daily_gacha_times = 11; //FIHHLGMNIDM - uint32 costItemNum = 6; - uint32 wishMaxProgress = 13; + uint32 curScheduleDailyGachaTimes = 1392; + uint32 wishMaxProgress = 4; + uint32 gachaScheduleId = 15; + int32 retcode = 13; + uint32 wishProgress = 12; + uint32 dailyGachaTimes = 418; + uint32 gachaTimesLimit = 3; + repeated GachaItem gacha_item_list = 11; + uint32 gachaType = 14; + uint32 newGachaRandom = 8; + uint32 leftGachaTimes = 6; + uint32 gachaTimes = 10; + uint32 tenCostItemNum = 1; + uint32 tenCostItemId = 2; + uint32 costItemNum = 5; + bool KIHLEFLGKAD = 888; + uint32 wishItemId = 7; + uint32 costItemId = 9; + bool PLBFOACGPII = 125; } diff --git a/proto/DoSetPlayerBornDataNotify.proto b/proto/DoSetPlayerBornDataNotify.proto index 820cab47..69583da8 100644 --- a/proto/DoSetPlayerBornDataNotify.proto +++ b/proto/DoSetPlayerBornDataNotify.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 138 +// Obf: EOOGKFDOKNO message DoSetPlayerBornDataNotify { } diff --git a/proto/DragonSpineActivityDetailInfo.proto b/proto/DragonSpineActivityDetailInfo.proto new file mode 100644 index 00000000..a097fca6 --- /dev/null +++ b/proto/DragonSpineActivityDetailInfo.proto @@ -0,0 +1,32 @@ +// 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 "DragonSpineChapterInfo.proto"; +// Obf: EJGGAFPNCNC +message DragonSpineActivityDetailInfo { + uint32 MPBEPGFLKGH = 12; + uint32 weapon_enhance_level = 5; + bool is_content_closed = 4; + uint32 EFJOFMJNHEM = 8; + uint32 BFHMDKOEJPC = 1; + uint32 LNHGDOBIBFH = 7; + repeated DragonSpineChapterInfo chapter_info_list = 14; +} diff --git a/proto/DragonSpineChapterInfo.proto b/proto/DragonSpineChapterInfo.proto new file mode 100644 index 00000000..c75ded0c --- /dev/null +++ b/proto/DragonSpineChapterInfo.proto @@ -0,0 +1,29 @@ +// 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: JCLHNCHPMHJ +message DragonSpineChapterInfo { + uint32 progress = 14; + bool is_open = 3; + uint32 open_time = 8; + uint32 finished_mission_num = 9; + uint32 chapter_id = 6; +} diff --git a/proto/DropHintNotify.proto b/proto/DropHintNotify.proto index e70a2efa..92f4231c 100644 --- a/proto/DropHintNotify.proto +++ b/proto/DropHintNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; // CmdId: 642 +// Obf: KGCIHOMNDOG message DropHintNotify { repeated uint32 item_id_list = 10; Vector position = 7; diff --git a/proto/DropItemReq.proto b/proto/DropItemReq.proto index 823f4b4c..b535f8f6 100644 --- a/proto/DropItemReq.proto +++ b/proto/DropItemReq.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "StoreType.proto"; import "Vector.proto"; // CmdId: 630 +// Obf: HBHDPEOGOMB message DropItemReq { StoreType store_type = 3; Vector pos = 15; diff --git a/proto/DropItemRsp.proto b/proto/DropItemRsp.proto index 026586ef..74847f63 100644 --- a/proto/DropItemRsp.proto +++ b/proto/DropItemRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "StoreType.proto"; // CmdId: 684 +// Obf: EKDEIKGMKHK message DropItemRsp { StoreType store_type = 12; uint64 guid = 1; diff --git a/proto/DuelHeartDetailInfo.proto b/proto/DuelHeartDetailInfo.proto new file mode 100644 index 00000000..25d08336 --- /dev/null +++ b/proto/DuelHeartDetailInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "DuelHeartLevelInfo.proto"; +// Obf: PHJLCCEGOOL +message DuelHeartDetailInfo { + repeated DuelHeartLevelInfo level_info_list = 14; +} diff --git a/proto/DuelHeartLevelDifficultyInfo.proto b/proto/DuelHeartLevelDifficultyInfo.proto new file mode 100644 index 00000000..3808db7e --- /dev/null +++ b/proto/DuelHeartLevelDifficultyInfo.proto @@ -0,0 +1,27 @@ +// 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: ODLHFHHKAJL +message DuelHeartLevelDifficultyInfo { + bool is_open = 12; + uint32 difficulty = 11; + uint32 cost_time = 13; +} diff --git a/proto/DuelHeartLevelInfo.proto b/proto/DuelHeartLevelInfo.proto new file mode 100644 index 00000000..038c9f96 --- /dev/null +++ b/proto/DuelHeartLevelInfo.proto @@ -0,0 +1,29 @@ +// 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 "DuelHeartLevelDifficultyInfo.proto"; +// Obf: GMILLBPNIFK +message DuelHeartLevelInfo { + bool is_open = 10; + repeated DuelHeartLevelDifficultyInfo difficulty_info_list = 4; + bool is_cg_viewed = 15; + uint32 level_id = 5; +} diff --git a/proto/DungeonCandidateTeamChangeAvatarReq.proto b/proto/DungeonCandidateTeamChangeAvatarReq.proto index 87c7f8dd..1e436c91 100644 --- a/proto/DungeonCandidateTeamChangeAvatarReq.proto +++ b/proto/DungeonCandidateTeamChangeAvatarReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 949 +// Obf: HPEDCFMBMIO message DungeonCandidateTeamChangeAvatarReq { repeated uint64 avatar_guid_list = 9; } diff --git a/proto/DungeonCandidateTeamChangeAvatarRsp.proto b/proto/DungeonCandidateTeamChangeAvatarRsp.proto index 21b68b2f..45b3fa5c 100644 --- a/proto/DungeonCandidateTeamChangeAvatarRsp.proto +++ b/proto/DungeonCandidateTeamChangeAvatarRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 912 +// Obf: DBOPADOPECA message DungeonCandidateTeamChangeAvatarRsp { int32 retcode = 13; } diff --git a/proto/DungeonChallengeBeginNotify.proto b/proto/DungeonChallengeBeginNotify.proto index 6f319cb4..17f4c8a6 100644 --- a/proto/DungeonChallengeBeginNotify.proto +++ b/proto/DungeonChallengeBeginNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 938 +// Obf: DKKGJFNOEAC message DungeonChallengeBeginNotify { repeated uint32 uid_list = 10; repeated uint32 param_list = 9; diff --git a/proto/DungeonChallengeFinishNotify.proto b/proto/DungeonChallengeFinishNotify.proto index b8907ec6..a12d8e8c 100644 --- a/proto/DungeonChallengeFinishNotify.proto +++ b/proto/DungeonChallengeFinishNotify.proto @@ -18,26 +18,28 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + +import "StrengthenPointData.proto"; import "ChallengeFinishType.proto"; import "ChannellerSlabLoopDungeonResultInfo.proto"; -//import "CustomDungeonResultInfo.proto"; -//import "EffigyChallengeDungeonResultInfo.proto"; -//import "PotionDungeonResultInfo.proto"; -import "StrengthenPointData.proto"; +import "EffigyChallengeDungeonResultInfo.proto"; +import "PotionDungeonResultInfo.proto"; +import "CustomDungeonResultInfo.proto"; // CmdId: 988 +// Obf: ECHJKHMEHOI message DungeonChallengeFinishNotify { uint32 challenge_index = 1; - uint32 currentValue = 6; + uint32 challengeRecordType = 6; bool is_new_record = 5; uint32 time_cost = 2; - uint32 challengeRecordType = 11; + uint32 currentValue = 11; map strengthen_point_data_map = 9; bool is_success = 4; ChallengeFinishType finish_type = 15; oneof detail { ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1334; - //EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 72; - //PotionDungeonResultInfo potion_dungeon_result_info = 1530; - //CustomDungeonResultInfo custom_dungeon_result_info = 1095; + EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 72; + PotionDungeonResultInfo potion_dungeon_result_info = 1530; + CustomDungeonResultInfo custom_dungeon_result_info = 1095; } } diff --git a/proto/DungeonEnterPosInfo.proto b/proto/DungeonEnterPosInfo.proto index 9b6b9695..fa10af77 100644 --- a/proto/DungeonEnterPosInfo.proto +++ b/proto/DungeonEnterPosInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: FDJIODEJHOM message DungeonEnterPosInfo { uint32 point_id = 14; uint32 quest_id = 1; diff --git a/proto/DungeonEntryInfo.proto b/proto/DungeonEntryInfo.proto index a284e03d..96cb78a4 100644 --- a/proto/DungeonEntryInfo.proto +++ b/proto/DungeonEntryInfo.proto @@ -20,12 +20,13 @@ option java_package = "emu.grasscutter.net.proto"; import "WeeklyBossResinDiscountInfo.proto"; +// Obf: FCEKHDABEJM message DungeonEntryInfo { - uint32 DPHKKFGLCMM = 13; + uint32 FFJHKNBBFMF = 13; uint32 dungeon_id = 9; - uint32 DCIOPCGIJML = 5; + uint32 max_boss_chest_num = 5; bool is_passed = 12; - uint32 LCDOJEBBDJP = 11; + uint32 ODGFEEPJAJA = 11; uint32 next_refresh_time = 10; WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 3; uint32 start_time = 4; diff --git a/proto/DungeonEntryInfoReq.proto b/proto/DungeonEntryInfoReq.proto index a4de7ebc..e856a020 100644 --- a/proto/DungeonEntryInfoReq.proto +++ b/proto/DungeonEntryInfoReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Uint32Pair.proto"; // CmdId: 975 +// Obf: AJKOHJOADJG message DungeonEntryInfoReq { repeated Uint32Pair scene_point_id_list = 2; uint32 scene_id = 10; diff --git a/proto/DungeonEntryInfoRsp.proto b/proto/DungeonEntryInfoRsp.proto index fb8ba094..166d8a56 100644 --- a/proto/DungeonEntryInfoRsp.proto +++ b/proto/DungeonEntryInfoRsp.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "DungeonEntryPointInfo.proto"; import "DungeonEntryInfo.proto"; // CmdId: 996 +// Obf: FEABLOCKDAP message DungeonEntryInfoRsp { repeated DungeonEntryPointInfo dungeon_entry_point_list = 15; uint32 point_id = 5; diff --git a/proto/DungeonEntryPointInfo.proto b/proto/DungeonEntryPointInfo.proto index f8625593..b6144676 100644 --- a/proto/DungeonEntryPointInfo.proto +++ b/proto/DungeonEntryPointInfo.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "DungeonEntryInfo.proto"; +// Obf: HNGDNNFJAPO message DungeonEntryPointInfo { uint32 recommend_dungeon_id = 10; uint32 scene_id = 14; diff --git a/proto/DungeonSettleExhibitionInfo.proto b/proto/DungeonSettleExhibitionInfo.proto index e6c8d360..9e2570c2 100644 --- a/proto/DungeonSettleExhibitionInfo.proto +++ b/proto/DungeonSettleExhibitionInfo.proto @@ -1,13 +1,28 @@ +// 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 "ExhibitionDisplayInfo.proto"; import "OnlinePlayerInfo.proto"; - -// Name: DKGOPEKBNNN +// Obf: DBHHHJAGAHO message DungeonSettleExhibitionInfo { - OnlinePlayerInfo player_info = 9; - repeated ExhibitionDisplayInfo card_list = 11; + repeated ExhibitionDisplayInfo card_list = 13; + OnlinePlayerInfo player_info = 3; } - diff --git a/proto/DungeonSettleNotify.proto b/proto/DungeonSettleNotify.proto index 5a925131..bf4cc3f1 100644 --- a/proto/DungeonSettleNotify.proto +++ b/proto/DungeonSettleNotify.proto @@ -1,29 +1,66 @@ +// 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 "DungeonSettleExhibitionInfo.proto"; import "ParamList.proto"; import "StrengthenPointData.proto"; import "TowerLevelEndNotify.proto"; import "TrialAvatarFirstPassDungeonNotify.proto"; - -import "DungeonSettleExhibitionInfo.proto"; - -// 3.6 HELP +import "ChannellerSlabLoopDungeonResultInfo.proto"; +import "EffigyChallengeDungeonResultInfo.proto"; +import "RoguelikeDungeonSettleInfo.proto"; +import "CrystalLinkDungeonSettleInfo.proto"; +import "SummerTimeV2DungeonSettleInfo.proto"; +import "InstableSprayDungeonSettleInfo.proto"; +import "WindFieldDungeonSettleInfo.proto"; +import "EffigyChallengeV2SettleInfo.proto"; +import "TeamChainSettleInfo.proto"; +import "PacmanSettleInfo.proto"; +import "FungusFighterV2SettleInfo.proto"; +// CmdId: 930 +// Obf: LOMPLBCCKGC message DungeonSettleNotify { - uint32 use_time = 5; - uint32 create_player_uid = 9; // CHNDMCHIOON - map settle_show = 14; - map strengthen_point_data_map = 8; - uint32 close_time = 13; - uint32 dungeon_id = 7; - repeated DungeonSettleExhibitionInfo exhibition_info_list = 11; - bool is_success = 2; - repeated uint32 fail_cond_list = 12; - uint32 result = 10; // BBMMPMLBGJO - oneof detail { - TowerLevelEndNotify tower_level_end_notify = 1587; - TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 1512; - } + repeated DungeonSettleExhibitionInfo exhibition_info_list = 13; + uint32 use_time = 1; + map settle_show = 11; + uint32 result = 14; + repeated uint32 fail_cond_list = 10; + map strengthen_point_data_map = 5; + bool is_success = 6; + uint32 create_player_uid = 3; + uint32 close_time = 12; + uint32 dungeon_id = 9; + oneof detail { + TowerLevelEndNotify tower_level_end_notify = 956; + TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 989; + ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 588; + EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1402; + RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 385; + CrystalLinkDungeonSettleInfo crystal_link_settle_info = 1617; + SummerTimeV2DungeonSettleInfo summer_time_v2_dungeon_settle_info = 1110; + InstableSprayDungeonSettleInfo instable_spray_settle_info = 100; + WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 1385; + EffigyChallengeV2SettleInfo effigy_challenge_v2_settle_info = 1559; + TeamChainSettleInfo team_chain_settle_info = 86; + PacmanSettleInfo pacman_settle_info = 903; + FungusFighterV2SettleInfo fungus_fighter_v2_settle_info = 1637; + } } - diff --git a/proto/DungeonShowReminderNotify.proto b/proto/DungeonShowReminderNotify.proto index 9620a7b6..c71e7c9b 100644 --- a/proto/DungeonShowReminderNotify.proto +++ b/proto/DungeonShowReminderNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 934 +// Obf: BIJEIFJHGGO message DungeonShowReminderNotify { uint32 reminder_id = 14; } diff --git a/proto/DungeonSlipRevivePointActivateReq.proto b/proto/DungeonSlipRevivePointActivateReq.proto index 73014f78..5ca9b7db 100644 --- a/proto/DungeonSlipRevivePointActivateReq.proto +++ b/proto/DungeonSlipRevivePointActivateReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 956 +// Obf: MJDBOGJIPMD message DungeonSlipRevivePointActivateReq { uint32 slip_revive_point_id = 1; } diff --git a/proto/DungeonSlipRevivePointActivateRsp.proto b/proto/DungeonSlipRevivePointActivateRsp.proto index 2bbee5b7..e32227ff 100644 --- a/proto/DungeonSlipRevivePointActivateRsp.proto +++ b/proto/DungeonSlipRevivePointActivateRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 963 +// Obf: JALJOAGHFLD message DungeonSlipRevivePointActivateRsp { uint32 slip_revive_point_id = 15; int32 retcode = 10; diff --git a/proto/DungeonWayPointActivateReq.proto b/proto/DungeonWayPointActivateReq.proto index c923e4e8..0ffb29a6 100644 --- a/proto/DungeonWayPointActivateReq.proto +++ b/proto/DungeonWayPointActivateReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 935 +// Obf: JAMLIJIPNJJ message DungeonWayPointActivateReq { uint32 way_point_id = 14; } diff --git a/proto/DungeonWayPointActivateRsp.proto b/proto/DungeonWayPointActivateRsp.proto index 2c6c7ba6..acb33636 100644 --- a/proto/DungeonWayPointActivateRsp.proto +++ b/proto/DungeonWayPointActivateRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 987 +// Obf: AECJNNCDMFE message DungeonWayPointActivateRsp { uint32 way_point_id = 5; int32 retcode = 2; diff --git a/proto/DungeonWayPointNotify.proto b/proto/DungeonWayPointNotify.proto index d1660157..4f4d4c86 100644 --- a/proto/DungeonWayPointNotify.proto +++ b/proto/DungeonWayPointNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 958 +// Obf: KECNNMOLGML message DungeonWayPointNotify { repeated uint32 active_way_point_list = 15; bool is_add = 1; diff --git a/proto/EDMLKGMOBLK.proto b/proto/EDMLKGMOBLK.proto new file mode 100644 index 00000000..5f0d3d6c --- /dev/null +++ b/proto/EDMLKGMOBLK.proto @@ -0,0 +1,25 @@ +// 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 "JNNKDCBMHMP.proto"; +message EDMLKGMOBLK { + repeated JNNKDCBMHMP level_info_list = 13; +} diff --git a/proto/EMIEAKAMEGC.proto b/proto/EMIEAKAMEGC.proto new file mode 100644 index 00000000..a05b73d4 --- /dev/null +++ b/proto/EMIEAKAMEGC.proto @@ -0,0 +1,25 @@ +// 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 "CCPLHHKMDPJ.proto"; +message EMIEAKAMEGC { + repeated CCPLHHKMDPJ level_info_list = 13; +} diff --git a/proto/EchoShellDetailInfo.proto b/proto/EchoShellDetailInfo.proto new file mode 100644 index 00000000..6f798b5a --- /dev/null +++ b/proto/EchoShellDetailInfo.proto @@ -0,0 +1,29 @@ +// 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 "SummerTimeDungeonInfo.proto"; +// Obf: DIBPFDJEBMC +message EchoShellDetailInfo { + repeated uint32 JCPFGDCAGFC = 5; + repeated uint32 LPEHAMKJFCA = 13; + repeated uint32 FKBCPCENBPP = 2; + repeated SummerTimeDungeonInfo summer_time_dungeon_list = 9; +} diff --git a/proto/EchoShellInfo.proto b/proto/EchoShellInfo.proto index f42ba8f5..723456ea 100644 --- a/proto/EchoShellInfo.proto +++ b/proto/EchoShellInfo.proto @@ -1,10 +1,25 @@ +// 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"; -// Name: EMEGCNJLBOD +// Obf: ODKKHMAMPOH message EchoShellInfo { - uint32 shell_id = 1; + uint32 shell_id = 1; } - diff --git a/proto/EffigyActivityDetailInfo.proto b/proto/EffigyActivityDetailInfo.proto new file mode 100644 index 00000000..45433e58 --- /dev/null +++ b/proto/EffigyActivityDetailInfo.proto @@ -0,0 +1,29 @@ +// 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 "EffigyDailyInfo.proto"; +// Obf: GBNCPNIPIOC +message EffigyActivityDetailInfo { + repeated uint32 taken_reward_index_list = 10; + repeated EffigyDailyInfo daily_info_list = 1; + uint32 last_difficulty_id = 3; + uint32 cur_score = 4; +} diff --git a/proto/EffigyChallengeDungeonResultInfo.proto b/proto/EffigyChallengeDungeonResultInfo.proto new file mode 100644 index 00000000..40cf0ea6 --- /dev/null +++ b/proto/EffigyChallengeDungeonResultInfo.proto @@ -0,0 +1,29 @@ +// 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: GOJCDDACIBM +message EffigyChallengeDungeonResultInfo { + uint32 challenge_max_score = 12; + uint32 challenge_score = 5; + uint32 challenge_id = 13; + bool is_in_time_limit = 7; + bool is_success = 9; +} diff --git a/proto/EffigyChallengeV2DetailInfo.proto b/proto/EffigyChallengeV2DetailInfo.proto new file mode 100644 index 00000000..5ad3bce3 --- /dev/null +++ b/proto/EffigyChallengeV2DetailInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "EffigyChallengeV2LevelData.proto"; +// Obf: JMPDMDFONLJ +message EffigyChallengeV2DetailInfo { + repeated EffigyChallengeV2LevelData level_data_list = 6; +} diff --git a/proto/EffigyChallengeV2LevelData.proto b/proto/EffigyChallengeV2LevelData.proto new file mode 100644 index 00000000..759fb36c --- /dev/null +++ b/proto/EffigyChallengeV2LevelData.proto @@ -0,0 +1,30 @@ +// 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: MNPIDOGLIAN +message EffigyChallengeV2LevelData { + uint32 AFLGHGHAOMC = 4; + bool is_level_open = 5; + uint32 level_id = 10; + uint32 DBHOBFBBONG = 9; + uint32 NIIPDHJEGDE = 7; + uint32 PJIHHFHLOGM = 6; +} diff --git a/proto/EffigyChallengeV2SettleInfo.proto b/proto/EffigyChallengeV2SettleInfo.proto new file mode 100644 index 00000000..d5bcbf6a --- /dev/null +++ b/proto/EffigyChallengeV2SettleInfo.proto @@ -0,0 +1,30 @@ +// 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: ALFLMNNNMIO +message EffigyChallengeV2SettleInfo { + uint32 GGGMOHCJPGF = 3; + bool HKKEHABACHB = 5; + uint32 challenge_mode_difficulty = 2; + uint32 BEPLBNMJMHC = 9; + bool GELMKIJIEDG = 11; + uint32 GPNIFILAEFP = 10; +} diff --git a/proto/EffigyDailyInfo.proto b/proto/EffigyDailyInfo.proto new file mode 100644 index 00000000..7bcb0535 --- /dev/null +++ b/proto/EffigyDailyInfo.proto @@ -0,0 +1,31 @@ +// 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: AOAIBCIBMAF +message EffigyDailyInfo { + uint32 day_index = 13; + uint32 PGANOOFALKA = 10; + uint32 challenge_max_score = 5; + uint32 IDEMGOMLJNO = 3; + uint32 challenge_id = 2; + uint32 begin_time = 9; + bool is_first_pass_reward_taken = 12; +} diff --git a/proto/ElectroherculesBattleDetailInfo.proto b/proto/ElectroherculesBattleDetailInfo.proto new file mode 100644 index 00000000..f4763444 --- /dev/null +++ b/proto/ElectroherculesBattleDetailInfo.proto @@ -0,0 +1,27 @@ +// 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 "ElectroherculesBattleStageInfo.proto"; +// Obf: HEOBEJGAFJO +message ElectroherculesBattleDetailInfo { + bool MAABHBPHKED = 14; + repeated ElectroherculesBattleStageInfo stage_info_list = 2; +} diff --git a/proto/ElectroherculesBattleLevelInfo.proto b/proto/ElectroherculesBattleLevelInfo.proto new file mode 100644 index 00000000..2bb727f5 --- /dev/null +++ b/proto/ElectroherculesBattleLevelInfo.proto @@ -0,0 +1,27 @@ +// 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: HNOJMOGEKCA +message ElectroherculesBattleLevelInfo { + uint32 min_finish_time = 15; + uint32 level_id = 13; + bool is_finish = 3; +} diff --git a/proto/ElectroherculesBattleStageInfo.proto b/proto/ElectroherculesBattleStageInfo.proto new file mode 100644 index 00000000..ca3274e8 --- /dev/null +++ b/proto/ElectroherculesBattleStageInfo.proto @@ -0,0 +1,28 @@ +// 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 "ElectroherculesBattleLevelInfo.proto"; +// Obf: EBCDNHPAAKJ +message ElectroherculesBattleStageInfo { + bool is_stage_open = 8; + repeated ElectroherculesBattleLevelInfo level_info_list = 6; + uint32 stage_id = 4; +} diff --git a/proto/ElementReliquaryRequest.proto b/proto/ElementReliquaryRequest.proto deleted file mode 100644 index 8cb8874e..00000000 --- a/proto/ElementReliquaryRequest.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - - - -message ElementReliquaryRequest { - uint32 elementType = 12; - uint32 equipType = 7; -} diff --git a/proto/ElementReliquaryResponse.proto b/proto/ElementReliquaryResponse.proto deleted file mode 100644 index a199e5db..00000000 --- a/proto/ElementReliquaryResponse.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - - -import "GameplayRecommendationReliquaryMainPropData.proto"; - -message ElementReliquaryResponse { - uint32 elementType = 4; - repeated GameplayRecommendationReliquaryMainPropData nbbpegfkpac = 3; - uint32 equipType = 7; -} diff --git a/proto/EndCameraSceneLookNotify.proto b/proto/EndCameraSceneLookNotify.proto index 1d88b2a9..73a698d8 100644 --- a/proto/EndCameraSceneLookNotify.proto +++ b/proto/EndCameraSceneLookNotify.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 218 +// Obf: AIBPCFKJANH message EndCameraSceneLookNotify { } diff --git a/proto/EnterSceneDoneReq.proto b/proto/EnterSceneDoneReq.proto index 38d4fd14..0cf951a4 100644 --- a/proto/EnterSceneDoneReq.proto +++ b/proto/EnterSceneDoneReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 252 +// Obf: POJGGKNMBGG message EnterSceneDoneReq { uint32 enter_scene_token = 5; } diff --git a/proto/EnterSceneDoneRsp.proto b/proto/EnterSceneDoneRsp.proto index ee2927d8..25e3eae3 100644 --- a/proto/EnterSceneDoneRsp.proto +++ b/proto/EnterSceneDoneRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 281 +// Obf: KAGKLNAHCAM message EnterSceneDoneRsp { uint32 enter_scene_token = 13; int32 retcode = 3; diff --git a/proto/EnterScenePeerNotify.proto b/proto/EnterScenePeerNotify.proto index 31b2e7a4..6de0c57a 100644 --- a/proto/EnterScenePeerNotify.proto +++ b/proto/EnterScenePeerNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 257 +// Obf: EPIMOMFOMBE message EnterScenePeerNotify { uint32 peer_id = 5; uint32 host_peer_id = 13; diff --git a/proto/EnterSceneReadyReq.proto b/proto/EnterSceneReadyReq.proto index a7e5dd78..a83e7b1b 100644 --- a/proto/EnterSceneReadyReq.proto +++ b/proto/EnterSceneReadyReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 251 +// Obf: IEJDFJHKAGE message EnterSceneReadyReq { uint32 enter_scene_token = 14; } diff --git a/proto/EnterSceneReadyRsp.proto b/proto/EnterSceneReadyRsp.proto index b788b268..b9888af9 100644 --- a/proto/EnterSceneReadyRsp.proto +++ b/proto/EnterSceneReadyRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 282 +// Obf: NKPMELMPFMD message EnterSceneReadyRsp { uint32 enter_scene_token = 3; int32 retcode = 13; diff --git a/proto/EnterTransPointRegionNotify.proto b/proto/EnterTransPointRegionNotify.proto index b8c0426f..92c19127 100644 --- a/proto/EnterTransPointRegionNotify.proto +++ b/proto/EnterTransPointRegionNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 216 +// Obf: PMGHPLODEOP message EnterTransPointRegionNotify { uint32 point_id = 6; uint32 scene_id = 5; diff --git a/proto/EnterType.proto b/proto/EnterType.proto index e00aac9a..73cd766b 100644 --- a/proto/EnterType.proto +++ b/proto/EnterType.proto @@ -1,21 +1,36 @@ +// 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"; -// Name: JGPGCDFBDAA +// Obf: JFDPPEKABPL enum EnterType { - ENTER_TYPE_NONE = 0; - ENTER_TYPE_SELF = 1; - ENTER_TYPE_GOTO = 2; - ENTER_TYPE_JUMP = 3; - ENTER_TYPE_OTHER = 4; - ENTER_TYPE_BACK = 5; - ENTER_TYPE_DUNGEON = 6; - ENTER_TYPE_DUNGEON_REPLAY = 7; - ENTER_TYPE_GOTO_BY_PORTAL = 8; - ENTER_TYPE_SELF_HOME = 9; - ENTER_TYPE_OTHER_HOME = 10; - ENTER_TYPE_GOTO_RECREATE = 11; + ENTER_TYPE_NONE = 0; + ENTER_TYPE_SELF = 1; + ENTER_TYPE_GOTO = 2; + ENTER_TYPE_JUMP = 3; + ENTER_TYPE_OTHER = 4; + ENTER_TYPE_BACK = 5; + ENTER_TYPE_DUNGEON = 6; + ENTER_TYPE_DUNGEON_REPLAY = 7; + ENTER_TYPE_GOTO_BY_PORTAL = 8; + ENTER_TYPE_SELF_HOME = 9; + ENTER_TYPE_OTHER_HOME = 10; + ENTER_TYPE_GOTO_RECREATE = 11; } - diff --git a/proto/EnterWorldAreaReq.proto b/proto/EnterWorldAreaReq.proto index b119d90b..95caedbd 100644 --- a/proto/EnterWorldAreaReq.proto +++ b/proto/EnterWorldAreaReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 242 +// Obf: PKDAGNPOOOK message EnterWorldAreaReq { uint32 area_id = 11; uint32 area_type = 9; diff --git a/proto/EnterWorldAreaRsp.proto b/proto/EnterWorldAreaRsp.proto index 6614044f..8a3be197 100644 --- a/proto/EnterWorldAreaRsp.proto +++ b/proto/EnterWorldAreaRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 207 +// Obf: GAEPKHKAHGF message EnterWorldAreaRsp { uint32 area_type = 6; uint32 area_id = 13; diff --git a/proto/EntityAbilityInvokeEntry.proto b/proto/EntityAbilityInvokeEntry.proto index 5d587d37..8988efb4 100644 --- a/proto/EntityAbilityInvokeEntry.proto +++ b/proto/EntityAbilityInvokeEntry.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AbilityInvokeEntry.proto"; +// Obf: EPKNGJMINJD message EntityAbilityInvokeEntry { uint32 entity_id = 13; repeated AbilityInvokeEntry invokes = 14; diff --git a/proto/EntityAiSyncNotify.proto b/proto/EntityAiSyncNotify.proto index 7dd005fc..ecada349 100644 --- a/proto/EntityAiSyncNotify.proto +++ b/proto/EntityAiSyncNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AiSyncInfo.proto"; // CmdId: 309 +// Obf: CAIOLKOIKNI message EntityAiSyncNotify { repeated uint32 local_avatar_alerted_monster_list = 8; repeated AiSyncInfo info_list = 1; diff --git a/proto/EntityAuthorityInfo.proto b/proto/EntityAuthorityInfo.proto index 8baf57ca..fc2dc3de 100644 --- a/proto/EntityAuthorityInfo.proto +++ b/proto/EntityAuthorityInfo.proto @@ -25,6 +25,7 @@ import "SceneEntityAiInfo.proto"; import "Vector.proto"; import "AnimatorParameterValueInfoPair.proto"; import "EntityClientExtraInfo.proto"; +// Obf: MMDHAIOHCBJ message EntityAuthorityInfo { AbilitySyncStateInfo ability_info = 1; EntityRendererChangedInfo renderer_changed_info = 2; diff --git a/proto/EntityClientData.proto b/proto/EntityClientData.proto index 97e1e8d0..37983760 100644 --- a/proto/EntityClientData.proto +++ b/proto/EntityClientData.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: MIMMOJNHFCB message EntityClientData { uint32 wind_change_scene_time = 1; float windmill_sync_angle = 2; diff --git a/proto/EntityClientExtraInfo.proto b/proto/EntityClientExtraInfo.proto index d9408a27..49331549 100644 --- a/proto/EntityClientExtraInfo.proto +++ b/proto/EntityClientExtraInfo.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; +// Obf: COEAEBKAFKD message EntityClientExtraInfo { Vector skill_anchor_position = 1; } diff --git a/proto/EntityEnvironmentInfo.proto b/proto/EntityEnvironmentInfo.proto index 98019dee..1e428476 100644 --- a/proto/EntityEnvironmentInfo.proto +++ b/proto/EntityEnvironmentInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: DILGEMDKHHN message EntityEnvironmentInfo { uint32 json_climate_type = 1; uint32 climate_area_id = 2; diff --git a/proto/EntityFightPropChangeReasonNotify.proto b/proto/EntityFightPropChangeReasonNotify.proto index 419be1fb..358eba59 100644 --- a/proto/EntityFightPropChangeReasonNotify.proto +++ b/proto/EntityFightPropChangeReasonNotify.proto @@ -19,16 +19,17 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "ChangeEnergyReason.proto"; -import "PropChangeReason.proto"; import "ChangeHpReason.proto"; +import "PropChangeReason.proto"; +import "ChangeEnergyReason.proto"; // CmdId: 1258 +// Obf: CJKLCKHPBEN message EntityFightPropChangeReasonNotify { - ChangeEnergyReason changeEnergyReason = 15; + ChangeHpReason changeHpReason = 15; repeated uint32 param_list = 1; float prop_delta = 14; PropChangeReason reason = 7; uint32 entity_id = 8; uint32 prop_type = 6; - ChangeHpReason changeHpReason = 4; + ChangeEnergyReason changeEnergyReason = 4; } diff --git a/proto/EntityFightPropUpdateNotify.proto b/proto/EntityFightPropUpdateNotify.proto index 92aa9305..7fc09886 100644 --- a/proto/EntityFightPropUpdateNotify.proto +++ b/proto/EntityFightPropUpdateNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1272 +// Obf: GMLJGKMJLLK message EntityFightPropUpdateNotify { uint32 entity_id = 9; map fight_prop_map = 15; diff --git a/proto/EntityMoveInfo.proto b/proto/EntityMoveInfo.proto index 68b0f898..89f377c4 100644 --- a/proto/EntityMoveInfo.proto +++ b/proto/EntityMoveInfo.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "MotionInfo.proto"; +// Obf: DGBPMOADLDG message EntityMoveInfo { uint32 entity_id = 1; MotionInfo motion_info = 2; diff --git a/proto/EntityRendererChangedInfo.proto b/proto/EntityRendererChangedInfo.proto index ca6bcf6b..eeedd09c 100644 --- a/proto/EntityRendererChangedInfo.proto +++ b/proto/EntityRendererChangedInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: KAFDABCNHDM message EntityRendererChangedInfo { map changed_renderers = 1; uint32 visibility_count = 2; diff --git a/proto/Equip.proto b/proto/Equip.proto index 9be54519..27b55254 100644 --- a/proto/Equip.proto +++ b/proto/Equip.proto @@ -1,16 +1,31 @@ +// 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 "Reliquary.proto"; import "Weapon.proto"; - -// Name: PDGCLANHIJP +// Obf: JFNFEJHPPKA message Equip { - bool is_locked = 3; - oneof detail { - Reliquary reliquary = 1; - Weapon weapon = 2; - } + bool is_locked = 3; + oneof detail { + Reliquary reliquary = 1; + Weapon weapon = 2; + } } - diff --git a/proto/EquipParam.proto b/proto/EquipParam.proto index 3bfb9d91..188347b9 100644 --- a/proto/EquipParam.proto +++ b/proto/EquipParam.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: BCIPINJAEOO message EquipParam { uint32 item_id = 1; uint32 item_num = 2; diff --git a/proto/EquipRoguelikeRuneReq.proto b/proto/EquipRoguelikeRuneReq.proto index 7f98f68a..463f3e0a 100644 --- a/proto/EquipRoguelikeRuneReq.proto +++ b/proto/EquipRoguelikeRuneReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 8154 +// Obf: BCFCGEFCINP message EquipRoguelikeRuneReq { repeated uint32 rune_list = 11; } diff --git a/proto/EquipRoguelikeRuneRsp.proto b/proto/EquipRoguelikeRuneRsp.proto index edf5b3dd..28ebc7dd 100644 --- a/proto/EquipRoguelikeRuneRsp.proto +++ b/proto/EquipRoguelikeRuneRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 8073 +// Obf: OBOCNKCMNLL message EquipRoguelikeRuneRsp { int32 retcode = 3; repeated uint32 rune_list = 5; diff --git a/proto/EvtAiSyncCombatThreatInfoNotify.proto b/proto/EvtAiSyncCombatThreatInfoNotify.proto index dcc9d616..3d9770c8 100644 --- a/proto/EvtAiSyncCombatThreatInfoNotify.proto +++ b/proto/EvtAiSyncCombatThreatInfoNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AiThreatInfo.proto"; // CmdId: 377 +// Obf: HCMBENCEGEP message EvtAiSyncCombatThreatInfoNotify { map combat_threat_info_map = 14; } diff --git a/proto/EvtAiSyncSkillCdNotify.proto b/proto/EvtAiSyncSkillCdNotify.proto index 9002c200..ef5e2308 100644 --- a/proto/EvtAiSyncSkillCdNotify.proto +++ b/proto/EvtAiSyncSkillCdNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AiSkillCdInfo.proto"; // CmdId: 346 +// Obf: IIEAPNAFCGB message EvtAiSyncSkillCdNotify { map ai_cd_map = 6; } diff --git a/proto/EvtAnimatorParameterInfo.proto b/proto/EvtAnimatorParameterInfo.proto index a9b5fb9c..33376bb6 100644 --- a/proto/EvtAnimatorParameterInfo.proto +++ b/proto/EvtAnimatorParameterInfo.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AnimatorParameterValueInfo.proto"; +// Obf: NJDDPFCLLPO message EvtAnimatorParameterInfo { uint32 entity_id = 8; bool is_server_cache = 9; diff --git a/proto/EvtAvatarLockChairReq.proto b/proto/EvtAvatarLockChairReq.proto index c7176436..cc12072e 100644 --- a/proto/EvtAvatarLockChairReq.proto +++ b/proto/EvtAvatarLockChairReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; // CmdId: 370 +// Obf: MMMMKEELLIA message EvtAvatarLockChairReq { uint64 chair_id = 11; Vector position = 4; diff --git a/proto/EvtAvatarLockChairRsp.proto b/proto/EvtAvatarLockChairRsp.proto index 1e7b2824..a4b867e6 100644 --- a/proto/EvtAvatarLockChairRsp.proto +++ b/proto/EvtAvatarLockChairRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; // CmdId: 361 +// Obf: NEEFPFEAJBA message EvtAvatarLockChairRsp { uint32 entity_id = 13; int32 retcode = 15; diff --git a/proto/EvtAvatarSitDownNotify.proto b/proto/EvtAvatarSitDownNotify.proto index 72c5e91f..6430d6e0 100644 --- a/proto/EvtAvatarSitDownNotify.proto +++ b/proto/EvtAvatarSitDownNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; // CmdId: 371 +// Obf: ANDEKBPGEIO message EvtAvatarSitDownNotify { uint32 entity_id = 6; Vector position = 8; diff --git a/proto/EvtAvatarStandUpNotify.proto b/proto/EvtAvatarStandUpNotify.proto index 2c6ea423..5be4477f 100644 --- a/proto/EvtAvatarStandUpNotify.proto +++ b/proto/EvtAvatarStandUpNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 349 +// Obf: AMIICFPACPC message EvtAvatarStandUpNotify { int32 direction = 12; uint32 entity_id = 6; diff --git a/proto/EvtBeingHitInfo.proto b/proto/EvtBeingHitInfo.proto index 4ede5dd1..410cc46a 100644 --- a/proto/EvtBeingHitInfo.proto +++ b/proto/EvtBeingHitInfo.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AttackResult.proto"; +// Obf: FAABEIHJGBK message EvtBeingHitInfo { uint32 frame_num = 9; AttackResult attack_result = 8; diff --git a/proto/EvtCreateGadgetNotify.proto b/proto/EvtCreateGadgetNotify.proto index 78e4d943..26d89205 100644 --- a/proto/EvtCreateGadgetNotify.proto +++ b/proto/EvtCreateGadgetNotify.proto @@ -22,16 +22,17 @@ option java_package = "emu.grasscutter.net.proto"; import "ForwardType.proto"; import "Vector.proto"; // CmdId: 355 +// Obf: DGNDHHIGNBD message EvtCreateGadgetNotify { uint32 camp_id = 11; uint64 guid = 13; - uint32 IPAOHBBDHBN = 9; + uint32 DNAKOOADMLE = 9; repeated uint32 target_lock_point_index_list = 1869; - bool BFHPDEMNGJO = 12; + bool OFEAKOJIKCA = 12; uint32 entity_id = 10; ForwardType forward_type = 4; bool is_async_load = 174; - Vector init_pos = 1; + Vector InitPos = 1; uint32 owner_entity_id = 8; uint32 room_id = 3; uint32 prop_owner_entity_id = 2; @@ -39,7 +40,7 @@ message EvtCreateGadgetNotify { bool is_peer_id_from_player = 172; uint32 config_id = 15; uint32 camp_type = 5; - Vector init_euler_angles = 14; - bool CPEAMBJJDAP = 6; + Vector InitEulerAngles = 14; + bool KJLIAJBFMKL = 6; repeated uint32 target_entity_id_list = 418; } diff --git a/proto/EvtDestroyGadgetNotify.proto b/proto/EvtDestroyGadgetNotify.proto index e6e53724..eeca323e 100644 --- a/proto/EvtDestroyGadgetNotify.proto +++ b/proto/EvtDestroyGadgetNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ForwardType.proto"; // CmdId: 348 +// Obf: KBKJDANOAHC message EvtDestroyGadgetNotify { ForwardType forward_type = 11; uint32 entity_id = 7; diff --git a/proto/EvtDoSkillSuccNotify.proto b/proto/EvtDoSkillSuccNotify.proto index f0d1df7e..4e9435e0 100644 --- a/proto/EvtDoSkillSuccNotify.proto +++ b/proto/EvtDoSkillSuccNotify.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ForwardType.proto"; import "Vector.proto"; // CmdId: 372 +// Obf: IJLDLGMBMAJ message EvtDoSkillSuccNotify { ForwardType forward_type = 8; Vector forward = 6; diff --git a/proto/EvtEntityRenderersChangedNotify.proto b/proto/EvtEntityRenderersChangedNotify.proto index 88bfd941..5aa9d194 100644 --- a/proto/EvtEntityRenderersChangedNotify.proto +++ b/proto/EvtEntityRenderersChangedNotify.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "EntityRendererChangedInfo.proto"; import "ForwardType.proto"; // CmdId: 307 +// Obf: OGKFHAJNEOJ message EvtEntityRenderersChangedNotify { EntityRendererChangedInfo renderer_changed_info = 14; uint32 entity_id = 2; diff --git a/proto/ExhibitionDisplayInfo.proto b/proto/ExhibitionDisplayInfo.proto index 126f1d91..0f48b040 100644 --- a/proto/ExhibitionDisplayInfo.proto +++ b/proto/ExhibitionDisplayInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: FALKBLEJAOC message ExhibitionDisplayInfo { uint32 id = 1; uint32 param = 2; diff --git a/proto/ExitTransPointRegionNotify.proto b/proto/ExitTransPointRegionNotify.proto index f929627f..397bd126 100644 --- a/proto/ExitTransPointRegionNotify.proto +++ b/proto/ExitTransPointRegionNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 228 +// Obf: PICOJJGEMOE message ExitTransPointRegionNotify { uint32 scene_id = 11; uint32 point_id = 1; diff --git a/proto/ExpeditionActivityDetailInfo.proto b/proto/ExpeditionActivityDetailInfo.proto new file mode 100644 index 00000000..39923eb3 --- /dev/null +++ b/proto/ExpeditionActivityDetailInfo.proto @@ -0,0 +1,32 @@ +// 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 "ExpeditionChallengeInfo.proto"; +import "ExpeditionPathInfo.proto"; +// Obf: EFAOCIPELNM +message ExpeditionActivityDetailInfo { + uint32 LIMGPLDAJKP = 3; + uint32 ADMDKNKKDOE = 8; + uint32 content_close_time = 13; + repeated ExpeditionChallengeInfo challenge_info_list = 15; + bool is_content_closed = 6; + repeated ExpeditionPathInfo path_info_list = 11; +} diff --git a/proto/ExpeditionChallengeInfo.proto b/proto/ExpeditionChallengeInfo.proto new file mode 100644 index 00000000..73095c1a --- /dev/null +++ b/proto/ExpeditionChallengeInfo.proto @@ -0,0 +1,27 @@ +// 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: IPJPEPIILAJ +message ExpeditionChallengeInfo { + bool is_finished = 11; + uint32 open_time = 5; + uint32 id = 4; +} diff --git a/proto/ExpeditionPathInfo.proto b/proto/ExpeditionPathInfo.proto new file mode 100644 index 00000000..1044cbf7 --- /dev/null +++ b/proto/ExpeditionPathInfo.proto @@ -0,0 +1,35 @@ +// 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 "ExpeditionState.proto"; +// Obf: FMHECDDFAAE +message ExpeditionPathInfo { + uint32 challenge_id = 10; + repeated uint32 avatar_id_list = 7; + float bonus_probability = 8; + uint32 DPOMPOMLCKP = 11; + uint32 IBKDBMDJGDI = 3; + uint32 start_time = 13; + uint32 FLHKBCEIKLE = 15; + uint32 path_id = 2; + ExpeditionState state = 6; + uint32 MFNGJOCIAPE = 1; +} diff --git a/proto/ExpeditionState.proto b/proto/ExpeditionState.proto new file mode 100644 index 00000000..b2944b2d --- /dev/null +++ b/proto/ExpeditionState.proto @@ -0,0 +1,29 @@ +// 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: GPPFNJKCLPD +enum ExpeditionState { + EXPEDITION_NONE = 0; + EXPEDITION_STARTED = 1; + EXPEDITION_FINISHED = 2; + EXPEDITION_REWARDED = 3; + EXPEDITION_LOCKED = 4; +} diff --git a/proto/EANCFIOAJDF.proto b/proto/FFKMNCKOPHD.proto similarity index 90% rename from proto/EANCFIOAJDF.proto rename to proto/FFKMNCKOPHD.proto index fc1b895d..70b6454d 100644 --- a/proto/EANCFIOAJDF.proto +++ b/proto/FFKMNCKOPHD.proto @@ -19,7 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "BNDMFMICDHI.proto"; -message EANCFIOAJDF { - repeated BNDMFMICDHI PEJEPBDHAPO = 9; +import "GOKFJAACELD.proto"; +message FFKMNCKOPHD { + repeated GOKFJAACELD GMFILGEDGGK = 1; } diff --git a/proto/FeatureBlockInfo.proto b/proto/FeatureBlockInfo.proto index 44617faf..2abd2680 100644 --- a/proto/FeatureBlockInfo.proto +++ b/proto/FeatureBlockInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: CIBFPNBELMG message FeatureBlockInfo { uint32 feature_type = 1; uint32 end_time = 2; diff --git a/proto/FetterData.proto b/proto/FetterData.proto index c80a8f1d..13be811d 100644 --- a/proto/FetterData.proto +++ b/proto/FetterData.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: KDDPKLNAMGL message FetterData { uint32 fetter_id = 1; uint32 fetter_state = 2; diff --git a/proto/FightPropPair.proto b/proto/FightPropPair.proto index 51ff5e90..8c141264 100644 --- a/proto/FightPropPair.proto +++ b/proto/FightPropPair.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: AAIGEAGCKAA message FightPropPair { uint32 prop_type = 1; float prop_value = 2; diff --git a/proto/FindHilichurlAcceptQuestNotify.proto b/proto/FindHilichurlAcceptQuestNotify.proto index 5f963a0c..eaa0bd48 100644 --- a/proto/FindHilichurlAcceptQuestNotify.proto +++ b/proto/FindHilichurlAcceptQuestNotify.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 8560 +// Obf: ACMPJBDCEBG message FindHilichurlAcceptQuestNotify { } diff --git a/proto/FindHilichurlDayContentInfo.proto b/proto/FindHilichurlDayContentInfo.proto new file mode 100644 index 00000000..25457437 --- /dev/null +++ b/proto/FindHilichurlDayContentInfo.proto @@ -0,0 +1,25 @@ +// 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: BHHCINDOAGH +message FindHilichurlDayContentInfo { + uint32 start_time = 1; +} diff --git a/proto/FindHilichurlDetailInfo.proto b/proto/FindHilichurlDetailInfo.proto new file mode 100644 index 00000000..4c9b6c39 --- /dev/null +++ b/proto/FindHilichurlDetailInfo.proto @@ -0,0 +1,32 @@ +// 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 "FindHilichurlDayContentInfo.proto"; +// Obf: BOMIAHEPOKN +message FindHilichurlDetailInfo { + uint32 content_close_time = 12; + bool is_content_closed = 13; + uint32 day_index = 4; + uint32 FFMLPLGOJBO = 11; + repeated FindHilichurlDayContentInfo day_content_info_list = 14; + uint32 AHKMMEEKNKE = 10; + bool is_end_quest_accept = 3; +} diff --git a/proto/FindHilichurlFinishSecondQuestNotify.proto b/proto/FindHilichurlFinishSecondQuestNotify.proto index 9214f00b..2a802589 100644 --- a/proto/FindHilichurlFinishSecondQuestNotify.proto +++ b/proto/FindHilichurlFinishSecondQuestNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 8503 +// Obf: JGILMPHMBLJ message FindHilichurlFinishSecondQuestNotify { uint32 day_index = 8; } diff --git a/proto/FinishedParentQuestNotify.proto b/proto/FinishedParentQuestNotify.proto index 8c0934d8..a105f5e6 100644 --- a/proto/FinishedParentQuestNotify.proto +++ b/proto/FinishedParentQuestNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ParentQuest.proto"; // CmdId: 472 +// Obf: ABDJGNCFLAJ message FinishedParentQuestNotify { repeated ParentQuest parent_quest_list = 8; } diff --git a/proto/FinishedParentQuestUpdateNotify.proto b/proto/FinishedParentQuestUpdateNotify.proto index 587dd8df..2a5b9756 100644 --- a/proto/FinishedParentQuestUpdateNotify.proto +++ b/proto/FinishedParentQuestUpdateNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ParentQuest.proto"; // CmdId: 455 +// Obf: JFLDCJCCNIA message FinishedParentQuestUpdateNotify { repeated ParentQuest parent_quest_list = 13; } diff --git a/proto/FishPoolInfo.proto b/proto/FishPoolInfo.proto index 9029a260..949bb7d7 100644 --- a/proto/FishPoolInfo.proto +++ b/proto/FishPoolInfo.proto @@ -1,12 +1,27 @@ +// 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"; -// Name: PPCINKMGAIE +// Obf: JNLEJBIEONJ message FishPoolInfo { - uint32 pool_id = 1; - repeated uint32 fish_area_list = 2; - uint32 today_fish_num = 3; + uint32 pool_id = 1; + repeated uint32 fish_area_list = 2; + uint32 today_fish_num = 3; } - diff --git a/proto/FishtankFishInfo.proto b/proto/FishtankFishInfo.proto index 7d30f953..6d016e64 100644 --- a/proto/FishtankFishInfo.proto +++ b/proto/FishtankFishInfo.proto @@ -1,12 +1,27 @@ +// 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"; -// Name: GNBJGEJCCJN +// Obf: EMABGGFKFDB message FishtankFishInfo { - float fish_distance_from_water = 1; - float fish_scale = 2; - float initial_rotation_y = 3; + float fish_distance_from_water = 1; + float fish_scale = 2; + float initial_rotation_y = 3; } - diff --git a/proto/FleurFairActivityDetailInfo.proto b/proto/FleurFairActivityDetailInfo.proto new file mode 100644 index 00000000..9665a6a9 --- /dev/null +++ b/proto/FleurFairActivityDetailInfo.proto @@ -0,0 +1,35 @@ +// 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 "FleurFairChapterInfo.proto"; +import "FleurFairDungeonSectionInfo.proto"; +import "FleurFairMinigameInfo.proto"; +// Obf: GNCPDEBAPGF +message FleurFairActivityDetailInfo { + bool is_content_closed = 10; + bool is_dungeon_unlocked = 5; + repeated FleurFairChapterInfo chapter_info_list = 8; + uint32 IEPPDBBGFDE = 3; + uint32 FIAPHEKJGIC = 4; + uint32 content_close_time = 9; + map dungeon_section_info_map = 11; + map minigame_info_map = 12; +} diff --git a/proto/FleurFairBalloonInfo.proto b/proto/FleurFairBalloonInfo.proto new file mode 100644 index 00000000..b74c8d28 --- /dev/null +++ b/proto/FleurFairBalloonInfo.proto @@ -0,0 +1,25 @@ +// 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: GNDNOIIAFFH +message FleurFairBalloonInfo { + uint32 best_score = 10; +} diff --git a/proto/FleurFairChapterInfo.proto b/proto/FleurFairChapterInfo.proto new file mode 100644 index 00000000..7c2d5a19 --- /dev/null +++ b/proto/FleurFairChapterInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +// Obf: ANBPPBIEHCK +message FleurFairChapterInfo { + uint32 chapter_id = 3; + uint32 open_time = 7; +} diff --git a/proto/FleurFairDungeonSectionInfo.proto b/proto/FleurFairDungeonSectionInfo.proto new file mode 100644 index 00000000..288024f5 --- /dev/null +++ b/proto/FleurFairDungeonSectionInfo.proto @@ -0,0 +1,27 @@ +// 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: OFGPKKENEFH +message FleurFairDungeonSectionInfo { + bool is_open = 2; + uint32 section_id = 10; + uint32 open_time = 14; +} diff --git a/proto/FOFMOHPPKPO.proto b/proto/FleurFairFallInfo.proto similarity index 92% rename from proto/FOFMOHPPKPO.proto rename to proto/FleurFairFallInfo.proto index 409a0b6b..fb35ff5e 100644 --- a/proto/FOFMOHPPKPO.proto +++ b/proto/FleurFairFallInfo.proto @@ -19,7 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -message FOFMOHPPKPO { - int32 CAJDFEHEKOB = 10; - int32 FKEILGJNBPK = 3; +// Obf: KNDNJKFLHMA +message FleurFairFallInfo { + uint32 best_score = 6; } diff --git a/proto/BBANKBFEFAA.proto b/proto/FleurFairMinigameInfo.proto similarity index 69% rename from proto/BBANKBFEFAA.proto rename to proto/FleurFairMinigameInfo.proto index 000858a4..3e4d8bf1 100644 --- a/proto/BBANKBFEFAA.proto +++ b/proto/FleurFairMinigameInfo.proto @@ -19,19 +19,17 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "ItemParam.proto"; -message BBANKBFEFAA { - message NGEFDJMEEDL { - repeated ItemParam PDGBKGDPCEF = 1; - repeated ItemParam OGMINMOADBB = 2; +import "FleurFairBalloonInfo.proto"; +import "FleurFairFallInfo.proto"; +import "FleurFairMusicGameInfo.proto"; +// Obf: GNHMEEEBHED +message FleurFairMinigameInfo { + uint32 minigame_id = 10; + bool is_open = 15; + uint32 open_time = 2; + oneof detail { + FleurFairBalloonInfo balloon_info = 6; + FleurFairFallInfo fall_info = 4; + FleurFairMusicGameInfo music_info = 7; } - - string product_id = 1; - string price_tier = 2; - uint32 CCHKKIKFLKB = 3; - uint32 AHMBPFPAPJE = 4; - uint32 PFLPFGOIINB = 5; - uint32 BFAJDDJMEGI = 6; - uint32 DKBHNBFAGBG = 7; - optional NGEFDJMEEDL BLLLLOHFPFE = 101; } diff --git a/proto/FleurFairMusicGameInfo.proto b/proto/FleurFairMusicGameInfo.proto new file mode 100644 index 00000000..d09a7f83 --- /dev/null +++ b/proto/FleurFairMusicGameInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "FleurFairMusicRecord.proto"; +// Obf: BNLGMOEKANO +message FleurFairMusicGameInfo { + map music_record_map = 7; +} diff --git a/proto/FleurFairMusicGameSettleReq.proto b/proto/FleurFairMusicGameSettleReq.proto index 88039433..0b84bb2f 100644 --- a/proto/FleurFairMusicGameSettleReq.proto +++ b/proto/FleurFairMusicGameSettleReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2180 +// Obf: GKEIMINCNJL message FleurFairMusicGameSettleReq { uint32 correct_hit = 7; uint32 combo = 3; diff --git a/proto/FleurFairMusicGameSettleRsp.proto b/proto/FleurFairMusicGameSettleRsp.proto index c596bb24..08bde048 100644 --- a/proto/FleurFairMusicGameSettleRsp.proto +++ b/proto/FleurFairMusicGameSettleRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2125 +// Obf: GIGACANHOPK message FleurFairMusicGameSettleRsp { uint32 music_basic_id = 5; int32 retcode = 15; diff --git a/proto/FleurFairMusicGameStartReq.proto b/proto/FleurFairMusicGameStartReq.proto index 39dda28a..5261df18 100644 --- a/proto/FleurFairMusicGameStartReq.proto +++ b/proto/FleurFairMusicGameStartReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2113 +// Obf: KGOCNOHNNNE message FleurFairMusicGameStartReq { uint32 music_basic_id = 11; } diff --git a/proto/FleurFairMusicGameStartRsp.proto b/proto/FleurFairMusicGameStartRsp.proto index 420e398d..2232ab2f 100644 --- a/proto/FleurFairMusicGameStartRsp.proto +++ b/proto/FleurFairMusicGameStartRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2174 +// Obf: NAECELACNBI message FleurFairMusicGameStartRsp { uint32 music_basic_id = 9; int32 retcode = 13; diff --git a/proto/FleurFairMusicRecord.proto b/proto/FleurFairMusicRecord.proto new file mode 100644 index 00000000..4ea007d3 --- /dev/null +++ b/proto/FleurFairMusicRecord.proto @@ -0,0 +1,27 @@ +// 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: MCFCPKNNJBA +message FleurFairMusicRecord { + uint32 max_score = 2; + uint32 max_combo = 7; + bool is_unlock = 10; +} diff --git a/proto/FleurFairV2DetailInfo.proto b/proto/FleurFairV2DetailInfo.proto new file mode 100644 index 00000000..e9610700 --- /dev/null +++ b/proto/FleurFairV2DetailInfo.proto @@ -0,0 +1,30 @@ +// 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 "FleurFairV2PacmanInfo.proto"; +import "FleurFairV2MusicGameInfo.proto"; +import "FleurFairV2PhotoInfo.proto"; +// Obf: EDPNCKEJJPN +message FleurFairV2DetailInfo { + FleurFairV2PacmanInfo pacman_info = 7; + FleurFairV2MusicGameInfo music_game_info = 4; + FleurFairV2PhotoInfo photo_info = 14; +} diff --git a/proto/FleurFairV2MusicGameInfo.proto b/proto/FleurFairV2MusicGameInfo.proto new file mode 100644 index 00000000..5dfedd57 --- /dev/null +++ b/proto/FleurFairV2MusicGameInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "MusicGameRecord.proto"; +// Obf: CBKMKJIHFIO +message FleurFairV2MusicGameInfo { + map music_game_record_map = 9; +} diff --git a/proto/FleurFairV2PacmanInfo.proto b/proto/FleurFairV2PacmanInfo.proto new file mode 100644 index 00000000..e1ecda9d --- /dev/null +++ b/proto/FleurFairV2PacmanInfo.proto @@ -0,0 +1,27 @@ +// 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 "FleurFairV2StageData.proto"; +// Obf: MNBNPPENDJF +message FleurFairV2PacmanInfo { + uint32 HPKAAFECFHF = 12; + repeated FleurFairV2StageData stage_data_list = 13; +} diff --git a/proto/FleurFairV2PhotoInfo.proto b/proto/FleurFairV2PhotoInfo.proto new file mode 100644 index 00000000..85c45af5 --- /dev/null +++ b/proto/FleurFairV2PhotoInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "FleurFairV2PhotoPosData.proto"; +// Obf: BGFNBENIOKE +message FleurFairV2PhotoInfo { + repeated FleurFairV2PhotoPosData photo_pos_data_list = 10; +} diff --git a/proto/MPEONKDACFL.proto b/proto/FleurFairV2PhotoPosData.proto similarity index 83% rename from proto/MPEONKDACFL.proto rename to proto/FleurFairV2PhotoPosData.proto index 091a73cf..326bcc01 100644 --- a/proto/MPEONKDACFL.proto +++ b/proto/FleurFairV2PhotoPosData.proto @@ -20,11 +20,11 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; -message MPEONKDACFL { - fixed32 OLCHHOPKNMP = 12; - uint32 uid = 6; - Vector OHINJNMDOKG = 8; - fixed32 MKBBLPBBAPK = 14; - Vector JFLFFDGDOAB = 15; - fixed32 IKEDLABLPGF = 9; +// Obf: DMABGAGCFAO +message FleurFairV2PhotoPosData { + uint32 open_time = 9; + bool is_view = 7; + Vector center = 11; + uint32 pos_id = 1; + bool is_open = 8; } diff --git a/proto/FleurFairV2StageData.proto b/proto/FleurFairV2StageData.proto new file mode 100644 index 00000000..94cbe380 --- /dev/null +++ b/proto/FleurFairV2StageData.proto @@ -0,0 +1,28 @@ +// 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: MEAHMOOPKGL +message FleurFairV2StageData { + uint32 stage_id = 2; + uint32 best_score = 3; + bool is_open = 10; + bool is_finish = 14; +} diff --git a/proto/CLIPCGJEBBP.proto b/proto/FlightActivityDetailInfo.proto similarity index 81% rename from proto/CLIPCGJEBBP.proto rename to proto/FlightActivityDetailInfo.proto index 93fa3230..3df19f5a 100644 --- a/proto/CLIPCGJEBBP.proto +++ b/proto/FlightActivityDetailInfo.proto @@ -19,12 +19,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -message CLIPCGJEBBP { - string product_id = 1; - string price_tier = 2; - uint32 CCHKKIKFLKB = 3; - uint32 AOMAJFEPCFC = 4; - uint32 HBIMGMBGAJO = 5; - uint32 OLPODBBGJIM = 6; - bool is_audit = 7; +import "FlightDailyRecord.proto"; +// Obf: MKEIOCFNDGJ +message FlightActivityDetailInfo { + uint32 AHKMMEEKNKE = 4; + repeated FlightDailyRecord daily_record_list = 12; + uint32 BPGGGEFPDBM = 5; } diff --git a/proto/FlightDailyRecord.proto b/proto/FlightDailyRecord.proto new file mode 100644 index 00000000..332ffb3e --- /dev/null +++ b/proto/FlightDailyRecord.proto @@ -0,0 +1,29 @@ +// 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: GAGINLCMOCG +message FlightDailyRecord { + uint32 start_time = 10; + uint32 group_id = 12; + bool is_touched = 3; + uint32 best_score = 7; + repeated uint32 watcher_id_list = 8; +} diff --git a/proto/ForceUpdateInfo.proto b/proto/ForceUpdateInfo.proto index b3934732..37202a19 100644 --- a/proto/ForceUpdateInfo.proto +++ b/proto/ForceUpdateInfo.proto @@ -1,10 +1,25 @@ +// 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"; -// Name: FKIGODAGGJA +// Obf: BFFAMAJFAIO message ForceUpdateInfo { - string force_update_url = 1; + string force_update_url = 1; } - diff --git a/proto/ForgeDataNotify.proto b/proto/ForgeDataNotify.proto index 52898521..1054d578 100644 --- a/proto/ForgeDataNotify.proto +++ b/proto/ForgeDataNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ForgeQueueData.proto"; // CmdId: 689 +// Obf: IFHDGBMDPEO message ForgeDataNotify { map forge_queue_map = 8; repeated uint32 forge_id_list = 9; diff --git a/proto/ForgeFormulaDataNotify.proto b/proto/ForgeFormulaDataNotify.proto index 8c08d238..aa1f0584 100644 --- a/proto/ForgeFormulaDataNotify.proto +++ b/proto/ForgeFormulaDataNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 660 +// Obf: DNELGIHMGNF message ForgeFormulaDataNotify { bool is_locked = 10; uint32 forge_id = 13; diff --git a/proto/ForgeGetQueueDataReq.proto b/proto/ForgeGetQueueDataReq.proto index 48608d04..6d9ff201 100644 --- a/proto/ForgeGetQueueDataReq.proto +++ b/proto/ForgeGetQueueDataReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 680 +// Obf: ICIPKMHLDKP message ForgeGetQueueDataReq { } diff --git a/proto/ForgeGetQueueDataRsp.proto b/proto/ForgeGetQueueDataRsp.proto index 1d19ba28..4ab9d94e 100644 --- a/proto/ForgeGetQueueDataRsp.proto +++ b/proto/ForgeGetQueueDataRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ForgeQueueData.proto"; // CmdId: 659 +// Obf: MHKFEDKBJIN message ForgeGetQueueDataRsp { uint32 max_queue_num = 14; map forge_queue_map = 7; diff --git a/proto/ForgeQueueData.proto b/proto/ForgeQueueData.proto index c31caa0e..8926a077 100644 --- a/proto/ForgeQueueData.proto +++ b/proto/ForgeQueueData.proto @@ -19,12 +19,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: PDINDMONLDB message ForgeQueueData { uint32 avatar_id = 14; - uint32 finish_count = 15; - uint32 queue_id = 13; - uint32 unfinish_count = 4; + uint32 unfinish_count = 15; + uint32 next_finish_timestamp = 13; + uint32 finish_count = 4; uint32 forge_id = 1; - uint32 next_finish_timestamp = 8; - uint32 total_finish_timestamp = 9; + uint32 total_finish_timestamp = 8; + uint32 queue_id = 9; } diff --git a/proto/ForgeQueueDataNotify.proto b/proto/ForgeQueueDataNotify.proto index 50f9fb99..66f1fa1d 100644 --- a/proto/ForgeQueueDataNotify.proto +++ b/proto/ForgeQueueDataNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ForgeQueueData.proto"; // CmdId: 646 +// Obf: IHBNKIMJDCB message ForgeQueueDataNotify { map forge_queue_map = 15; repeated uint32 removed_forge_queue_list = 14; diff --git a/proto/ForgeQueueManipulateReq.proto b/proto/ForgeQueueManipulateReq.proto index dedc9a32..0f69f2ce 100644 --- a/proto/ForgeQueueManipulateReq.proto +++ b/proto/ForgeQueueManipulateReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ForgeQueueManipulateType.proto"; // CmdId: 671 +// Obf: EKPELHPHLBH message ForgeQueueManipulateReq { ForgeQueueManipulateType manipulate_type = 15; uint32 forge_queue_id = 1; diff --git a/proto/ForgeQueueManipulateRsp.proto b/proto/ForgeQueueManipulateRsp.proto index e720dcb6..9b74c79a 100644 --- a/proto/ForgeQueueManipulateRsp.proto +++ b/proto/ForgeQueueManipulateRsp.proto @@ -22,10 +22,11 @@ option java_package = "emu.grasscutter.net.proto"; import "ForgeQueueManipulateType.proto"; import "ItemParam.proto"; // CmdId: 649 +// Obf: DDDGJIMOHAN message ForgeQueueManipulateRsp { ForgeQueueManipulateType manipulate_type = 10; - repeated ItemParam output_item_list = 1; + repeated ItemParam extra_output_item_list = 1; int32 retcode = 5; - repeated ItemParam extra_output_item_list = 9; - repeated ItemParam return_item_list = 14; + repeated ItemParam return_item_list = 9; + repeated ItemParam output_item_list = 14; } diff --git a/proto/ForgeQueueManipulateType.proto b/proto/ForgeQueueManipulateType.proto index 5288f714..ab50d296 100644 --- a/proto/ForgeQueueManipulateType.proto +++ b/proto/ForgeQueueManipulateType.proto @@ -1,11 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Name: EOMPENELAEF +// Obf: HAIPAFCEBEI enum ForgeQueueManipulateType { - FORGE_QUEUE_MANIPULATE_TYPE_RECEIVE_OUTPUT = 0; - FORGE_QUEUE_MANIPULATE_TYPE_STOP_FORGE = 1; + 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 64934585..6966ef70 100644 --- a/proto/ForgeStartReq.proto +++ b/proto/ForgeStartReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 693 +// Obf: PJPLODEIGON message ForgeStartReq { uint32 avatar_id = 13; uint32 forge_id = 10; diff --git a/proto/ForgeStartRsp.proto b/proto/ForgeStartRsp.proto index d2830c15..5750625d 100644 --- a/proto/ForgeStartRsp.proto +++ b/proto/ForgeStartRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 611 +// Obf: DFGJKMJHMFG message ForgeStartRsp { int32 retcode = 6; } diff --git a/proto/ForwardType.proto b/proto/ForwardType.proto index a1876dfc..e1488efa 100644 --- a/proto/ForwardType.proto +++ b/proto/ForwardType.proto @@ -1,9 +1,25 @@ +// 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"; -// Name: PEHLILGOPKN +// Obf: GPGOKLPGBAG enum ForwardType { FORWARD_TYPE_LOCAL = 0; FORWARD_TYPE_TO_ALL = 1; @@ -15,4 +31,3 @@ enum ForwardType { FORWARD_TYPE_ONLY_SERVER = 7; FORWARD_TYPE_TO_ALL_EXIST_EXCEPT_CUR = 8; } - diff --git a/proto/FoundationInfo.proto b/proto/FoundationInfo.proto index 2b4d7cf5..70a62e0c 100644 --- a/proto/FoundationInfo.proto +++ b/proto/FoundationInfo.proto @@ -1,14 +1,29 @@ +// 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 "FoundationStatus.proto"; - -// Name: AMABAPDIMGK +// Obf: DGNBNKHBONE message FoundationInfo { - FoundationStatus status = 1; - repeated uint32 uid_list = 2; - uint32 current_building_id = 3; - uint32 locked_by_uid = 4; + FoundationStatus status = 1; + repeated uint32 uid_list = 2; + uint32 current_building_id = 3; + uint32 locked_by_uid = 4; } - diff --git a/proto/FoundationStatus.proto b/proto/FoundationStatus.proto index a463fd7b..44ee3118 100644 --- a/proto/FoundationStatus.proto +++ b/proto/FoundationStatus.proto @@ -1,13 +1,28 @@ +// 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"; -// Name: BBEMLEOGGGN +// Obf: MHACFHPGBFN enum FoundationStatus { - FOUNDATION_STATUS_NONE = 0; - FOUNDATION_STATUS_INIT = 1; - FOUNDATION_STATUS_BUILDING = 2; - FOUNDATION_STATUS_BUILT = 3; + FOUNDATION_STATUS_NONE = 0; + FOUNDATION_STATUS_INIT = 1; + FOUNDATION_STATUS_BUILDING = 2; + FOUNDATION_STATUS_BUILT = 3; } - diff --git a/proto/FriendBrief.proto b/proto/FriendBrief.proto index d35753e5..57bf8438 100644 --- a/proto/FriendBrief.proto +++ b/proto/FriendBrief.proto @@ -24,6 +24,7 @@ import "SocialShowAvatarInfo.proto"; import "FriendEnterHomeOption.proto"; import "ProfilePicture.proto"; import "PlatformType.proto"; +// Obf: LOJEJNBFKEA message FriendBrief { uint32 uid = 1; string nickname = 2; diff --git a/proto/FriendEnterHomeOption.proto b/proto/FriendEnterHomeOption.proto index 282f3026..3f01a715 100644 --- a/proto/FriendEnterHomeOption.proto +++ b/proto/FriendEnterHomeOption.proto @@ -1,12 +1,27 @@ +// 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"; -// Name: FEDMMHJNFCH +// Obf: CEAPGMBAHFJ enum FriendEnterHomeOption { - FRIEND_ENTER_HOME_OPTION_NEED_CONFIRM = 0; - FRIEND_ENTER_HOME_OPTION_REFUSE = 1; - FRIEND_ENTER_HOME_OPTION_DIRECT = 2; + FRIEND_ENTER_HOME_OPTION_NEED_CONFIRM = 0; + FRIEND_ENTER_HOME_OPTION_REFUSE = 1; + FRIEND_ENTER_HOME_OPTION_DIRECT = 2; } - diff --git a/proto/FriendOnlineState.proto b/proto/FriendOnlineState.proto index 2560040e..e0dcb562 100644 --- a/proto/FriendOnlineState.proto +++ b/proto/FriendOnlineState.proto @@ -1,11 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Name: IFJDEEJLEDK +// Obf: LDPPKCBGAHG enum FriendOnlineState { FRIEND_ONLINE_STATE_DISCONNECT = 0; FRIEND_ONLINE_STATE_ONLINE = 1; } - diff --git a/proto/FungusDetail.proto b/proto/FungusDetail.proto new file mode 100644 index 00000000..defbb0d6 --- /dev/null +++ b/proto/FungusDetail.proto @@ -0,0 +1,29 @@ +// 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: KFHPBFMEBFB +message FungusDetail { + bool is_cultivate = 9; + uint32 KCAJBKNPANK = 14; + uint32 POJPAMKELAA = 2; + uint32 fungus_id = 5; + uint32 name_id = 1; +} diff --git a/proto/FungusFighterDetailInfo.proto b/proto/FungusFighterDetailInfo.proto new file mode 100644 index 00000000..4f3d6eab --- /dev/null +++ b/proto/FungusFighterDetailInfo.proto @@ -0,0 +1,35 @@ +// 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 "FungusTrainingProgressDetail.proto"; +import "FungusTrainingDungeonDetail.proto"; +import "FungusDetail.proto"; +import "FungusPlotStageDetail.proto"; +// Obf: MIMDIDPCGII +message FungusFighterDetailInfo { + repeated uint32 NHPGAMMGJPD = 1; + repeated uint32 NIKBJLIBKDK = 15; + repeated FungusTrainingProgressDetail training_dungeon_progress_detail_list = 5; + repeated FungusTrainingDungeonDetail training_dungeon_detail_list = 4; + repeated FungusDetail fungus_detail_list = 7; + repeated FungusPlotStageDetail plot_stage_detail_list = 2; + repeated uint32 KMIAOOFMCFB = 14; +} diff --git a/proto/FungusFighterMonsterDetail.proto b/proto/FungusFighterMonsterDetail.proto new file mode 100644 index 00000000..e620e4ba --- /dev/null +++ b/proto/FungusFighterMonsterDetail.proto @@ -0,0 +1,27 @@ +// 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: JAIAMJEOAGD +message FungusFighterMonsterDetail { + bool is_alive = 6; + float cur_hp_percentage = 4; + uint32 fungus_id = 9; +} diff --git a/proto/FungusFighterV2DetailInfo.proto b/proto/FungusFighterV2DetailInfo.proto new file mode 100644 index 00000000..0738f41d --- /dev/null +++ b/proto/FungusFighterV2DetailInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "FungusFighterV2LevelData.proto"; +// Obf: PBDBGJBADKF +message FungusFighterV2DetailInfo { + repeated FungusFighterV2LevelData level_data_list = 6; +} diff --git a/proto/FungusFighterV2LevelData.proto b/proto/FungusFighterV2LevelData.proto new file mode 100644 index 00000000..45ce0e09 --- /dev/null +++ b/proto/FungusFighterV2LevelData.proto @@ -0,0 +1,27 @@ +// 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: LLIPOHHDJOL +message FungusFighterV2LevelData { + uint32 PJIHHFHLOGM = 5; + bool is_level_open = 15; + uint32 level_id = 12; +} diff --git a/proto/FungusFighterV2SettleInfo.proto b/proto/FungusFighterV2SettleInfo.proto new file mode 100644 index 00000000..da813631 --- /dev/null +++ b/proto/FungusFighterV2SettleInfo.proto @@ -0,0 +1,30 @@ +// 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: PFFEBPCHBHP +message FungusFighterV2SettleInfo { + uint32 level_id = 6; + uint32 EEJCKKKEBOK = 5; + uint32 cost_time = 2; + bool is_new_record = 11; + uint32 KDCKPCGPNNG = 8; + uint32 BKEAHJGOMEB = 13; +} diff --git a/proto/FungusPlotStageDetail.proto b/proto/FungusPlotStageDetail.proto new file mode 100644 index 00000000..4463ed89 --- /dev/null +++ b/proto/FungusPlotStageDetail.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +// Obf: BMFELBMMIJF +message FungusPlotStageDetail { + bool is_open = 13; + uint32 stage_id = 6; +} diff --git a/proto/FungusTrainingDungeonDetail.proto b/proto/FungusTrainingDungeonDetail.proto new file mode 100644 index 00000000..c0fba03c --- /dev/null +++ b/proto/FungusTrainingDungeonDetail.proto @@ -0,0 +1,27 @@ +// 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: OFJJJIIPKIB +message FungusTrainingDungeonDetail { + uint32 best_score = 5; + uint32 dungeon_id = 12; + bool is_open = 11; +} diff --git a/proto/FungusTrainingMonsterPreviewDetail.proto b/proto/FungusTrainingMonsterPreviewDetail.proto new file mode 100644 index 00000000..bc2b9ab2 --- /dev/null +++ b/proto/FungusTrainingMonsterPreviewDetail.proto @@ -0,0 +1,27 @@ +// 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: EELEHAKPGNM +message FungusTrainingMonsterPreviewDetail { + repeated uint32 affix_list = 7; + uint32 level = 1; + uint32 monster_id = 8; +} diff --git a/proto/FungusTrainingPoolPreviewDetail.proto b/proto/FungusTrainingPoolPreviewDetail.proto new file mode 100644 index 00000000..c6668f79 --- /dev/null +++ b/proto/FungusTrainingPoolPreviewDetail.proto @@ -0,0 +1,27 @@ +// 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 "FungusTrainingMonsterPreviewDetail.proto"; +// Obf: KAHNKMNMPFM +message FungusTrainingPoolPreviewDetail { + uint32 pool_id = 8; + repeated FungusTrainingMonsterPreviewDetail monster_preview_detail_list = 14; +} diff --git a/proto/FungusTrainingProgressDetail.proto b/proto/FungusTrainingProgressDetail.proto new file mode 100644 index 00000000..f995a122 --- /dev/null +++ b/proto/FungusTrainingProgressDetail.proto @@ -0,0 +1,33 @@ +// 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 "FungusFighterMonsterDetail.proto"; +import "FungusTrainingPoolPreviewDetail.proto"; +// Obf: JHPJEKPHADI +message FungusTrainingProgressDetail { + uint32 dungeon_id = 5; + repeated uint32 MLFMGPGFGKG = 8; + repeated FungusFighterMonsterDetail monster_detail_list = 2; + uint32 total_used_time = 10; + repeated uint32 KCIJHMAKOGD = 3; + uint32 cur_round = 15; + repeated FungusTrainingPoolPreviewDetail monster_pool_preview_list = 6; +} diff --git a/proto/Furniture.proto b/proto/Furniture.proto index 9555091a..39c4d19c 100644 --- a/proto/Furniture.proto +++ b/proto/Furniture.proto @@ -1,10 +1,25 @@ +// 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"; -// Name: MENJHDPJMCN +// Obf: BILANGJEJAM message Furniture { - uint32 count = 1; + uint32 count = 1; } - diff --git a/proto/FurnitureCurModuleArrangeCountNotify.proto b/proto/FurnitureCurModuleArrangeCountNotify.proto index 0d0fb3b8..9e1e9d52 100644 --- a/proto/FurnitureCurModuleArrangeCountNotify.proto +++ b/proto/FurnitureCurModuleArrangeCountNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Uint32Pair.proto"; // CmdId: 4856 +// Obf: MCDJNNGJBIO message FurnitureCurModuleArrangeCountNotify { repeated Uint32Pair furniture_arrange_count_list = 14; } diff --git a/proto/FurnitureMakeBeHelpedData.proto b/proto/FurnitureMakeBeHelpedData.proto index 6a26ae4c..0bedd904 100644 --- a/proto/FurnitureMakeBeHelpedData.proto +++ b/proto/FurnitureMakeBeHelpedData.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ProfilePicture.proto"; +// Obf: AINNIGAAKDE message FurnitureMakeBeHelpedData { fixed32 time = 11; uint32 icon = 4; diff --git a/proto/FurnitureMakeBeHelpedNotify.proto b/proto/FurnitureMakeBeHelpedNotify.proto index 83847345..9e0bf0fa 100644 --- a/proto/FurnitureMakeBeHelpedNotify.proto +++ b/proto/FurnitureMakeBeHelpedNotify.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "FurnitureMakeSlot.proto"; import "FurnitureMakeBeHelpedData.proto"; // CmdId: 4457 +// Obf: HIDEAJGPAMG message FurnitureMakeBeHelpedNotify { FurnitureMakeSlot furniture_make_slot = 2; FurnitureMakeBeHelpedData furniture_make_helped_data = 10; diff --git a/proto/FurnitureMakeCancelReq.proto b/proto/FurnitureMakeCancelReq.proto index 90b63618..3e4e6176 100644 --- a/proto/FurnitureMakeCancelReq.proto +++ b/proto/FurnitureMakeCancelReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4663 +// Obf: NNJHMCNPNHK message FurnitureMakeCancelReq { uint32 index = 6; uint32 make_id = 1; diff --git a/proto/FurnitureMakeCancelRsp.proto b/proto/FurnitureMakeCancelRsp.proto index 31e558f8..0e8abe70 100644 --- a/proto/FurnitureMakeCancelRsp.proto +++ b/proto/FurnitureMakeCancelRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "FurnitureMakeSlot.proto"; // CmdId: 4835 +// Obf: FPKCHGPLJIJ message FurnitureMakeCancelRsp { uint32 make_id = 12; FurnitureMakeSlot furniture_make_slot = 6; diff --git a/proto/FurnitureMakeData.proto b/proto/FurnitureMakeData.proto index d64a3d53..62950742 100644 --- a/proto/FurnitureMakeData.proto +++ b/proto/FurnitureMakeData.proto @@ -1,15 +1,30 @@ +// 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"; -// Name: GADICHLBHOI +// Obf: GEJHMMOBDLD message FurnitureMakeData { - fixed32 begin_time = 9; - uint32 dur_time = 7; - fixed32 accelerate_time = 14; - uint32 avatar_id = 11; - uint32 make_id = 5; - uint32 index = 13; + uint32 index = 11; + fixed32 accelerateTime = 9; + uint32 make_id = 12; + fixed32 begin_time = 5; + uint32 avatar_id = 4; + uint32 durTime = 8; } - diff --git a/proto/FurnitureMakeFinishNotify.proto b/proto/FurnitureMakeFinishNotify.proto index ce529c61..d60fa084 100644 --- a/proto/FurnitureMakeFinishNotify.proto +++ b/proto/FurnitureMakeFinishNotify.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4822 +// Obf: AAJECADHNOA message FurnitureMakeFinishNotify { } diff --git a/proto/FurnitureMakeHelpData.proto b/proto/FurnitureMakeHelpData.proto index aad7ad8e..abb87303 100644 --- a/proto/FurnitureMakeHelpData.proto +++ b/proto/FurnitureMakeHelpData.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: IGGFPDFMJAL message FurnitureMakeHelpData { uint32 uid = 8; uint32 times = 5; diff --git a/proto/FurnitureMakeHelpReq.proto b/proto/FurnitureMakeHelpReq.proto index d1562116..85ecbc5a 100644 --- a/proto/FurnitureMakeHelpReq.proto +++ b/proto/FurnitureMakeHelpReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4756 +// Obf: JKNCMMEKFNK message FurnitureMakeHelpReq { } diff --git a/proto/FurnitureMakeHelpRsp.proto b/proto/FurnitureMakeHelpRsp.proto index 5c374f09..10918db5 100644 --- a/proto/FurnitureMakeHelpRsp.proto +++ b/proto/FurnitureMakeHelpRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "FurnitureMakeHelpData.proto"; // CmdId: 4581 +// Obf: HBPNHOHAOOC message FurnitureMakeHelpRsp { int32 retcode = 8; repeated FurnitureMakeHelpData help_data_list = 6; diff --git a/proto/FurnitureMakeInfo.proto b/proto/FurnitureMakeInfo.proto deleted file mode 100644 index e58640a7..00000000 --- a/proto/FurnitureMakeInfo.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - - - -message FurnitureMakeInfo { - uint32 makeCount = 9; - uint32 furnitureId = 7; -} diff --git a/proto/FurnitureMakeMakeInfo.proto b/proto/FurnitureMakeMakeInfo.proto index 65494ea4..ff7addaf 100644 --- a/proto/FurnitureMakeMakeInfo.proto +++ b/proto/FurnitureMakeMakeInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: DAOCMABCHOI message FurnitureMakeMakeInfo { uint32 make_count = 5; uint32 furniture_id = 11; diff --git a/proto/FurnitureMakeReq.proto b/proto/FurnitureMakeReq.proto index c0702a38..ddfbb692 100644 --- a/proto/FurnitureMakeReq.proto +++ b/proto/FurnitureMakeReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4758 +// Obf: BHKDJDDKOAB message FurnitureMakeReq { } diff --git a/proto/FurnitureMakeRsp.proto b/proto/FurnitureMakeRsp.proto index 7fa4e066..a2e96cf8 100644 --- a/proto/FurnitureMakeRsp.proto +++ b/proto/FurnitureMakeRsp.proto @@ -24,6 +24,7 @@ import "FurnitureMakeMakeInfo.proto"; import "FurnitureMakeSlot.proto"; import "FurnitureMakeHelpData.proto"; // CmdId: 4616 +// Obf: PLCFIGAOPOG message FurnitureMakeRsp { int32 retcode = 5; repeated FurnitureMakeBeHelpedData helped_data_list = 1; diff --git a/proto/FurnitureMakeSlot.proto b/proto/FurnitureMakeSlot.proto index 9ef7e431..77de26e5 100644 --- a/proto/FurnitureMakeSlot.proto +++ b/proto/FurnitureMakeSlot.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "FurnitureMakeData.proto"; +// Obf: KGCBBAEMLLI message FurnitureMakeSlot { repeated FurnitureMakeData furniture_make_data_list = 15; } diff --git a/proto/FurnitureMakeStartReq.proto b/proto/FurnitureMakeStartReq.proto index d387f2d9..957d4fca 100644 --- a/proto/FurnitureMakeStartReq.proto +++ b/proto/FurnitureMakeStartReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4849 +// Obf: LAFHCNHLKPN message FurnitureMakeStartReq { uint32 avatar_id = 12; uint32 make_id = 5; diff --git a/proto/FurnitureMakeStartRsp.proto b/proto/FurnitureMakeStartRsp.proto index 2b5489f2..cb0cb129 100644 --- a/proto/FurnitureMakeStartRsp.proto +++ b/proto/FurnitureMakeStartRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "FurnitureMakeSlot.proto"; // CmdId: 4724 +// Obf: MGPINOKJHIM message FurnitureMakeStartRsp { FurnitureMakeSlot furniture_make_slot = 10; int32 retcode = 12; diff --git a/proto/GCGFestivalDetailInfo.proto b/proto/GCGFestivalDetailInfo.proto new file mode 100644 index 00000000..e44b8841 --- /dev/null +++ b/proto/GCGFestivalDetailInfo.proto @@ -0,0 +1,25 @@ +// 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: FJOECJDLCED +message GCGFestivalDetailInfo { + bool OJKNLGIJIBJ = 9; +} diff --git a/proto/GCGTCTavernChallengeData.proto b/proto/GCGTCTavernChallengeData.proto index fca56dbe..cd54e2c5 100644 --- a/proto/GCGTCTavernChallengeData.proto +++ b/proto/GCGTCTavernChallengeData.proto @@ -1,11 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Name: NBGPGDKIFEN +// Obf: GEGDNIBJGAJ message GCGTCTavernChallengeData { - uint32 character_id = 2; - repeated uint32 unlock_level_id_list = 13; + uint32 character_id = 3; + repeated uint32 unlock_level_id_list = 7; } - diff --git a/proto/GCGTCTavernChallengeDataNotify.proto b/proto/GCGTCTavernChallengeDataNotify.proto index 77ece4ca..393092af 100644 --- a/proto/GCGTCTavernChallengeDataNotify.proto +++ b/proto/GCGTCTavernChallengeDataNotify.proto @@ -1,12 +1,27 @@ +// 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 "GCGTCTavernChallengeData.proto"; - -// CmdId: 7414 -// Name: DIAAKFMAGEI +// CmdId: 7777 +// Obf: LLKPACFPMLG message GCGTCTavernChallengeDataNotify { - repeated GCGTCTavernChallengeData tavern_challenge_list = 7; + repeated GCGTCTavernChallengeData tavern_challenge_list = 4; } - diff --git a/proto/GOKFJAACELD.proto b/proto/GOKFJAACELD.proto new file mode 100644 index 00000000..5a4f98fc --- /dev/null +++ b/proto/GOKFJAACELD.proto @@ -0,0 +1,27 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +message GOKFJAACELD { + uint32 level_id = 12; + uint32 max_score = 2; + bool is_open = 10; + uint32 cost_time = 14; +} diff --git a/proto/GachaActivityDetailInfo.proto b/proto/GachaActivityDetailInfo.proto new file mode 100644 index 00000000..68cba0dc --- /dev/null +++ b/proto/GachaActivityDetailInfo.proto @@ -0,0 +1,31 @@ +// 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 "GachaStageData.proto"; +// Obf: GIHIIILNKGO +message GachaActivityDetailInfo { + uint32 GOFPBNCFEGN = 12; + repeated GachaStageData gacha_stage_data_list = 14; + uint32 EBLDEHJNJNO = 4; + map have_reward_robot_num_map = 15; + map robot_num_map = 3; + repeated uint32 have_get_robot_list = 2; +} diff --git a/proto/GachaInfo.proto b/proto/GachaInfo.proto index 8ac7a2e3..18355fdc 100644 --- a/proto/GachaInfo.proto +++ b/proto/GachaInfo.proto @@ -1,35 +1,51 @@ +// 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 "GachaUpInfo.proto"; -// 3.6 (help) +import "GachaUpInfo.proto"; +// Obf: HNNEGNIHGED message GachaInfo { - uint32 wishMaxProgress = 578; //FBILBJNNIKE - uint32 tenCostItemId = 9; //ok - uint32 costItemId = 7; //ok - string gachaPreviewPrefabPath = 3; //ok - uint32 curScheduleDailyGachaTimes = 316; //ok - uint32 begin_time = 1; //ok - uint32 gachaSortId = 4; //ok - uint32 end_time = 10; //ok - uint32 gachaTimesLimit = 12; //ok - string titleTextmap = 908; //ok - uint32 costItemNum = 11; //ok - uint32 schedule_id = 13; //ok - uint32 wishItemId = 2003; //KKDFKKEMEBA - string gachaProbUrlOversea = 883; //ok - string gachaProbUrl = 15; //ok - repeated GachaUpInfo gacha_up_info_list = 771; //ok - string gachaRecordUrl = 8; //ok - string gachaRecordUrlOversea = 1371; //ok - repeated uint32 displayUp5ItemList = 793; //ok - bool is_new_wish = 1748; //ok - uint32 gachaType = 6; //ok - uint32 tenCostItemNum = 5; //ok - uint32 leftGachaTimes = 14; //ok - uint32 wishProgress = 1986; //ok? KDFPKENAIOJ - repeated uint32 displayUp4ItemList = 565; //ok - string gachaPrefabPath = 2; //ok + uint32 gachaTimesLimit = 13; + string gachaPrefabPath = 3; + bool is_new_wish = 901; + string titleTextmap = 1378; + uint32 wishMaxProgress = 218; + uint32 leftGachaTimes = 7; + repeated uint32 displayUp4ItemList = 21; + string gachaProbUrl = 1; + uint32 curScheduleDailyGachaTimes = 1818; + uint32 tenCostItemId = 1593; + string gachaRecordUrlOversea = 1379; + uint32 schedule_id = 10; + uint32 wishProgress = 1219; + string gachaPreviewPrefabPath = 5; + uint32 tenCostItemNum = 4; + uint32 gachaSortId = 15; + repeated GachaUpInfo gacha_up_info_list = 1530; + uint32 end_time = 9; + uint32 wishItemId = 8; + uint32 costItemId = 2; + uint32 gachaType = 6; + uint32 begin_time = 12; + repeated uint32 displayUp5ItemList = 1273; + string gachaRecordUrl = 11; + string gachaProbUrlOversea = 1326; + uint32 costItemNum = 14; } diff --git a/proto/GachaItem.proto b/proto/GachaItem.proto index 85159238..04ec32ea 100644 --- a/proto/GachaItem.proto +++ b/proto/GachaItem.proto @@ -21,10 +21,11 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; import "GachaTransferItem.proto"; +// Obf: FPBHAFGFLPA message GachaItem { - bool is_flash_card = 15; + bool is_gacha_item_new = 15; ItemParam gacha_item = 4; - bool is_gacha_item_new = 3; + bool is_flash_card = 3; repeated ItemParam token_item_list = 8; repeated GachaTransferItem transfer_items = 14; } diff --git a/proto/GachaStageData.proto b/proto/GachaStageData.proto new file mode 100644 index 00000000..9ca29c5b --- /dev/null +++ b/proto/GachaStageData.proto @@ -0,0 +1,27 @@ +// 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: FFDCLPDKHDF +message GachaStageData { + map target_num_map = 3; + bool is_open = 14; + uint32 stage_id = 7; +} diff --git a/proto/GachaTransferItem.proto b/proto/GachaTransferItem.proto index 8cbe2b97..848f202e 100644 --- a/proto/GachaTransferItem.proto +++ b/proto/GachaTransferItem.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; +// Obf: KDBPCHGCLDM message GachaTransferItem { ItemParam item = 1; bool is_transfer_item_new = 12; diff --git a/proto/GachaUpInfo.proto b/proto/GachaUpInfo.proto index 28ea24d2..ba2cf009 100644 --- a/proto/GachaUpInfo.proto +++ b/proto/GachaUpInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: EPKHAAPGEBH message GachaUpInfo { repeated uint32 item_id_list = 8; uint32 item_parent_type = 6; diff --git a/proto/GachaWishReq.proto b/proto/GachaWishReq.proto index 6396d7ea..7c896ba5 100644 --- a/proto/GachaWishReq.proto +++ b/proto/GachaWishReq.proto @@ -20,8 +20,9 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1555 +// Obf: KFKGMMKOJPE message GachaWishReq { - uint32 gachaType = 10; + uint32 gachaScheduleId = 10; uint32 item_id = 7; - uint32 gachaScheduleId = 11; + uint32 gachaType = 11; } diff --git a/proto/GachaWishRsp.proto b/proto/GachaWishRsp.proto index 0e489afb..9d609899 100644 --- a/proto/GachaWishRsp.proto +++ b/proto/GachaWishRsp.proto @@ -20,11 +20,12 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1548 +// Obf: FDGOFFKHHCE message GachaWishRsp { int32 retcode = 9; - uint32 wishMaxProgress = 10; - uint32 gachaType = 1; - uint32 gachaScheduleId = 13; - uint32 wishItemId = 2; - uint32 wishProgress = 4; + uint32 gachaType = 10; + uint32 tenCostItemId = 1; + uint32 wishMaxProgress = 13; + uint32 wishProgress = 2; + uint32 gachaScheduleId = 4; } diff --git a/proto/GadgetAutoPickDropInfoNotify.proto b/proto/GadgetAutoPickDropInfoNotify.proto index 5c54e7e3..c830ed09 100644 --- a/proto/GadgetAutoPickDropInfoNotify.proto +++ b/proto/GadgetAutoPickDropInfoNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Item.proto"; // CmdId: 834 +// Obf: CPLEJBJGLDC message GadgetAutoPickDropInfoNotify { repeated Item item_list = 12; } diff --git a/proto/GadgetBornType.proto b/proto/GadgetBornType.proto index c5248562..d29aa45a 100644 --- a/proto/GadgetBornType.proto +++ b/proto/GadgetBornType.proto @@ -1,9 +1,25 @@ +// 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"; -// Name: EOMJMDNEMOO +// Obf: OOFKDFMGBHE enum GadgetBornType { GADGET_BORN_TYPE_NONE = 0; GADGET_BORN_TYPE_IN_AIR = 1; @@ -13,4 +29,3 @@ enum GadgetBornType { GADGET_BORN_TYPE_GADGET = 5; GADGET_BORN_TYPE_GROUND = 6; } - diff --git a/proto/GadgetCrucibleInfo.proto b/proto/GadgetCrucibleInfo.proto index 1b47fb8e..4d9f1d72 100644 --- a/proto/GadgetCrucibleInfo.proto +++ b/proto/GadgetCrucibleInfo.proto @@ -1,11 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Name: BPDPHKJNGFI +// Obf: HFGJDLIJKIO message GadgetCrucibleInfo { - uint32 mp_play_id = 1; - uint32 prepare_end_time = 2; + uint32 mp_play_id = 1; + uint32 prepare_end_time = 2; } - diff --git a/proto/GadgetGeneralRewardInfo.proto b/proto/GadgetGeneralRewardInfo.proto index 11417558..b75da6c7 100644 --- a/proto/GadgetGeneralRewardInfo.proto +++ b/proto/GadgetGeneralRewardInfo.proto @@ -1,15 +1,30 @@ +// 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"; - -// Name: IHKFBPJAMOH +// Obf: PDEOKHPGMIJ message GadgetGeneralRewardInfo { - uint32 resin = 1; - uint32 dead_time = 2; - repeated uint32 remain_uid_list = 3; - repeated uint32 qualify_uid_list = 4; - ItemParam item_param = 5; + uint32 resin = 1; + uint32 dead_time = 2; + repeated uint32 remain_uid_list = 3; + repeated uint32 qualify_uid_list = 4; + ItemParam item_param = 5; } - diff --git a/proto/GadgetInteractReq.proto b/proto/GadgetInteractReq.proto index ad5968c5..638d399a 100644 --- a/proto/GadgetInteractReq.proto +++ b/proto/GadgetInteractReq.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "InterOpType.proto"; import "ResinCostType.proto"; // CmdId: 875 +// Obf: AGCEDAEAAEN message GadgetInteractReq { uint32 gadget_id = 7; uint32 ui_interact_id = 13; diff --git a/proto/GadgetInteractRsp.proto b/proto/GadgetInteractRsp.proto index e7a13007..ad48a152 100644 --- a/proto/GadgetInteractRsp.proto +++ b/proto/GadgetInteractRsp.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "InterOpType.proto"; import "InteractType.proto"; // CmdId: 896 +// Obf: AMEKLAACLLA message GadgetInteractRsp { InterOpType op_type = 8; InteractType interact_type = 11; diff --git a/proto/GadgetPlayInfo.proto b/proto/GadgetPlayInfo.proto index 4030e801..bb2b80c8 100644 --- a/proto/GadgetPlayInfo.proto +++ b/proto/GadgetPlayInfo.proto @@ -1,19 +1,32 @@ +// 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 "GadgetCrucibleInfo.proto"; - -// Name: OJOGHGHFEEP +// Obf: CMNFEFNBLLD message GadgetPlayInfo { - uint32 play_type = 1; - uint32 duration = 2; - repeated uint32 progress_stage_list = 3; - uint32 start_cd = 4; - uint32 start_time = 5; - uint32 progress = 6; - oneof play_info { - GadgetCrucibleInfo crucible_info = 21; - } + uint32 play_type = 1; + uint32 duration = 2; + repeated uint32 progress_stage_list = 3; + uint32 start_cd = 4; + uint32 start_time = 5; + uint32 progress = 6; + optional GadgetCrucibleInfo crucible_info = 21; } - diff --git a/proto/GadgetStateNotify.proto b/proto/GadgetStateNotify.proto index 7df86094..75d051c8 100644 --- a/proto/GadgetStateNotify.proto +++ b/proto/GadgetStateNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 802 +// Obf: NMJDCBHMLLB message GadgetStateNotify { uint32 gadget_state = 8; bool is_enable_interact = 5; diff --git a/proto/GalleryStopReason.proto b/proto/GalleryStopReason.proto deleted file mode 100644 index 7cec07ff..00000000 --- a/proto/GalleryStopReason.proto +++ /dev/null @@ -1,39 +0,0 @@ -// 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"; - - -enum GalleryStopReason { - GalleryStopReason_GalleryStopNone = 0; - GalleryStopReason_GalleryStopTimeup = 1; - GalleryStopReason_GalleryStopClientInterrupt = 2; - GalleryStopReason_GalleryStopLuaInterruptSuccess = 3; - GalleryStopReason_GalleryStopLuaInterruptFail = 4; - GalleryStopReason_GalleryStopOwnerLeaveScene = 5; - GalleryStopReason_GalleryStopPlayInitFailed = 6; - GalleryStopReason_GalleryStopOtherPlayerEnter = 7; - GalleryStopReason_GalleryStopAvatarDie = 8; - GalleryStopReason_GalleryStopFinished = 9; - GalleryStopReason_GalleryStopFungusAllDie = 10; - GalleryStopReason_GalleryStopLifeCountZero = 11; - GalleryStopReason_GalleryStopActivityClosed = 12; - GalleryStopReason_GalleryStopLeaveRegionFail = 13; - GalleryStopReason_GalleryStopHeartBloodUsedOut = 14; - GalleryStopReason_GalleryStopGuardianStoneDie = 15; -} diff --git a/proto/GameplayRecommendationElementReliquaryRequest.proto b/proto/GameplayRecommendationElementReliquaryRequest.proto index 0269dc60..5fe3ca0b 100644 --- a/proto/GameplayRecommendationElementReliquaryRequest.proto +++ b/proto/GameplayRecommendationElementReliquaryRequest.proto @@ -1,11 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Name: BIKCJHPDNBI +// Obf: PAALDLMIFHJ message GameplayRecommendationElementReliquaryRequest { - uint32 element_type = 11; - uint32 equip_type = 15; + uint32 element_type = 3; + uint32 equip_type = 5; } - diff --git a/proto/GameplayRecommendationElementReliquaryResponse.proto b/proto/GameplayRecommendationElementReliquaryResponse.proto index 18660dbe..7a5cc843 100644 --- a/proto/GameplayRecommendationElementReliquaryResponse.proto +++ b/proto/GameplayRecommendationElementReliquaryResponse.proto @@ -1,13 +1,28 @@ +// 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 "GameplayRecommendationReliquaryMainPropData.proto"; - -// Name: CBEEEDOJOEF +// Obf: ENDEIFONKBK message GameplayRecommendationElementReliquaryResponse { - repeated GameplayRecommendationReliquaryMainPropData main_prop_data_list = 13; - uint32 equip_type = 10; - uint32 element_type = 5; + uint32 equip_type = 8; + uint32 element_type = 5; + repeated GameplayRecommendationReliquaryMainPropData main_prop_data_list = 10; } - diff --git a/proto/GameplayRecommendationReliquaryMainPropData.proto b/proto/GameplayRecommendationReliquaryMainPropData.proto index d4bace15..5a336dc8 100644 --- a/proto/GameplayRecommendationReliquaryMainPropData.proto +++ b/proto/GameplayRecommendationReliquaryMainPropData.proto @@ -1,11 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Name: PGIJOMGHNEA +// Obf: MAELGEKPEAL message GameplayRecommendationReliquaryMainPropData { - uint32 main_prop_id = 11; - uint32 permillage = 12; + uint32 main_prop_id = 8; + uint32 permillage = 5; } - diff --git a/proto/GameplayRecommendationReliquaryRequest.proto b/proto/GameplayRecommendationReliquaryRequest.proto index 2aa18414..61b638c4 100644 --- a/proto/GameplayRecommendationReliquaryRequest.proto +++ b/proto/GameplayRecommendationReliquaryRequest.proto @@ -1,10 +1,25 @@ +// 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"; -// Name: FKENPFDANHC +// Obf: CIOJFBLABCG message GameplayRecommendationReliquaryRequest { - uint32 equip_type = 4; + uint32 equip_type = 7; } - diff --git a/proto/GameplayRecommendationReliquaryResponse.proto b/proto/GameplayRecommendationReliquaryResponse.proto index 9d6085d6..3697862c 100644 --- a/proto/GameplayRecommendationReliquaryResponse.proto +++ b/proto/GameplayRecommendationReliquaryResponse.proto @@ -1,12 +1,27 @@ +// 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 "GameplayRecommendationReliquaryMainPropData.proto"; - -// Name: NHMPFEALEGC +// Obf: DDGDNMGNCHP message GameplayRecommendationReliquaryResponse { - uint32 equip_type = 12; - repeated GameplayRecommendationReliquaryMainPropData main_prop_data_list = 11; + uint32 equip_type = 6; + repeated GameplayRecommendationReliquaryMainPropData main_prop_data_list = 5; } - diff --git a/proto/GatherGadgetInfo.proto b/proto/GatherGadgetInfo.proto index 1b2e1bb6..ef504bf6 100644 --- a/proto/GatherGadgetInfo.proto +++ b/proto/GatherGadgetInfo.proto @@ -1,11 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Name: BAANIDIMAEB +// Obf: MOKCLGJBLDD message GatherGadgetInfo { - uint32 item_id = 1; - bool is_forbid_guest = 2; + uint32 item_id = 1; + bool is_forbid_guest = 2; } - diff --git a/proto/GearActivityDetailInfo.proto b/proto/GearActivityDetailInfo.proto new file mode 100644 index 00000000..965dc677 --- /dev/null +++ b/proto/GearActivityDetailInfo.proto @@ -0,0 +1,28 @@ +// 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 "GearLevelData.proto"; +import "JigsawPictureData.proto"; +// Obf: GBMIHIPOEON +message GearActivityDetailInfo { + repeated GearLevelData gear_level_data_list = 2; + JigsawPictureData jigsaw_picture_data = 5; +} diff --git a/proto/GearLevelData.proto b/proto/GearLevelData.proto new file mode 100644 index 00000000..46598de2 --- /dev/null +++ b/proto/GearLevelData.proto @@ -0,0 +1,30 @@ +// 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: HEGKNDKHNDF +message GearLevelData { + uint32 open_time = 3; + bool is_open = 6; + uint32 APNDNCIJLKB = 8; + uint32 HKLBAPAMEOK = 5; + uint32 level_id = 12; + bool is_finished = 9; +} diff --git a/proto/GetActivityInfoReq.proto b/proto/GetActivityInfoReq.proto index fa3964d3..1f8451cf 100644 --- a/proto/GetActivityInfoReq.proto +++ b/proto/GetActivityInfoReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2167 +// Obf: NEMEICOEHKN message GetActivityInfoReq { repeated uint32 activity_id_list = 7; } diff --git a/proto/GetActivityInfoRsp.proto b/proto/GetActivityInfoRsp.proto index 07fac3cf..cf3b7c16 100644 --- a/proto/GetActivityInfoRsp.proto +++ b/proto/GetActivityInfoRsp.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Uint32Pair.proto"; import "ActivityInfo.proto"; // CmdId: 2114 +// Obf: KKDDDKHPGJP message GetActivityInfoRsp { repeated Uint32Pair disable_transfer_point_interaction_list = 9; int32 retcode = 7; diff --git a/proto/GetActivityShopSheetInfoReq.proto b/proto/GetActivityShopSheetInfoReq.proto index c9c6a087..1965c318 100644 --- a/proto/GetActivityShopSheetInfoReq.proto +++ b/proto/GetActivityShopSheetInfoReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 758 +// Obf: DHPDMPCGMFL message GetActivityShopSheetInfoReq { uint32 shop_type = 5; } diff --git a/proto/GetActivityShopSheetInfoRsp.proto b/proto/GetActivityShopSheetInfoRsp.proto index 840b0a2b..4de5e98d 100644 --- a/proto/GetActivityShopSheetInfoRsp.proto +++ b/proto/GetActivityShopSheetInfoRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ActivityShopSheetInfo.proto"; // CmdId: 735 +// Obf: LIFMPPDHPGF message GetActivityShopSheetInfoRsp { uint32 shop_type = 8; int32 retcode = 11; diff --git a/proto/GetAllH5ActivityInfoReq.proto b/proto/GetAllH5ActivityInfoReq.proto index 25c65183..54db320d 100644 --- a/proto/GetAllH5ActivityInfoReq.proto +++ b/proto/GetAllH5ActivityInfoReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 5658 +// Obf: IFMGFGLPEJM message GetAllH5ActivityInfoReq { } diff --git a/proto/GetAllH5ActivityInfoRsp.proto b/proto/GetAllH5ActivityInfoRsp.proto index 416a57de..b35cb0b9 100644 --- a/proto/GetAllH5ActivityInfoRsp.proto +++ b/proto/GetAllH5ActivityInfoRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "H5ActivityInfo.proto"; // CmdId: 5678 +// Obf: NNENDLPLIHI message GetAllH5ActivityInfoRsp { int32 retcode = 6; repeated H5ActivityInfo h5_activity_info_list = 1; diff --git a/proto/GetAllMailNotify.proto b/proto/GetAllMailNotify.proto index e153739b..519a7585 100644 --- a/proto/GetAllMailNotify.proto +++ b/proto/GetAllMailNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1434 +// Obf: CNDIIOHHDIO message GetAllMailNotify { bool is_collected = 7; } diff --git a/proto/GetAllMailReq.proto b/proto/GetAllMailReq.proto index f836345e..08936ca2 100644 --- a/proto/GetAllMailReq.proto +++ b/proto/GetAllMailReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1484 +// Obf: LHMFOJBAOKM message GetAllMailReq { bool is_collected = 7; } diff --git a/proto/GetAllMailResultNotify.proto b/proto/GetAllMailResultNotify.proto index a6115742..c97f4b4d 100644 --- a/proto/GetAllMailResultNotify.proto +++ b/proto/GetAllMailResultNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "MailData.proto"; // CmdId: 1494 +// Obf: OJLGHJJCEKK message GetAllMailResultNotify { int32 retcode = 7; uint32 packet_be_sent_num = 15; diff --git a/proto/GetAllMailRsp.proto b/proto/GetAllMailRsp.proto index 8f338d1d..b22253db 100644 --- a/proto/GetAllMailRsp.proto +++ b/proto/GetAllMailRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "MailData.proto"; // CmdId: 1464 +// Obf: JJJMNCKNNLO message GetAllMailRsp { bool is_truncated = 9; int32 retcode = 7; diff --git a/proto/GetAllUnlockNameCardReq.proto b/proto/GetAllUnlockNameCardReq.proto index 54b76463..f80655eb 100644 --- a/proto/GetAllUnlockNameCardReq.proto +++ b/proto/GetAllUnlockNameCardReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4076 +// Obf: LDKNHEGIHAP message GetAllUnlockNameCardReq { } diff --git a/proto/GetAllUnlockNameCardRsp.proto b/proto/GetAllUnlockNameCardRsp.proto index 71939325..64e84807 100644 --- a/proto/GetAllUnlockNameCardRsp.proto +++ b/proto/GetAllUnlockNameCardRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4026 +// Obf: DGDJIDOAGPL message GetAllUnlockNameCardRsp { repeated uint32 name_card_list = 11; int32 retcode = 13; diff --git a/proto/GetAuthkeyReq.proto b/proto/GetAuthkeyReq.proto index 35915d89..7d2fae6e 100644 --- a/proto/GetAuthkeyReq.proto +++ b/proto/GetAuthkeyReq.proto @@ -20,8 +20,9 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1435 +// Obf: OOLIOKGGLBO message GetAuthkeyReq { string auth_appid = 5; - uint32 JFDLFKAODPH = 13; - uint32 EELPBJCNICD = 15; + uint32 MLKKOEBHEEI = 13; + uint32 GALOPIFDMON = 15; } diff --git a/proto/GetAuthkeyRsp.proto b/proto/GetAuthkeyRsp.proto index dc7b565f..56c1d652 100644 --- a/proto/GetAuthkeyRsp.proto +++ b/proto/GetAuthkeyRsp.proto @@ -20,11 +20,12 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1487 +// Obf: OKFMABBCJMI message GetAuthkeyRsp { string auth_appid = 13; string authkey = 6; - uint32 EELPBJCNICD = 4; + uint32 GALOPIFDMON = 4; int32 retcode = 7; string game_biz = 8; - uint32 JFDLFKAODPH = 2; + uint32 MLKKOEBHEEI = 2; } diff --git a/proto/GetBlossomBriefInfoListReq.proto b/proto/GetBlossomBriefInfoListReq.proto index 343afb97..a2d10125 100644 --- a/proto/GetBlossomBriefInfoListReq.proto +++ b/proto/GetBlossomBriefInfoListReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2775 +// Obf: EPFOLEJKHOP message GetBlossomBriefInfoListReq { repeated uint32 city_id_list = 12; } diff --git a/proto/GetBlossomBriefInfoListRsp.proto b/proto/GetBlossomBriefInfoListRsp.proto index 67b9dfd5..33d45c6f 100644 --- a/proto/GetBlossomBriefInfoListRsp.proto +++ b/proto/GetBlossomBriefInfoListRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "BlossomBriefInfo.proto"; // CmdId: 2796 +// Obf: PCNGBIDFALG message GetBlossomBriefInfoListRsp { repeated BlossomBriefInfo brief_info_list = 6; int32 retcode = 2; diff --git a/proto/GetChatEmojiCollectionReq.proto b/proto/GetChatEmojiCollectionReq.proto index 3a151d50..a34ef67f 100644 --- a/proto/GetChatEmojiCollectionReq.proto +++ b/proto/GetChatEmojiCollectionReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4001 +// Obf: LHCGKKANDGP message GetChatEmojiCollectionReq { } diff --git a/proto/GetChatEmojiCollectionRsp.proto b/proto/GetChatEmojiCollectionRsp.proto index ed1ed766..0d22c76b 100644 --- a/proto/GetChatEmojiCollectionRsp.proto +++ b/proto/GetChatEmojiCollectionRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ChatEmojiCollectionData.proto"; // CmdId: 4015 +// Obf: PABFDHNLMBL message GetChatEmojiCollectionRsp { ChatEmojiCollectionData chat_emoji_collection_data = 2; int32 retcode = 15; diff --git a/proto/GetCompoundDataReq.proto b/proto/GetCompoundDataReq.proto index c7040858..a68cef92 100644 --- a/proto/GetCompoundDataReq.proto +++ b/proto/GetCompoundDataReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 159 +// Obf: IHNPHGMDKCD message GetCompoundDataReq { } diff --git a/proto/GetCompoundDataRsp.proto b/proto/GetCompoundDataRsp.proto index aa71176e..faea8373 100644 --- a/proto/GetCompoundDataRsp.proto +++ b/proto/GetCompoundDataRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "CompoundQueueData.proto"; // CmdId: 193 +// Obf: HONBDBKHOKJ message GetCompoundDataRsp { repeated CompoundQueueData compoundQueueDataList = 9; int32 retcode = 1; diff --git a/proto/GetDailyDungeonEntryInfoReq.proto b/proto/GetDailyDungeonEntryInfoReq.proto index cbba90ab..e59b3d16 100644 --- a/proto/GetDailyDungeonEntryInfoReq.proto +++ b/proto/GetDailyDungeonEntryInfoReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 941 +// Obf: AJANOBNMFFE message GetDailyDungeonEntryInfoReq { uint32 scene_id = 4; } diff --git a/proto/GetDailyDungeonEntryInfoRsp.proto b/proto/GetDailyDungeonEntryInfoRsp.proto index 6ef764cc..6c025095 100644 --- a/proto/GetDailyDungeonEntryInfoRsp.proto +++ b/proto/GetDailyDungeonEntryInfoRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "DailyDungeonEntryInfo.proto"; // CmdId: 953 +// Obf: JEGFBFNIAON message GetDailyDungeonEntryInfoRsp { int32 retcode = 13; repeated DailyDungeonEntryInfo daily_dungeon_info_list = 5; diff --git a/proto/GetFriendShowAvatarInfoReq.proto b/proto/GetFriendShowAvatarInfoReq.proto index 4277be95..6601a9ed 100644 --- a/proto/GetFriendShowAvatarInfoReq.proto +++ b/proto/GetFriendShowAvatarInfoReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4063 +// Obf: FHLFPFEGLPN message GetFriendShowAvatarInfoReq { uint32 uid = 14; } diff --git a/proto/GetFriendShowAvatarInfoRsp.proto b/proto/GetFriendShowAvatarInfoRsp.proto index e1fd6a2b..5a73da65 100644 --- a/proto/GetFriendShowAvatarInfoRsp.proto +++ b/proto/GetFriendShowAvatarInfoRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ShowAvatarInfo.proto"; // CmdId: 4018 +// Obf: IMDEPFBGBPM message GetFriendShowAvatarInfoRsp { uint32 uid = 13; repeated ShowAvatarInfo show_avatar_info_list = 10; diff --git a/proto/GetFriendShowNameCardInfoReq.proto b/proto/GetFriendShowNameCardInfoReq.proto index c0a4afca..69dcae00 100644 --- a/proto/GetFriendShowNameCardInfoReq.proto +++ b/proto/GetFriendShowNameCardInfoReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4023 +// Obf: IJNLDELJPGC message GetFriendShowNameCardInfoReq { uint32 uid = 2; } diff --git a/proto/GetFriendShowNameCardInfoRsp.proto b/proto/GetFriendShowNameCardInfoRsp.proto index e2734eae..fa2fbed1 100644 --- a/proto/GetFriendShowNameCardInfoRsp.proto +++ b/proto/GetFriendShowNameCardInfoRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4077 +// Obf: FPGCDLCLIGF message GetFriendShowNameCardInfoRsp { repeated uint32 show_name_card_id_list = 12; uint32 uid = 3; diff --git a/proto/GetFurnitureCurModuleArrangeCountReq.proto b/proto/GetFurnitureCurModuleArrangeCountReq.proto index 9b3760c2..8885078e 100644 --- a/proto/GetFurnitureCurModuleArrangeCountReq.proto +++ b/proto/GetFurnitureCurModuleArrangeCountReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4688 +// Obf: AOKHNKCIGFG message GetFurnitureCurModuleArrangeCountReq { } diff --git a/proto/GetGachaInfoReq.proto b/proto/GetGachaInfoReq.proto index ce031e80..5ebb5ac3 100644 --- a/proto/GetGachaInfoReq.proto +++ b/proto/GetGachaInfoReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1575 +// Obf: PFFGPJKAJGH message GetGachaInfoReq { } diff --git a/proto/GetGachaInfoRsp.proto b/proto/GetGachaInfoRsp.proto index 55628809..c86f5c4c 100644 --- a/proto/GetGachaInfoRsp.proto +++ b/proto/GetGachaInfoRsp.proto @@ -21,11 +21,12 @@ option java_package = "emu.grasscutter.net.proto"; import "GachaInfo.proto"; // CmdId: 1596 +// Obf: LNMLGJLDDAF message GetGachaInfoRsp { - uint32 gachaRandom = 5; + uint32 dailyGachaTimes = 5; repeated GachaInfo gacha_info_list = 2; - bool NBBLOOCFIIF = 10; - bool BIEGPNBLIEI = 6; + bool KIHLEFLGKAD = 10; + bool PLBFOACGPII = 6; int32 retcode = 8; - uint32 dailyGachaTimes = 15; + uint32 gachaRandom = 15; } diff --git a/proto/GetHomeLevelUpRewardReq.proto b/proto/GetHomeLevelUpRewardReq.proto index 7efb1962..b700c749 100644 --- a/proto/GetHomeLevelUpRewardReq.proto +++ b/proto/GetHomeLevelUpRewardReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4752 +// Obf: GPFIIOLMMDK message GetHomeLevelUpRewardReq { uint32 level = 10; } diff --git a/proto/GetHomeLevelUpRewardRsp.proto b/proto/GetHomeLevelUpRewardRsp.proto index a2556b7b..6395ad30 100644 --- a/proto/GetHomeLevelUpRewardRsp.proto +++ b/proto/GetHomeLevelUpRewardRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4579 +// Obf: GIAFFMBGNHJ message GetHomeLevelUpRewardRsp { uint32 level = 3; int32 retcode = 6; diff --git a/proto/GetInvestigationMonsterReq.proto b/proto/GetInvestigationMonsterReq.proto index 7667d0e2..bc3664d3 100644 --- a/proto/GetInvestigationMonsterReq.proto +++ b/proto/GetInvestigationMonsterReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1902 +// Obf: ACMNNBKNNFK message GetInvestigationMonsterReq { bool is_for_mark = 3; repeated uint32 city_id_list = 4; diff --git a/proto/GetInvestigationMonsterRsp.proto b/proto/GetInvestigationMonsterRsp.proto index 4e67147d..89fff660 100644 --- a/proto/GetInvestigationMonsterRsp.proto +++ b/proto/GetInvestigationMonsterRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "InvestigationMonster.proto"; // CmdId: 1930 +// Obf: KCOJOLFAOPO message GetInvestigationMonsterRsp { repeated InvestigationMonster monster_list = 13; bool is_for_mark = 1; diff --git a/proto/GetMailItemReq.proto b/proto/GetMailItemReq.proto index f95b7134..cbe939bb 100644 --- a/proto/GetMailItemReq.proto +++ b/proto/GetMailItemReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1472 +// Obf: NDJKANLCIIP message GetMailItemReq { repeated uint32 mail_id_list = 7; } diff --git a/proto/GetMailItemRsp.proto b/proto/GetMailItemRsp.proto index 1d6d1a40..d870daa0 100644 --- a/proto/GetMailItemRsp.proto +++ b/proto/GetMailItemRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "EquipParam.proto"; // CmdId: 1455 +// Obf: HPJBGIFCECN message GetMailItemRsp { int32 retcode = 7; repeated EquipParam item_list = 5; diff --git a/proto/GetMapAreaRsp.proto b/proto/GetMapAreaRsp.proto index c8d94dc3..413c2a23 100644 --- a/proto/GetMapAreaRsp.proto +++ b/proto/GetMapAreaRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "MapAreaInfo.proto"; // CmdId: 3376 +// Obf: PPDLJELFPEJ message GetMapAreaRsp { repeated MapAreaInfo map_area_info_list = 3; int32 retcode = 11; diff --git a/proto/GetOnlinePlayerInfoReq.proto b/proto/GetOnlinePlayerInfoReq.proto index 686c082d..51758222 100644 --- a/proto/GetOnlinePlayerInfoReq.proto +++ b/proto/GetOnlinePlayerInfoReq.proto @@ -20,11 +20,12 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 28 +// Obf: PJKHCJKGNNF message GetOnlinePlayerInfoReq { bool is_online_id = 9; oneof player_id { - uint32 EGLOKEMINPP = 11; - string FPIEFBFEOLH = 15; - string NMLMGEPFMMF = 10; + uint32 target_uid = 11; + string online_id = 15; + string psn_id = 10; } } diff --git a/proto/GetOnlinePlayerInfoRsp.proto b/proto/GetOnlinePlayerInfoRsp.proto index 1e3f3a53..84b61520 100644 --- a/proto/GetOnlinePlayerInfoRsp.proto +++ b/proto/GetOnlinePlayerInfoRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "OnlinePlayerInfo.proto"; // CmdId: 38 +// Obf: PDGIKNGGCPK message GetOnlinePlayerInfoRsp { uint32 param = 3; OnlinePlayerInfo target_player_info = 15; diff --git a/proto/GetOnlinePlayerListReq.proto b/proto/GetOnlinePlayerListReq.proto index c1a01521..55b4069b 100644 --- a/proto/GetOnlinePlayerListReq.proto +++ b/proto/GetOnlinePlayerListReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 35 +// Obf: PEHFIKEEKHF message GetOnlinePlayerListReq { } diff --git a/proto/GetOnlinePlayerListRsp.proto b/proto/GetOnlinePlayerListRsp.proto index 4303d335..98a27afc 100644 --- a/proto/GetOnlinePlayerListRsp.proto +++ b/proto/GetOnlinePlayerListRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "OnlinePlayerInfo.proto"; // CmdId: 87 +// Obf: NEMPEMKPPMD message GetOnlinePlayerListRsp { uint32 param = 15; int32 retcode = 1; diff --git a/proto/GetOpActivityInfoReq.proto b/proto/GetOpActivityInfoReq.proto index 7a0a5751..592f045c 100644 --- a/proto/GetOpActivityInfoReq.proto +++ b/proto/GetOpActivityInfoReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 5175 +// Obf: OLCKDAPDJJF message GetOpActivityInfoReq { } diff --git a/proto/GetOpActivityInfoRsp.proto b/proto/GetOpActivityInfoRsp.proto index 65622d87..5331c9f4 100644 --- a/proto/GetOpActivityInfoRsp.proto +++ b/proto/GetOpActivityInfoRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "OpActivityInfo.proto"; // CmdId: 5196 +// Obf: BJPNHBHGANM message GetOpActivityInfoRsp { repeated OpActivityInfo op_activity_info_list = 2; int32 retcode = 9; diff --git a/proto/GetParentQuestVideoKeyReq.proto b/proto/GetParentQuestVideoKeyReq.proto index 2d1e943a..a82f92c5 100644 --- a/proto/GetParentQuestVideoKeyReq.proto +++ b/proto/GetParentQuestVideoKeyReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 463 +// Obf: ONLAGNGPCLK message GetParentQuestVideoKeyReq { uint32 parent_quest_id = 10; } diff --git a/proto/GetParentQuestVideoKeyRsp.proto b/proto/GetParentQuestVideoKeyRsp.proto index c48ec668..4ac08d71 100644 --- a/proto/GetParentQuestVideoKeyRsp.proto +++ b/proto/GetParentQuestVideoKeyRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 418 +// Obf: NJKJOLKFGGK message GetParentQuestVideoKeyRsp { uint64 video_key = 7; uint32 parent_quest_id = 13; diff --git a/proto/GetPlayerAskFriendListReq.proto b/proto/GetPlayerAskFriendListReq.proto index bb7fee67..3e261175 100644 --- a/proto/GetPlayerAskFriendListReq.proto +++ b/proto/GetPlayerAskFriendListReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4070 +// Obf: MEEGKFLOAKG message GetPlayerAskFriendListReq { } diff --git a/proto/GetPlayerAskFriendListRsp.proto b/proto/GetPlayerAskFriendListRsp.proto index 01a4bda5..985563d5 100644 --- a/proto/GetPlayerAskFriendListRsp.proto +++ b/proto/GetPlayerAskFriendListRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "FriendBrief.proto"; // CmdId: 4061 +// Obf: NJHCJBOCBLJ message GetPlayerAskFriendListRsp { int32 retcode = 7; repeated FriendBrief ask_friend_list = 11; diff --git a/proto/GetPlayerBlacklistRsp.proto b/proto/GetPlayerBlacklistRsp.proto index c8e65955..e268ebb4 100644 --- a/proto/GetPlayerBlacklistRsp.proto +++ b/proto/GetPlayerBlacklistRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "FriendBrief.proto"; // CmdId: 4011 +// Obf: GEKGOCPNEOO message GetPlayerBlacklistRsp { int32 retcode = 6; repeated FriendBrief blacklist = 7; diff --git a/proto/GetPlayerFriendListReq.proto b/proto/GetPlayerFriendListReq.proto index e09a6466..79b75c42 100644 --- a/proto/GetPlayerFriendListReq.proto +++ b/proto/GetPlayerFriendListReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4075 +// Obf: MNBDJBJJNJF message GetPlayerFriendListReq { } diff --git a/proto/GetPlayerFriendListRsp.proto b/proto/GetPlayerFriendListRsp.proto index 89c2162f..5fc26f45 100644 --- a/proto/GetPlayerFriendListRsp.proto +++ b/proto/GetPlayerFriendListRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "FriendBrief.proto"; // CmdId: 4096 +// Obf: LGFNGPBLDEI message GetPlayerFriendListRsp { int32 retcode = 2; repeated FriendBrief friend_list = 3; diff --git a/proto/GetPlayerHomeCompInfoReq.proto b/proto/GetPlayerHomeCompInfoReq.proto index 6c4a6999..4f687d89 100644 --- a/proto/GetPlayerHomeCompInfoReq.proto +++ b/proto/GetPlayerHomeCompInfoReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4482 +// Obf: JCGLANNLAND message GetPlayerHomeCompInfoReq { } diff --git a/proto/GetPlayerSocialDetailReq.proto b/proto/GetPlayerSocialDetailReq.proto index 207193c3..889fa2bf 100644 --- a/proto/GetPlayerSocialDetailReq.proto +++ b/proto/GetPlayerSocialDetailReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4087 +// Obf: AKJBPMHCIAN message GetPlayerSocialDetailReq { uint32 uid = 15; } diff --git a/proto/GetPlayerSocialDetailRsp.proto b/proto/GetPlayerSocialDetailRsp.proto index 7ce03c0b..acb90537 100644 --- a/proto/GetPlayerSocialDetailRsp.proto +++ b/proto/GetPlayerSocialDetailRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "SocialDetail.proto"; // CmdId: 4030 +// Obf: MBHKDJEBCNH message GetPlayerSocialDetailRsp { int32 retcode = 8; SocialDetail detail_data = 7; diff --git a/proto/GetPlayerTokenReq.proto b/proto/GetPlayerTokenReq.proto index dd1f64c4..eda8e34c 100644 --- a/proto/GetPlayerTokenReq.proto +++ b/proto/GetPlayerTokenReq.proto @@ -20,12 +20,13 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 175 +// Obf: EGDLBMIOIEC message GetPlayerTokenReq { - string IHOICFGPEMN = 848; - uint32 KCNGGLAKFDA = 732; + string FFHPIJBCIIF = 848; + uint32 cloudClientIp = 732; string birthday = 125; uint32 account_type = 7; - uint32 OFBJDBPPFBB = 11; + uint32 EOFMJLNBLJC = 11; string client_rand_key = 1808; string online_id = 13; string psn_id = 6; @@ -34,12 +35,12 @@ message GetPlayerTokenReq { string client_ip_str = 14; uint32 sub_channel_id = 2; uint32 uid = 12; - uint32 BFIOBEGEJEC = 1247; + uint32 PHMANCBCDDA = 1247; uint32 channel_id = 3; uint32 key_id = 1998; - string HJAHFNHJCKP = 4; + string HCOCMCHAABD = 4; string account_token = 8; string country_code = 5; - string OJMBGGLPHFH = 1; + string COHFMJFNHGE = 1; uint32 platform_type = 10; } diff --git a/proto/GetPlayerTokenRsp.proto b/proto/GetPlayerTokenRsp.proto index addd3364..1b4c17e2 100644 --- a/proto/GetPlayerTokenRsp.proto +++ b/proto/GetPlayerTokenRsp.proto @@ -20,11 +20,12 @@ option java_package = "emu.grasscutter.net.proto"; import "StopServerInfo.proto"; -/// CmdId: 196 +// CmdId: 196 +// Obf: LACJKFEIOGO message GetPlayerTokenRsp { - bool HCPBAACPGBJ = 343; + bool MPBPEOPDLOE = 343; bytes security_cmd_buffer = 10; - bool EAEFJELFOLA = 960; + bool IHPKEJKFANM = 960; string birthday = 2027; StopServerInfo stop_server = 647; uint32 channel_id = 362; @@ -42,11 +43,11 @@ message GetPlayerTokenRsp { uint32 platform_type = 6; uint32 key_id = 1327; uint32 reg_platform = 797; - uint32 KCNGGLAKFDA = 285; + uint32 cloudClientIp = 285; uint32 uid = 5; uint32 account_type = 766; bool is_proficient_player = 8; - uint32 IOLNEOHFDDM = 13; + uint32 blackUidEndTime = 13; int32 retcode = 1; bool is_guest = 14; string secret_key = 9; diff --git a/proto/GetQuestLackingResourceReq.proto b/proto/GetQuestLackingResourceReq.proto index bc44df22..6ccdabd9 100644 --- a/proto/GetQuestLackingResourceReq.proto +++ b/proto/GetQuestLackingResourceReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 453 +// Obf: LJCOMNDKOAO message GetQuestLackingResourceReq { uint32 quest_id = 1; } diff --git a/proto/GetQuestLackingResourceRsp.proto b/proto/GetQuestLackingResourceRsp.proto index 32bbb3a9..06b73c23 100644 --- a/proto/GetQuestLackingResourceRsp.proto +++ b/proto/GetQuestLackingResourceRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 456 +// Obf: CBCCIGNFPAL message GetQuestLackingResourceRsp { int32 retcode = 15; map lacked_place_map = 8; diff --git a/proto/GetQuestTalkHistoryReq.proto b/proto/GetQuestTalkHistoryReq.proto deleted file mode 100644 index b79f0592..00000000 --- a/proto/GetQuestTalkHistoryReq.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - -// CmdId: 472 -// Name: ADBBIBDMOOB -message GetQuestTalkHistoryReq { - uint32 parent_quest_id = 11; -} - diff --git a/proto/GetQuestTalkHistoryRsp.proto b/proto/GetQuestTalkHistoryRsp.proto deleted file mode 100644 index 2af6e290..00000000 --- a/proto/GetQuestTalkHistoryRsp.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - -// CmdId: 492 -// Name: DNJJKDAHJEL -message GetQuestTalkHistoryRsp { - repeated uint32 talk_id_list = 3; - uint32 parent_quest_id = 5; - int32 retcode = 13; -} - diff --git a/proto/GetRegionSearchReq.proto b/proto/GetRegionSearchReq.proto index c74ec008..72ec9610 100644 --- a/proto/GetRegionSearchReq.proto +++ b/proto/GetRegionSearchReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 5626 +// Obf: DEDKFOOONAO message GetRegionSearchReq { } diff --git a/proto/GetSceneAreaReq.proto b/proto/GetSceneAreaReq.proto index 34f87750..bd704c02 100644 --- a/proto/GetSceneAreaReq.proto +++ b/proto/GetSceneAreaReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 233 +// Obf: HJJMIDADBAP message GetSceneAreaReq { uint32 belong_uid = 11; uint32 scene_id = 6; diff --git a/proto/GetSceneAreaRsp.proto b/proto/GetSceneAreaRsp.proto index 9125d540..19a20f93 100644 --- a/proto/GetSceneAreaRsp.proto +++ b/proto/GetSceneAreaRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "CityInfo.proto"; // CmdId: 224 +// Obf: KAKHAKLHMDF message GetSceneAreaRsp { repeated CityInfo city_info_list = 3; int32 retcode = 9; diff --git a/proto/GetScenePointReq.proto b/proto/GetScenePointReq.proto index 13aab233..a8f0b942 100644 --- a/proto/GetScenePointReq.proto +++ b/proto/GetScenePointReq.proto @@ -20,8 +20,9 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 234 +// Obf: APMKFJDAHPO message GetScenePointReq { uint32 belong_uid = 9; uint32 scene_id = 13; - bool LKPBJJJPLIM = 11; + bool GPMHJGJLAFH = 11; } diff --git a/proto/GetScenePointRsp.proto b/proto/GetScenePointRsp.proto index 478e9adb..2c793f07 100644 --- a/proto/GetScenePointRsp.proto +++ b/proto/GetScenePointRsp.proto @@ -20,18 +20,19 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 294 +// Obf: OKEJNDKCNKG message GetScenePointRsp { - repeated uint32 HELLCPBJJIN = 12; - bool LKPBJJJPLIM = 2; + repeated uint32 unhide_point_list = 12; + bool GPMHJGJLAFH = 2; repeated uint32 unlocked_point_list = 3; - repeated uint32 unlockAreaList = 10; + repeated uint32 toBeExploreDungeonEntryList = 10; uint32 scene_id = 5; repeated uint32 hide_point_list = 4; - repeated uint32 unhide_point_list = 8; - repeated uint32 EFIGIONBIPJ = 15; + repeated uint32 locked_point_list = 8; + repeated uint32 groupUnlimitPointList = 15; uint32 belong_uid = 11; - repeated uint32 GDPHCIKAKPA = 1; + repeated uint32 notInteractDungeonEntryList = 1; int32 retcode = 7; - repeated uint32 NOJDBOBLNGK = 6; - repeated uint32 EMFAIMIOIDJ = 14; + repeated uint32 notExploredDungeonEntryList = 6; + repeated uint32 unlockAreaList = 14; } diff --git a/proto/GetShopReq.proto b/proto/GetShopReq.proto index 140d2487..29562e88 100644 --- a/proto/GetShopReq.proto +++ b/proto/GetShopReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 775 +// Obf: IONMOGGHBPF message GetShopReq { uint32 shop_type = 12; } diff --git a/proto/GetShopRsp.proto b/proto/GetShopRsp.proto index ad5c919e..3aee0982 100644 --- a/proto/GetShopRsp.proto +++ b/proto/GetShopRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Shop.proto"; // CmdId: 796 +// Obf: ICPODKNNJCF message GetShopRsp { Shop shop = 15; int32 retcode = 2; diff --git a/proto/GetShopmallDataReq.proto b/proto/GetShopmallDataReq.proto index c1541ea5..9dd6478a 100644 --- a/proto/GetShopmallDataReq.proto +++ b/proto/GetShopmallDataReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 755 +// Obf: JDGADILKHCE message GetShopmallDataReq { } diff --git a/proto/GetShopmallDataRsp.proto b/proto/GetShopmallDataRsp.proto index 7c03c1b6..0f29e0bd 100644 --- a/proto/GetShopmallDataRsp.proto +++ b/proto/GetShopmallDataRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 748 +// Obf: EDIILLPGAHM message GetShopmallDataRsp { int32 retcode = 2; repeated uint32 shop_type_list = 3; diff --git a/proto/GetUgcReq.proto b/proto/GetUgcReq.proto index e46d80aa..e4e580de 100644 --- a/proto/GetUgcReq.proto +++ b/proto/GetUgcReq.proto @@ -23,6 +23,7 @@ import "UgcType.proto"; import "RecordUsage.proto"; import "GetUgcType.proto"; // CmdId: 6328 +// Obf: AFLHDFGBBED message GetUgcReq { UgcType ugc_type = 6; uint64 ugc_guid = 11; diff --git a/proto/GetUgcRsp.proto b/proto/GetUgcRsp.proto index 63b4f425..d0df4c5d 100644 --- a/proto/GetUgcRsp.proto +++ b/proto/GetUgcRsp.proto @@ -21,14 +21,15 @@ option java_package = "emu.grasscutter.net.proto"; import "UgcType.proto"; import "RecordUsage.proto"; -import "CFFGCLHLGPN.proto"; -import "OMNDDJHEJKO.proto"; +import "UgcMusicRecord.proto"; +import "UgcMusicBriefInfo.proto"; // CmdId: 6308 +// Obf: MGEPGJNKOBB message GetUgcRsp { uint64 ugc_guid = 4; UgcType ugc_type = 7; int32 retcode = 5; RecordUsage ugc_record_usage = 6; - optional CFFGCLHLGPN EECNEAMNAJA = 3; - optional OMNDDJHEJKO OOIAHADJKIK = 1547; + optional UgcMusicRecord music_record = 3; + optional UgcMusicBriefInfo music_brief_info = 1547; } diff --git a/proto/GetUgcType.proto b/proto/GetUgcType.proto index 611a9e28..04e2ef18 100644 --- a/proto/GetUgcType.proto +++ b/proto/GetUgcType.proto @@ -19,8 +19,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: JMLGMJCMHIG enum GetUgcType { - GetUgcType_GetUgcNone = 0; - GetUgcType_Mine = 1; - GetUgcType_Publish = 2; + GET_UGC_NONE = 0; + GET_UGC_TYPE_MINE = 1; + GET_UGC_TYPE_PUBLISH = 2; } diff --git a/proto/GetWidgetSlotReq.proto b/proto/GetWidgetSlotReq.proto index d2aeb42a..8730ceed 100644 --- a/proto/GetWidgetSlotReq.proto +++ b/proto/GetWidgetSlotReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4270 +// Obf: ALONJJHLCAM message GetWidgetSlotReq { } diff --git a/proto/GetWidgetSlotRsp.proto b/proto/GetWidgetSlotRsp.proto index 8a5e7150..b5a2cc59 100644 --- a/proto/GetWidgetSlotRsp.proto +++ b/proto/GetWidgetSlotRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "WidgetSlotData.proto"; // CmdId: 4283 +// Obf: DBKCDELCFFK message GetWidgetSlotRsp { repeated WidgetSlotData slot_list = 5; int32 retcode = 7; diff --git a/proto/GetWorldMpInfoReq.proto b/proto/GetWorldMpInfoReq.proto index 67f404b2..52960d89 100644 --- a/proto/GetWorldMpInfoReq.proto +++ b/proto/GetWorldMpInfoReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 3105 +// Obf: NAJOFOEPENA message GetWorldMpInfoReq { } diff --git a/proto/GetWorldMpInfoRsp.proto b/proto/GetWorldMpInfoRsp.proto index f6f8846a..27c20d1c 100644 --- a/proto/GetWorldMpInfoRsp.proto +++ b/proto/GetWorldMpInfoRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 3316 +// Obf: ODKECHBHNEL message GetWorldMpInfoRsp { bool is_in_mp_mode = 2; uint32 quit_mp_valid_time = 4; diff --git a/proto/GravenInnocenceCampInfo.proto b/proto/GravenInnocenceCampInfo.proto new file mode 100644 index 00000000..9e31e929 --- /dev/null +++ b/proto/GravenInnocenceCampInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "GravenInnocenceCampStageInfo.proto"; +// Obf: FBBHNKICFDP +message GravenInnocenceCampInfo { + repeated GravenInnocenceCampStageInfo stage_info_list = 5; +} diff --git a/proto/GravenInnocenceCampStageInfo.proto b/proto/GravenInnocenceCampStageInfo.proto new file mode 100644 index 00000000..f6031e90 --- /dev/null +++ b/proto/GravenInnocenceCampStageInfo.proto @@ -0,0 +1,28 @@ +// 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: HEIPNOGBCPI +message GravenInnocenceCampStageInfo { + bool is_finished = 10; + bool is_open = 15; + uint32 stage_id = 13; + uint32 level_id = 12; +} diff --git a/proto/GravenInnocenceCarveInfo.proto b/proto/GravenInnocenceCarveInfo.proto new file mode 100644 index 00000000..39b43813 --- /dev/null +++ b/proto/GravenInnocenceCarveInfo.proto @@ -0,0 +1,28 @@ +// 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 "GravenInnocenceCarveStageInfo.proto"; +// Obf: LGDCIALAHHL +message GravenInnocenceCarveInfo { + repeated GravenInnocenceCarveStageInfo stage_info_list = 6; + uint32 can_edit_count = 13; + repeated uint32 has_edit_config_id_list = 15; +} diff --git a/proto/GravenInnocenceCarveStageInfo.proto b/proto/GravenInnocenceCarveStageInfo.proto new file mode 100644 index 00000000..7ab3783e --- /dev/null +++ b/proto/GravenInnocenceCarveStageInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +// Obf: DCLHODJLHDM +message GravenInnocenceCarveStageInfo { + bool is_open = 7; + uint32 stage_id = 14; +} diff --git a/proto/GravenInnocenceDetailInfo.proto b/proto/GravenInnocenceDetailInfo.proto new file mode 100644 index 00000000..5434b940 --- /dev/null +++ b/proto/GravenInnocenceDetailInfo.proto @@ -0,0 +1,33 @@ +// 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 "GravenInnocenceRaceInfo.proto"; +import "GravenInnocencePhotoInfo.proto"; +import "GravenInnocenceCampInfo.proto"; +import "GravenInnocenceCarveInfo.proto"; +// Obf: PGHJFAEIOEL +message GravenInnocenceDetailInfo { + GravenInnocenceRaceInfo race_info = 12; + bool is_content_closed = 15; + GravenInnocencePhotoInfo photo_info = 6; + GravenInnocenceCampInfo camp_info = 11; + GravenInnocenceCarveInfo carve_info = 4; +} diff --git a/proto/GravenInnocencePhotoInfo.proto b/proto/GravenInnocencePhotoInfo.proto new file mode 100644 index 00000000..a6fc5637 --- /dev/null +++ b/proto/GravenInnocencePhotoInfo.proto @@ -0,0 +1,28 @@ +// 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 "GravenInnocencePhotoObjectInfo.proto"; +import "GravenInnocencePhotoStageInfo.proto"; +// Obf: KOEBDBCCGLJ +message GravenInnocencePhotoInfo { + repeated GravenInnocencePhotoObjectInfo object_info_list = 8; + repeated GravenInnocencePhotoStageInfo stage_info_list = 13; +} diff --git a/proto/GravenInnocencePhotoObjectInfo.proto b/proto/GravenInnocencePhotoObjectInfo.proto new file mode 100644 index 00000000..1512cf2d --- /dev/null +++ b/proto/GravenInnocencePhotoObjectInfo.proto @@ -0,0 +1,27 @@ +// 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: MHMICGIPAGB +message GravenInnocencePhotoObjectInfo { + uint32 finish_time = 5; + uint32 param = 11; + uint32 object_id = 8; +} diff --git a/proto/GravenInnocencePhotoStageInfo.proto b/proto/GravenInnocencePhotoStageInfo.proto new file mode 100644 index 00000000..af2b7f1e --- /dev/null +++ b/proto/GravenInnocencePhotoStageInfo.proto @@ -0,0 +1,27 @@ +// 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: JJOANEJFBMA +message GravenInnocencePhotoStageInfo { + bool is_open = 6; + uint32 stage_id = 14; + bool is_finished = 8; +} diff --git a/proto/GravenInnocenceRaceInfo.proto b/proto/GravenInnocenceRaceInfo.proto new file mode 100644 index 00000000..19956f2c --- /dev/null +++ b/proto/GravenInnocenceRaceInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "GravenInnocenceRaceLevelInfo.proto"; +// Obf: DAPOFPEOFAL +message GravenInnocenceRaceInfo { + repeated GravenInnocenceRaceLevelInfo level_info_list = 13; +} diff --git a/proto/GravenInnocenceRaceLevelInfo.proto b/proto/GravenInnocenceRaceLevelInfo.proto new file mode 100644 index 00000000..a9e001aa --- /dev/null +++ b/proto/GravenInnocenceRaceLevelInfo.proto @@ -0,0 +1,27 @@ +// 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: FNMECHIGPHP +message GravenInnocenceRaceLevelInfo { + uint32 level_id = 13; + uint32 max_score = 5; + bool is_open = 6; +} diff --git a/proto/GroupSuiteNotify.proto b/proto/GroupSuiteNotify.proto index 8aa42bf4..5546ab2b 100644 --- a/proto/GroupSuiteNotify.proto +++ b/proto/GroupSuiteNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 3284 +// Obf: PICEJIDPMOD message GroupSuiteNotify { map group_map = 15; } diff --git a/proto/GroupUnloadNotify.proto b/proto/GroupUnloadNotify.proto index 0a4e0fa1..f1c0bcc2 100644 --- a/proto/GroupUnloadNotify.proto +++ b/proto/GroupUnloadNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 3322 +// Obf: DACBOFOJFHM message GroupUnloadNotify { repeated uint32 group_list = 11; } diff --git a/proto/H5ActivityIdsNotify.proto b/proto/H5ActivityIdsNotify.proto index ee722162..b06cca2b 100644 --- a/proto/H5ActivityIdsNotify.proto +++ b/proto/H5ActivityIdsNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 5687 +// Obf: GGHFPMEMPIE message H5ActivityIdsNotify { map h5_activity_map = 15; uint32 client_red_dot_timestamp = 3; diff --git a/proto/H5ActivityInfo.proto b/proto/H5ActivityInfo.proto index 21518364..b1fd5ef7 100644 --- a/proto/H5ActivityInfo.proto +++ b/proto/H5ActivityInfo.proto @@ -19,10 +19,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: NJDJNOHKGHG message H5ActivityInfo { - uint32 ONMHFGOHKFH = 4; + uint32 HPLJKGAJNOA = 4; bool is_entrance_open = 5; - uint32 EFBOPDLJLLD = 12; + uint32 PAIONNJCHAG = 12; uint32 begin_time = 11; uint32 content_close_time = 14; string prefab_path = 8; diff --git a/proto/HDDANIDHCMI.proto b/proto/HDDANIDHCMI.proto new file mode 100644 index 00000000..c76aed01 --- /dev/null +++ b/proto/HDDANIDHCMI.proto @@ -0,0 +1,39 @@ +// 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"; + + +enum HDDANIDHCMI { + HDDANIDHCMI_GalleryStopNone = 0; + HDDANIDHCMI_GalleryStopTimeup = 1; + HDDANIDHCMI_GalleryStopClientInterrupt = 2; + HDDANIDHCMI_GalleryStopLuaInterruptSuccess = 3; + HDDANIDHCMI_GalleryStopLuaInterruptFail = 4; + HDDANIDHCMI_GalleryStopOwnerLeaveScene = 5; + HDDANIDHCMI_GalleryStopPlayInitFailed = 6; + HDDANIDHCMI_GalleryStopOtherPlayerEnter = 7; + HDDANIDHCMI_GalleryStopAvatarDie = 8; + HDDANIDHCMI_GalleryStopFinished = 9; + HDDANIDHCMI_GalleryStopFungusAllDie = 10; + HDDANIDHCMI_GalleryStopLifeCountZero = 11; + HDDANIDHCMI_GalleryStopActivityClosed = 12; + HDDANIDHCMI_GalleryStopLeaveRegionFail = 13; + HDDANIDHCMI_GalleryStopHeartBloodUsedOut = 14; + HDDANIDHCMI_GalleryStopGuardianStoneDie = 15; +} diff --git a/proto/HKILNLMDIGF.proto b/proto/HKILNLMDIGF.proto new file mode 100644 index 00000000..0be32e52 --- /dev/null +++ b/proto/HKILNLMDIGF.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +message HKILNLMDIGF { + uint32 group_id = 1; + uint32 guid = 2; + uint32 ENMKKFKFGPC = 3; +} diff --git a/proto/HPFPNKNJIOD.proto b/proto/HPFPNKNJIOD.proto new file mode 100644 index 00000000..3842de14 --- /dev/null +++ b/proto/HPFPNKNJIOD.proto @@ -0,0 +1,27 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +message HPFPNKNJIOD { + bool is_open = 14; + uint32 best_score = 4; + uint32 level_id = 1; + bool is_finish = 10; +} diff --git a/proto/HachiActivityDetailInfo.proto b/proto/HachiActivityDetailInfo.proto new file mode 100644 index 00000000..0957212c --- /dev/null +++ b/proto/HachiActivityDetailInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "HachiStageInfo.proto"; +// Obf: LBGOIMEOFJG +message HachiActivityDetailInfo { + map stage_map = 12; +} diff --git a/proto/HachiStageInfo.proto b/proto/HachiStageInfo.proto new file mode 100644 index 00000000..2a4350b1 --- /dev/null +++ b/proto/HachiStageInfo.proto @@ -0,0 +1,28 @@ +// 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: AAALOFKKDHO +message HachiStageInfo { + uint32 open_time = 3; + bool is_open = 7; + uint32 stage_id = 11; + bool is_finished = 10; +} diff --git a/proto/HideAndSeekActivityDetailInfo.proto b/proto/HideAndSeekActivityDetailInfo.proto new file mode 100644 index 00000000..3288b5d7 --- /dev/null +++ b/proto/HideAndSeekActivityDetailInfo.proto @@ -0,0 +1,30 @@ +// 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 "HideAndSeekMapInfo.proto"; +// Obf: PHNGEOHNGLH +message HideAndSeekActivityDetailInfo { + repeated uint32 OFCDAFADFMD = 12; + repeated uint32 OJOEODJPDKD = 11; + repeated HideAndSeekMapInfo open_map_info_list = 14; + repeated uint32 KONDBPJKNLK = 4; + repeated uint32 FCDJJELDDLI = 1; +} diff --git a/proto/HideAndSeekMapInfo.proto b/proto/HideAndSeekMapInfo.proto new file mode 100644 index 00000000..a63f18a4 --- /dev/null +++ b/proto/HideAndSeekMapInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +// Obf: DKJEPJOGLDO +message HideAndSeekMapInfo { + repeated uint32 match_lock_reason_list = 10; + uint32 id = 4; +} diff --git a/proto/HitColliderType.proto b/proto/HitColliderType.proto index 43f386ac..f8f0eeef 100644 --- a/proto/HitColliderType.proto +++ b/proto/HitColliderType.proto @@ -19,9 +19,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: GKJOKLCBGMO enum HitColliderType { - HitColliderType_HitColliderInvalid = 0; - HitColliderType_HitColliderHitBox = 1; - HitColliderType_HitColliderWetHitBox = 2; - HitColliderType_HitColliderHeadBox = 3; + HIT_COLLIDER_INVALID = 0; + HIT_COLLIDER_HIT_BOX = 1; + HIT_COLLIDER_WET_HIT_BOX = 2; + HIT_COLLIDER_HEAD_BOX = 3; } diff --git a/proto/LFGGJIKICHD.proto b/proto/HitCollision.proto similarity index 85% rename from proto/LFGGJIKICHD.proto rename to proto/HitCollision.proto index e7fd8057..ebde79da 100644 --- a/proto/LFGGJIKICHD.proto +++ b/proto/HitCollision.proto @@ -21,11 +21,12 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; import "HitColliderType.proto"; -message LFGGJIKICHD { - float BODOCDABOGL = 2; - float LGPPCHOBNEF = 8; - Vector MFKBMBAFDGJ = 5; +// Obf: LFGGJIKICHD +message HitCollision { + float attackeeHitEntityAngle = 2; + float attackeeHitForceAngle = 8; + Vector hit_dir = 5; int32 hit_box_index = 6; - Vector NMKKCNFCFMF = 10; + Vector hit_point = 10; HitColliderType hit_collider_type = 11; } diff --git a/proto/HitTreeNotify.proto b/proto/HitTreeNotify.proto index b18ce600..42c31b4a 100644 --- a/proto/HitTreeNotify.proto +++ b/proto/HitTreeNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; // CmdId: 3420 +// Obf: LDBJKFHJNKH message HitTreeNotify { uint32 tree_type = 6; Vector tree_pos = 14; diff --git a/proto/HomeAllUnlockedBgmIdListNotify.proto b/proto/HomeAllUnlockedBgmIdListNotify.proto index ccc63bbf..656bcb11 100644 --- a/proto/HomeAllUnlockedBgmIdListNotify.proto +++ b/proto/HomeAllUnlockedBgmIdListNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4455 +// Obf: MOKMFLGOAKN message HomeAllUnlockedBgmIdListNotify { repeated uint32 all_unlocked_bgm_id_list = 13; } diff --git a/proto/HomeAnimalData.proto b/proto/HomeAnimalData.proto index c27938f7..fcbda690 100644 --- a/proto/HomeAnimalData.proto +++ b/proto/HomeAnimalData.proto @@ -1,13 +1,28 @@ +// 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"; - -// Name: LGEGNFDDCKB +// Obf: ACFEEBJCEHD message HomeAnimalData { - Vector spawn_pos = 10; - uint32 furniture_id = 5; - Vector spawn_rot = 13; + uint32 furniture_id = 11; + Vector spawnRot = 10; + Vector spawn_pos = 4; } - diff --git a/proto/HomeBasicInfo.proto b/proto/HomeBasicInfo.proto index ca4a54e7..a3f98b13 100644 --- a/proto/HomeBasicInfo.proto +++ b/proto/HomeBasicInfo.proto @@ -20,13 +20,14 @@ option java_package = "emu.grasscutter.net.proto"; import "HomeLimitedShopInfo.proto"; +// Obf: IJLFNOMCNNH message HomeBasicInfo { string owner_nick_name = 7; HomeLimitedShopInfo limited_shop_info = 15; - uint32 cur_module_id = 9; + uint32 cur_room_scene_id = 9; bool is_in_edit_mode = 14; uint64 exp = 1; uint32 level = 13; uint32 home_owner_uid = 5; - uint32 cur_room_scene_id = 4; + uint32 cur_module_id = 4; } diff --git a/proto/HomeBasicInfoNotify.proto b/proto/HomeBasicInfoNotify.proto index 3885f579..7678721d 100644 --- a/proto/HomeBasicInfoNotify.proto +++ b/proto/HomeBasicInfoNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "HomeBasicInfo.proto"; // CmdId: 4683 +// Obf: DHOEJMLMNMB message HomeBasicInfoNotify { HomeBasicInfo basic_info = 7; } diff --git a/proto/HomeBlockArrangementInfo.proto b/proto/HomeBlockArrangementInfo.proto index 69815793..427395d8 100644 --- a/proto/HomeBlockArrangementInfo.proto +++ b/proto/HomeBlockArrangementInfo.proto @@ -1,31 +1,46 @@ +// 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 "HomeAnimalData.proto"; -import "HomeBlockDotPattern.proto"; -import "HomeBlockFieldData.proto"; -import "HomeFurnitureCustomSuiteData.proto"; -import "HomeFurnitureData.proto"; -import "HomeFurnitureGroupData.proto"; + import "HomeFurnitureSuiteData.proto"; -import "HomeNpcData.proto"; +import "HomeFurnitureData.proto"; +import "HomeBlockFieldData.proto"; +import "HomeAnimalData.proto"; import "WeekendDjinnInfo.proto"; - -// Name: IHLEOGKOHJH +import "HomeBlockDotPattern.proto"; +import "HomeFurnitureCustomSuiteData.proto"; +import "HomeNpcData.proto"; +import "HomeFurnitureGroupData.proto"; +// Obf: NJLAEMBOJCO message HomeBlockArrangementInfo { - uint32 comfort_value = 2; - bool is_unlocked = 3; - repeated HomeFurnitureSuiteData furniture_suite_list = 6; - repeated HomeAnimalData deploy_animal_list = 4; - repeated WeekendDjinnInfo weekend_djinn_info_list = 1; - repeated HomeFurnitureGroupData furniture_group_list = 11; - repeated HomeBlockFieldData field_list = 5; - repeated HomeBlockDotPattern dot_pattern_list = 15; - repeated HomeFurnitureCustomSuiteData furniture_custom_suite_list = 12; - repeated HomeNpcData deploy_npc_list = 9; - uint32 block_id = 10; - repeated HomeFurnitureData deployFurniureList = 13; // NOLOJAIDCGA - repeated HomeFurnitureData persistentFurnitureList = 8; // CIKCBEBJEIK + uint32 comfort_value = 8; + repeated HomeFurnitureSuiteData furniture_suite_list = 10; + uint32 block_id = 15; + repeated HomeFurnitureData persistentFurnitureList = 6; + repeated HomeFurnitureData deployFurniureList = 11; + repeated HomeBlockFieldData field_list = 3; + repeated HomeAnimalData deploy_animal_list = 1; + bool is_unlocked = 12; + repeated WeekendDjinnInfo weekend_djinn_info_list = 9; + repeated HomeBlockDotPattern dot_pattern_list = 7; + repeated HomeFurnitureCustomSuiteData furniture_custom_suite_list = 4; + repeated HomeNpcData deploy_npc_list = 2; + repeated HomeFurnitureGroupData furniture_group_list = 5; } - diff --git a/proto/HomeBlockDotPattern.proto b/proto/HomeBlockDotPattern.proto index 6f956c97..9e65f24d 100644 --- a/proto/HomeBlockDotPattern.proto +++ b/proto/HomeBlockDotPattern.proto @@ -1,12 +1,27 @@ +// 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"; -// Name: BOPELKOALPJ +// Obf: FIABNBMDCIE message HomeBlockDotPattern { - bytes data = 8; - uint32 width = 3; - uint32 height = 15; + uint32 height = 15; + uint32 width = 11; + bytes data = 4; } - diff --git a/proto/HomeBlockFieldData.proto b/proto/HomeBlockFieldData.proto index e6ccc779..6b735e52 100644 --- a/proto/HomeBlockFieldData.proto +++ b/proto/HomeBlockFieldData.proto @@ -1,16 +1,31 @@ +// 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 "HomeBlockSubFieldData.proto"; + import "Vector.proto"; - -// Name: MFENNMEPMCI +import "HomeBlockSubFieldData.proto"; +// Obf: IHLFOFHLINA message HomeBlockFieldData { - Vector pos = 14; - Vector rot = 5; - uint32 furniture_id = 4; - uint32 guid = 9; - repeated HomeBlockSubFieldData sub_field_list = 6; + Vector pos = 3; + uint32 furniture_id = 13; + repeated HomeBlockSubFieldData sub_field_list = 9; + uint32 guid = 5; + Vector rot = 1; } - diff --git a/proto/HomeBlockSubFieldData.proto b/proto/HomeBlockSubFieldData.proto index 1d8276e0..0ba18c13 100644 --- a/proto/HomeBlockSubFieldData.proto +++ b/proto/HomeBlockSubFieldData.proto @@ -1,12 +1,27 @@ +// 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"; - -// Name: INCOBHPDNFA +// Obf: OPNHIHEAIIK message HomeBlockSubFieldData { - Vector pos = 7; - Vector rot = 5; + Vector rot = 10; + Vector pos = 12; } - diff --git a/proto/HomeChangeBgmNotify.proto b/proto/HomeChangeBgmNotify.proto index 66b2a1fd..9013e3a6 100644 --- a/proto/HomeChangeBgmNotify.proto +++ b/proto/HomeChangeBgmNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4479 +// Obf: HIMMOIJJPGB message HomeChangeBgmNotify { uint32 bgm_id = 15; } diff --git a/proto/HomeChangeBgmReq.proto b/proto/HomeChangeBgmReq.proto index 586f2c70..f915bd1c 100644 --- a/proto/HomeChangeBgmReq.proto +++ b/proto/HomeChangeBgmReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4496 +// Obf: HADMLDEDBLD message HomeChangeBgmReq { uint32 bgm_id = 3; } diff --git a/proto/HomeChangeBgmRsp.proto b/proto/HomeChangeBgmRsp.proto index 2bca7704..a5aa39f8 100644 --- a/proto/HomeChangeBgmRsp.proto +++ b/proto/HomeChangeBgmRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4498 +// Obf: BAKOLHAPFMG message HomeChangeBgmRsp { int32 retcode = 11; } diff --git a/proto/HomeChangeEditModeReq.proto b/proto/HomeChangeEditModeReq.proto index 60ec7f23..352929b8 100644 --- a/proto/HomeChangeEditModeReq.proto +++ b/proto/HomeChangeEditModeReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4656 +// Obf: AJILEMFFCIP message HomeChangeEditModeReq { bool is_enter_edit_mode = 11; } diff --git a/proto/HomeChangeEditModeRsp.proto b/proto/HomeChangeEditModeRsp.proto index f9f55adb..23cef68a 100644 --- a/proto/HomeChangeEditModeRsp.proto +++ b/proto/HomeChangeEditModeRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4809 +// Obf: PHGILHHOFNM message HomeChangeEditModeRsp { bool is_enter_edit_mode = 6; int32 retcode = 12; diff --git a/proto/HomeChangeModuleReq.proto b/proto/HomeChangeModuleReq.proto index e58622e2..29c73790 100644 --- a/proto/HomeChangeModuleReq.proto +++ b/proto/HomeChangeModuleReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4505 +// Obf: KFFLKFKIBKE message HomeChangeModuleReq { uint32 target_module_id = 13; } diff --git a/proto/HomeChangeModuleRsp.proto b/proto/HomeChangeModuleRsp.proto index 9c22c534..d0d61b34 100644 --- a/proto/HomeChangeModuleRsp.proto +++ b/proto/HomeChangeModuleRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4838 +// Obf: BKJAOEGJHLM message HomeChangeModuleRsp { int32 retcode = 1; uint32 target_module_id = 12; diff --git a/proto/HomeChooseModuleReq.proto b/proto/HomeChooseModuleReq.proto index 0ae52e0b..79623fb1 100644 --- a/proto/HomeChooseModuleReq.proto +++ b/proto/HomeChooseModuleReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4892 +// Obf: NFBBCLFPKFM message HomeChooseModuleReq { uint32 module_id = 12; } diff --git a/proto/HomeChooseModuleRsp.proto b/proto/HomeChooseModuleRsp.proto index dc74ce38..4109532a 100644 --- a/proto/HomeChooseModuleRsp.proto +++ b/proto/HomeChooseModuleRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4658 +// Obf: DDACLBMKPPF message HomeChooseModuleRsp { uint32 module_id = 15; int32 retcode = 5; diff --git a/proto/HomeComfortInfoNotify.proto b/proto/HomeComfortInfoNotify.proto index 4d32f0ad..1e401fc0 100644 --- a/proto/HomeComfortInfoNotify.proto +++ b/proto/HomeComfortInfoNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "HomeModuleComfortInfo.proto"; // CmdId: 4580 +// Obf: HAPBDHHGKBN message HomeComfortInfoNotify { repeated HomeModuleComfortInfo module_info_list = 14; } diff --git a/proto/HomeCustomFurnitureInfo.proto b/proto/HomeCustomFurnitureInfo.proto index f7ed2512..aaad36ae 100644 --- a/proto/HomeCustomFurnitureInfo.proto +++ b/proto/HomeCustomFurnitureInfo.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "CustomCommonNodeInfo.proto"; +// Obf: OPKMKFIPECP message HomeCustomFurnitureInfo { uint32 guid = 6; repeated CustomCommonNodeInfo sub_furniture_list = 11; diff --git a/proto/HomeCustomFurnitureInfoNotify.proto b/proto/HomeCustomFurnitureInfoNotify.proto index 55db6225..aefb45a2 100644 --- a/proto/HomeCustomFurnitureInfoNotify.proto +++ b/proto/HomeCustomFurnitureInfoNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "HomeCustomFurnitureInfo.proto"; // CmdId: 4603 +// Obf: CNGCFPJKOJB message HomeCustomFurnitureInfoNotify { map used_sub_furniture_count_map = 15; repeated uint32 delete_custom_furniture_list = 12; diff --git a/proto/HomeEditCustomFurnitureReq.proto b/proto/HomeEditCustomFurnitureReq.proto index 6c5fd4ce..ba389a48 100644 --- a/proto/HomeEditCustomFurnitureReq.proto +++ b/proto/HomeEditCustomFurnitureReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "HomeCustomFurnitureInfo.proto"; // CmdId: 4737 +// Obf: EBLKLLLFGNH message HomeEditCustomFurnitureReq { HomeCustomFurnitureInfo custom_furniture_info = 3; } diff --git a/proto/HomeEditCustomFurnitureRsp.proto b/proto/HomeEditCustomFurnitureRsp.proto index 166799d7..1f21a52d 100644 --- a/proto/HomeEditCustomFurnitureRsp.proto +++ b/proto/HomeEditCustomFurnitureRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "HomeCustomFurnitureInfo.proto"; // CmdId: 4551 +// Obf: HAPOEAEAONB message HomeEditCustomFurnitureRsp { int32 retcode = 10; HomeCustomFurnitureInfo custom_furniture_info = 14; diff --git a/proto/HomeEnterEditModeFinishReq.proto b/proto/HomeEnterEditModeFinishReq.proto index 00e1aae5..1cdf2660 100644 --- a/proto/HomeEnterEditModeFinishReq.proto +++ b/proto/HomeEnterEditModeFinishReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4537 +// Obf: HKHAGDJPLEP message HomeEnterEditModeFinishReq { } diff --git a/proto/HomeEnterEditModeFinishRsp.proto b/proto/HomeEnterEditModeFinishRsp.proto index fe255ce4..b9833a0f 100644 --- a/proto/HomeEnterEditModeFinishRsp.proto +++ b/proto/HomeEnterEditModeFinishRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4536 +// Obf: INKJMOOCAKD message HomeEnterEditModeFinishRsp { int32 retcode = 4; } diff --git a/proto/HomeFurnitureCustomSuiteData.proto b/proto/HomeFurnitureCustomSuiteData.proto index b51e87e2..ed7e145a 100644 --- a/proto/HomeFurnitureCustomSuiteData.proto +++ b/proto/HomeFurnitureCustomSuiteData.proto @@ -1,13 +1,28 @@ +// 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"; - -// Name: LOBAFOGBMIA +// Obf: OHIFMEACCCK message HomeFurnitureCustomSuiteData { - uint32 guid = 6; - Vector spawn_pos = 1; - repeated int32 included_furniture_index_list = 11; + Vector spawn_pos = 4; + repeated int32 included_furniture_index_list = 13; + uint32 guid = 1; } - diff --git a/proto/HomeFurnitureData.proto b/proto/HomeFurnitureData.proto index b70c5194..5e2703eb 100644 --- a/proto/HomeFurnitureData.proto +++ b/proto/HomeFurnitureData.proto @@ -1,16 +1,31 @@ +// 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"; - -// Name: HCCCNFFCBGN +// Obf: LLCNMEPLEBL message HomeFurnitureData { - uint32 furniture_id = 10; - Vector spawn_rot = 15; - int32 parent_furniture_index = 11; - Vector spawn_pos = 6; - uint32 version = 13; - uint32 guid = 3; + Vector spawnRot = 9; + uint32 version = 14; + int32 parent_furniture_index = 11; + uint32 furniture_id = 6; + uint32 guid = 13; + Vector spawn_pos = 7; } - diff --git a/proto/HomeFurnitureGroupData.proto b/proto/HomeFurnitureGroupData.proto index c3c74bcb..b634001f 100644 --- a/proto/HomeFurnitureGroupData.proto +++ b/proto/HomeFurnitureGroupData.proto @@ -1,12 +1,27 @@ +// 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 "HomeFurnitureData.proto"; - -// Name: LONHLJHJKOJ +// Obf: OKOMHBCDEIH message HomeFurnitureGroupData { - repeated HomeFurnitureData virtual_furniure_list = 15; - uint32 group_furniture_index = 12; + uint32 group_furniture_index = 12; + repeated HomeFurnitureData virtual_furniure_list = 5; } - diff --git a/proto/HomeFurnitureSuiteData.proto b/proto/HomeFurnitureSuiteData.proto index 30e8df02..496f1597 100644 --- a/proto/HomeFurnitureSuiteData.proto +++ b/proto/HomeFurnitureSuiteData.proto @@ -1,15 +1,30 @@ +// 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"; - -// Name: MILONFPLDDB +// Obf: BAADBIGHGPM message HomeFurnitureSuiteData { - Vector spawn_pos = 2; - uint32 guid = 9; - uint32 suite_id = 4; - bool is_allow_summon = 1; - repeated int32 included_furniture_index_list = 11; + repeated int32 included_furniture_index_list = 2; + uint32 suite_id = 13; + uint32 guid = 3; + Vector spawn_pos = 15; + bool is_allow_summon = 14; } - diff --git a/proto/HomeGetArrangementInfoReq.proto b/proto/HomeGetArrangementInfoReq.proto index ba304a77..c2402fa0 100644 --- a/proto/HomeGetArrangementInfoReq.proto +++ b/proto/HomeGetArrangementInfoReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4796 +// Obf: IHHPAABMMLL message HomeGetArrangementInfoReq { repeated uint32 scene_id_list = 7; } diff --git a/proto/HomeGetArrangementInfoRsp.proto b/proto/HomeGetArrangementInfoRsp.proto index c6cc65e8..377bba25 100644 --- a/proto/HomeGetArrangementInfoRsp.proto +++ b/proto/HomeGetArrangementInfoRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "HomeSceneArrangementInfo.proto"; // CmdId: 4672 +// Obf: GBPCFAODEAB message HomeGetArrangementInfoRsp { int32 retcode = 1; repeated HomeSceneArrangementInfo scene_arrangement_info_list = 9; diff --git a/proto/HomeGetBasicInfoReq.proto b/proto/HomeGetBasicInfoReq.proto index 221aa6de..30627710 100644 --- a/proto/HomeGetBasicInfoReq.proto +++ b/proto/HomeGetBasicInfoReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4806 +// Obf: IFGLHNJGLDB message HomeGetBasicInfoReq { } diff --git a/proto/HomeGetOnlineStatusReq.proto b/proto/HomeGetOnlineStatusReq.proto index 496913d6..ea18eafd 100644 --- a/proto/HomeGetOnlineStatusReq.proto +++ b/proto/HomeGetOnlineStatusReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4729 +// Obf: DBADDFDJKAK message HomeGetOnlineStatusReq { } diff --git a/proto/HomeGetOnlineStatusRsp.proto b/proto/HomeGetOnlineStatusRsp.proto index f17fd564..6dd018c9 100644 --- a/proto/HomeGetOnlineStatusRsp.proto +++ b/proto/HomeGetOnlineStatusRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "OnlinePlayerInfo.proto"; // CmdId: 4746 +// Obf: HIANAFLOAEM message HomeGetOnlineStatusRsp { int32 retcode = 7; repeated OnlinePlayerInfo player_info_list = 2; diff --git a/proto/HomeGroupPlayerInfo.proto b/proto/HomeGroupPlayerInfo.proto index d9d58e7c..abb51985 100644 --- a/proto/HomeGroupPlayerInfo.proto +++ b/proto/HomeGroupPlayerInfo.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ProfilePicture.proto"; +// Obf: IJHCHNPKNGD message HomeGroupPlayerInfo { uint32 player_level = 7; uint32 uid = 11; diff --git a/proto/HomeLimitedShop.proto b/proto/HomeLimitedShop.proto index b0531466..40bbbc49 100644 --- a/proto/HomeLimitedShop.proto +++ b/proto/HomeLimitedShop.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "HomeLimitedShopGoods.proto"; +// Obf: NPMNNGIFGEG message HomeLimitedShop { repeated HomeLimitedShopGoods goods_list = 14; } diff --git a/proto/HomeLimitedShopBuyGoodsReq.proto b/proto/HomeLimitedShopBuyGoodsReq.proto index ea048ebe..7e3f9f4d 100644 --- a/proto/HomeLimitedShopBuyGoodsReq.proto +++ b/proto/HomeLimitedShopBuyGoodsReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "HomeLimitedShopGoods.proto"; // CmdId: 4456 +// Obf: EPNDDOIGOBH message HomeLimitedShopBuyGoodsReq { HomeLimitedShopGoods goods = 10; uint32 buy_count = 12; diff --git a/proto/HomeLimitedShopBuyGoodsRsp.proto b/proto/HomeLimitedShopBuyGoodsRsp.proto index 1ca7da2d..300eab1a 100644 --- a/proto/HomeLimitedShopBuyGoodsRsp.proto +++ b/proto/HomeLimitedShopBuyGoodsRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "HomeLimitedShopGoods.proto"; // CmdId: 4703 +// Obf: ANKOBLDAIFN message HomeLimitedShopBuyGoodsRsp { uint32 buy_count = 5; int32 retcode = 9; diff --git a/proto/HomeLimitedShopGoods.proto b/proto/HomeLimitedShopGoods.proto index fa176c48..6fb0cd55 100644 --- a/proto/HomeLimitedShopGoods.proto +++ b/proto/HomeLimitedShopGoods.proto @@ -20,11 +20,12 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; +// Obf: ABKIHDDHCBB message HomeLimitedShopGoods { ItemParam goods_item = 4; repeated ItemParam cost_item_list = 2; - uint32 LDMGEPEFIFD = 3; - uint32 OLPODBBGJIM = 8; - uint32 DHDJOCLCILA = 10; - uint32 FABMGLGGDFB = 11; + uint32 goods_id = 3; + uint32 bought_num = 8; + uint32 KAPLOLJDEON = 10; + uint32 buy_limit = 11; } diff --git a/proto/HomeLimitedShopGoodsListReq.proto b/proto/HomeLimitedShopGoodsListReq.proto index 046edb02..86b79366 100644 --- a/proto/HomeLimitedShopGoodsListReq.proto +++ b/proto/HomeLimitedShopGoodsListReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4719 +// Obf: KKDGLPBMPLP message HomeLimitedShopGoodsListReq { } diff --git a/proto/HomeLimitedShopGoodsListRsp.proto b/proto/HomeLimitedShopGoodsListRsp.proto index ac42b488..7d15963e 100644 --- a/proto/HomeLimitedShopGoodsListRsp.proto +++ b/proto/HomeLimitedShopGoodsListRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "HomeLimitedShop.proto"; // CmdId: 4541 +// Obf: GACCCJLAOOD message HomeLimitedShopGoodsListRsp { int32 retcode = 13; HomeLimitedShop shop = 6; diff --git a/proto/HomeLimitedShopInfo.proto b/proto/HomeLimitedShopInfo.proto index 3aeee18e..02b957e9 100644 --- a/proto/HomeLimitedShopInfo.proto +++ b/proto/HomeLimitedShopInfo.proto @@ -1,16 +1,31 @@ +// 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"; - -// Name: ALCABPLHONH +// Obf: MPEONKDACFL message HomeLimitedShopInfo { - fixed32 next_guest_open_time = 15; //KILKJHNKDJB - uint32 uid = 2; - Vector djinn_pos = 14; - fixed32 next_open_time = 8; //HEEGDABINMD - Vector djinn_rot = 6; - fixed32 next_close_time = 13; //MBAMOPJCAHC + fixed32 nextOpenTime = 12; + uint32 uid = 6; + Vector djinn_pos = 8; + fixed32 nextCloseTime = 14; + Vector djinn_rot = 15; + fixed32 nextGuestOpenTime = 9; } - diff --git a/proto/HomeLimitedShopInfoChangeNotify.proto b/proto/HomeLimitedShopInfoChangeNotify.proto index b3c63eaf..2eff4ffd 100644 --- a/proto/HomeLimitedShopInfoChangeNotify.proto +++ b/proto/HomeLimitedShopInfoChangeNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "HomeLimitedShopGoods.proto"; // CmdId: 4789 +// Obf: JPMJPPBPJPJ message HomeLimitedShopInfoChangeNotify { repeated HomeLimitedShopGoods goods_list = 7; } diff --git a/proto/HomeLimitedShopInfoNotify.proto b/proto/HomeLimitedShopInfoNotify.proto index b15f9273..faf1513a 100644 --- a/proto/HomeLimitedShopInfoNotify.proto +++ b/proto/HomeLimitedShopInfoNotify.proto @@ -19,8 +19,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "MPEONKDACFL.proto"; +import "HomeLimitedShopInfo.proto"; // CmdId: 4852 +// Obf: PGHENMOIDIC message HomeLimitedShopInfoNotify { - MPEONKDACFL KAEJGDGFINE = 7; + HomeLimitedShopInfo shop_info = 7; } diff --git a/proto/HomeLimitedShopInfoReq.proto b/proto/HomeLimitedShopInfoReq.proto index ec0ad4fa..736e7783 100644 --- a/proto/HomeLimitedShopInfoReq.proto +++ b/proto/HomeLimitedShopInfoReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4741 +// Obf: KKICFPCDONF message HomeLimitedShopInfoReq { } diff --git a/proto/HomeLimitedShopInfoRsp.proto b/proto/HomeLimitedShopInfoRsp.proto index 0aabde25..718820d5 100644 --- a/proto/HomeLimitedShopInfoRsp.proto +++ b/proto/HomeLimitedShopInfoRsp.proto @@ -19,9 +19,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "MPEONKDACFL.proto"; +import "HomeLimitedShopInfo.proto"; // CmdId: 4800 +// Obf: HFGOGKHLBEI message HomeLimitedShopInfoRsp { - MPEONKDACFL KAEJGDGFINE = 9; + HomeLimitedShopInfo shop_info = 9; int32 retcode = 5; } diff --git a/proto/HomeMarkPointFurnitureData.proto b/proto/HomeMarkPointFurnitureData.proto index 53415187..c3f01378 100644 --- a/proto/HomeMarkPointFurnitureData.proto +++ b/proto/HomeMarkPointFurnitureData.proto @@ -20,15 +20,16 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; -import "PLGBNGCKFPJ.proto"; -import "MFJNHGLKNGA.proto"; +import "HomeMarkPointNPCData.proto"; +import "HomeMarkPointSuiteData.proto"; +// Obf: AAMJFNLFJIJ message HomeMarkPointFurnitureData { uint32 guid = 1; uint32 furniture_id = 2; uint32 furniture_type = 3; Vector pos = 4; oneof extra { - PLGBNGCKFPJ OGOKJBMCPLH = 6; - MFJNHGLKNGA OCLMCOHLDPC = 7; + HomeMarkPointNPCData npc_data = 6; + HomeMarkPointSuiteData suite_data = 7; } } diff --git a/proto/PLGBNGCKFPJ.proto b/proto/HomeMarkPointNPCData.proto similarity index 94% rename from proto/PLGBNGCKFPJ.proto rename to proto/HomeMarkPointNPCData.proto index 2f630ad9..647fd53e 100644 --- a/proto/PLGBNGCKFPJ.proto +++ b/proto/HomeMarkPointNPCData.proto @@ -19,7 +19,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -message PLGBNGCKFPJ { +// Obf: PLGBNGCKFPJ +message HomeMarkPointNPCData { uint32 avatar_id = 1; uint32 costume_id = 2; } diff --git a/proto/HomeMarkPointNotify.proto b/proto/HomeMarkPointNotify.proto index a13046ed..f12830ca 100644 --- a/proto/HomeMarkPointNotify.proto +++ b/proto/HomeMarkPointNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "HomeMarkPointSceneData.proto"; // CmdId: 4465 +// Obf: LFOMAGPNMGE message HomeMarkPointNotify { repeated HomeMarkPointSceneData mark_point_data_list = 10; } diff --git a/proto/HomeMarkPointSceneData.proto b/proto/HomeMarkPointSceneData.proto index 204cfe48..7060850e 100644 --- a/proto/HomeMarkPointSceneData.proto +++ b/proto/HomeMarkPointSceneData.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; import "HomeMarkPointFurnitureData.proto"; +// Obf: BGMMGBMIKON message HomeMarkPointSceneData { Vector safe_point_pos = 1; Vector teapot_spirit_pos = 13; diff --git a/proto/HomeMarkPointSuiteData.proto b/proto/HomeMarkPointSuiteData.proto new file mode 100644 index 00000000..fc00398f --- /dev/null +++ b/proto/HomeMarkPointSuiteData.proto @@ -0,0 +1,25 @@ +// 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: MFJNHGLKNGA +message HomeMarkPointSuiteData { + uint32 suite_id = 1; +} diff --git a/proto/HomeModuleComfortInfo.proto b/proto/HomeModuleComfortInfo.proto index 14324d6f..cc78d4fa 100644 --- a/proto/HomeModuleComfortInfo.proto +++ b/proto/HomeModuleComfortInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: ODFOOJKNHIL message HomeModuleComfortInfo { repeated uint32 world_scene_block_comfort_value_list = 11; uint32 module_id = 15; diff --git a/proto/HomeModuleSeenReq.proto b/proto/HomeModuleSeenReq.proto index 728710c6..eb0d45eb 100644 --- a/proto/HomeModuleSeenReq.proto +++ b/proto/HomeModuleSeenReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4826 +// Obf: OJHBOIHODLL message HomeModuleSeenReq { repeated uint32 seen_module_id_list = 13; } diff --git a/proto/HomeModuleSeenRsp.proto b/proto/HomeModuleSeenRsp.proto index 4d338b7c..56903752 100644 --- a/proto/HomeModuleSeenRsp.proto +++ b/proto/HomeModuleSeenRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4725 +// Obf: MFJDJBOBBMM message HomeModuleSeenRsp { repeated uint32 seen_module_id_list = 14; int32 retcode = 9; diff --git a/proto/HomeModuleUnlockNotify.proto b/proto/HomeModuleUnlockNotify.proto index 25715422..d90ebfce 100644 --- a/proto/HomeModuleUnlockNotify.proto +++ b/proto/HomeModuleUnlockNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4682 +// Obf: MNAPLAHGPJO message HomeModuleUnlockNotify { uint32 module_id = 10; } diff --git a/proto/HomeNewUnlockedBgmIdListNotify.proto b/proto/HomeNewUnlockedBgmIdListNotify.proto index 7c3c70bf..d3482ae1 100644 --- a/proto/HomeNewUnlockedBgmIdListNotify.proto +++ b/proto/HomeNewUnlockedBgmIdListNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4560 +// Obf: LALMMCFMMNA message HomeNewUnlockedBgmIdListNotify { repeated uint32 new_unlocked_bgm_id_list = 14; } diff --git a/proto/HomeNpcData.proto b/proto/HomeNpcData.proto index 391e0072..ca0ad1e5 100644 --- a/proto/HomeNpcData.proto +++ b/proto/HomeNpcData.proto @@ -1,14 +1,29 @@ +// 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"; - -// Name: CGKNAOGEEKA +// Obf: CNGHNAGPNIM message HomeNpcData { - uint32 avatar_id = 8; - Vector spawn_pos = 13; - uint32 costume_id = 2; - Vector spawn_rot = 12; + uint32 avatar_id = 10; + uint32 costume_id = 8; + Vector spawn_pos = 4; + Vector spawnRot = 7; } - diff --git a/proto/HomePlantFieldStatus.proto b/proto/HomePlantFieldStatus.proto index 44d50899..ab061663 100644 --- a/proto/HomePlantFieldStatus.proto +++ b/proto/HomePlantFieldStatus.proto @@ -1,13 +1,28 @@ +// 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"; -// Name: GEHIKODGKMC +// Obf: EOCCCEGKIIF enum HomePlantFieldStatus { - HOME_FIELD_STATUE_NONE = 0; - HOME_FIELD_STATUE_SEED = 1; - HOME_FIELD_STATUE_SPROUT = 2; - HOME_FIELD_STATUE_GATHER = 3; + HOME_FIELD_STATUE_NONE = 0; + HOME_FIELD_STATUE_SEED = 1; + HOME_FIELD_STATUE_SPROUT = 2; + HOME_FIELD_STATUE_GATHER = 3; } - diff --git a/proto/HomePreChangeEditModeNotify.proto b/proto/HomePreChangeEditModeNotify.proto index 79165fa3..1a7d83bc 100644 --- a/proto/HomePreChangeEditModeNotify.proto +++ b/proto/HomePreChangeEditModeNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4830 +// Obf: DGFGCDOOMLC message HomePreChangeEditModeNotify { bool is_enter_edit_mode = 4; } diff --git a/proto/HomeResource.proto b/proto/HomeResource.proto index cbc2a36b..17117ef8 100644 --- a/proto/HomeResource.proto +++ b/proto/HomeResource.proto @@ -1,12 +1,27 @@ +// 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"; -// Name: LDMGBIGBOLN +// Obf: KEJFFCAKLNH message HomeResource { - fixed32 next_refresh_time = 9; - uint32 store_limit = 13; - uint32 store_value = 10; + uint32 store_value = 4; + fixed32 next_refresh_time = 5; + uint32 store_limit = 13; } - diff --git a/proto/HomeResourceNotify.proto b/proto/HomeResourceNotify.proto index fa85d2f1..204bfde5 100644 --- a/proto/HomeResourceNotify.proto +++ b/proto/HomeResourceNotify.proto @@ -21,7 +21,8 @@ option java_package = "emu.grasscutter.net.proto"; import "HomeResource.proto"; // CmdId: 4867 +// Obf: JKJJFACEADN message HomeResourceNotify { - HomeResource home_coin = 1; - HomeResource fetter_exp = 12; + HomeResource fetter_exp = 1; + HomeResource home_coin = 12; } diff --git a/proto/HomeResourceTakeFetterExpReq.proto b/proto/HomeResourceTakeFetterExpReq.proto index 1c5f593b..3f8daebd 100644 --- a/proto/HomeResourceTakeFetterExpReq.proto +++ b/proto/HomeResourceTakeFetterExpReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4766 +// Obf: JAJFLCAJDNA message HomeResourceTakeFetterExpReq { } diff --git a/proto/HomeResourceTakeFetterExpRsp.proto b/proto/HomeResourceTakeFetterExpRsp.proto index b8247171..ba60cacb 100644 --- a/proto/HomeResourceTakeFetterExpRsp.proto +++ b/proto/HomeResourceTakeFetterExpRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "HomeResource.proto"; // CmdId: 4548 +// Obf: NNGLEIDNCDL message HomeResourceTakeFetterExpRsp { HomeResource fetter_exp = 11; int32 retcode = 3; diff --git a/proto/HomeResourceTakeHomeCoinReq.proto b/proto/HomeResourceTakeHomeCoinReq.proto index 78630740..73a2cb5a 100644 --- a/proto/HomeResourceTakeHomeCoinReq.proto +++ b/proto/HomeResourceTakeHomeCoinReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4773 +// Obf: JBHKJDLNHDJ message HomeResourceTakeHomeCoinReq { } diff --git a/proto/HomeResourceTakeHomeCoinRsp.proto b/proto/HomeResourceTakeHomeCoinRsp.proto index d58435ef..b455d2f0 100644 --- a/proto/HomeResourceTakeHomeCoinRsp.proto +++ b/proto/HomeResourceTakeHomeCoinRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "HomeResource.proto"; // CmdId: 4707 +// Obf: DBNLECALCBO message HomeResourceTakeHomeCoinRsp { int32 retcode = 7; HomeResource home_coin = 8; diff --git a/proto/HomeSceneArrangementInfo.proto b/proto/HomeSceneArrangementInfo.proto index 6b8c8523..118c868c 100644 --- a/proto/HomeSceneArrangementInfo.proto +++ b/proto/HomeSceneArrangementInfo.proto @@ -22,17 +22,18 @@ option java_package = "emu.grasscutter.net.proto"; import "HomeFurnitureData.proto"; import "Vector.proto"; import "HomeBlockArrangementInfo.proto"; +// Obf: OPEJIIPLGJN message HomeSceneArrangementInfo { - repeated HomeFurnitureData IOICLAIFPBI = 12; + repeated HomeFurnitureData Unk3300_CMBCIBBCMOK = 12; Vector born_pos = 4; repeated HomeBlockArrangementInfo block_arrangement_info_list = 15; - Vector born_rot = 3; + Vector djinn_pos = 3; uint32 scene_id = 14; HomeFurnitureData main_house = 6; - repeated HomeFurnitureData DMALLBPIKFC = 5; + repeated HomeFurnitureData Unk3300_EOHAHHFDAPI = 5; bool is_set_born_pos = 2; uint32 bgm_id = 10; - uint32 comfort_value = 1; - Vector djinn_pos = 13; - uint32 tmp_version = 11; + uint32 tmp_version = 1; + Vector born_rot = 13; + uint32 comfort_value = 11; } diff --git a/proto/HomeSceneInitFinishReq.proto b/proto/HomeSceneInitFinishReq.proto index 5010a60a..8c26e559 100644 --- a/proto/HomeSceneInitFinishReq.proto +++ b/proto/HomeSceneInitFinishReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4497 +// Obf: JJFGMDDJNEN message HomeSceneInitFinishReq { } diff --git a/proto/HomeSceneInitFinishRsp.proto b/proto/HomeSceneInitFinishRsp.proto index d99f3855..92449ece 100644 --- a/proto/HomeSceneInitFinishRsp.proto +++ b/proto/HomeSceneInitFinishRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4860 +// Obf: LJJPLIGIHKN message HomeSceneInitFinishRsp { int32 retcode = 1; } diff --git a/proto/HomeSceneJumpReq.proto b/proto/HomeSceneJumpReq.proto index 2a55cf46..b57fc226 100644 --- a/proto/HomeSceneJumpReq.proto +++ b/proto/HomeSceneJumpReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4669 +// Obf: MJOEBIHECAD message HomeSceneJumpReq { bool is_enter_room_scene = 6; } diff --git a/proto/HomeSceneJumpRsp.proto b/proto/HomeSceneJumpRsp.proto index 6aaadb14..74de6d65 100644 --- a/proto/HomeSceneJumpRsp.proto +++ b/proto/HomeSceneJumpRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4544 +// Obf: HBDFALCPCIA message HomeSceneJumpRsp { bool is_enter_room_scene = 14; int32 retcode = 13; diff --git a/proto/HomeSeekFurnitureAllRecord.proto b/proto/HomeSeekFurnitureAllRecord.proto index 9c454fd9..a4afabcd 100644 --- a/proto/HomeSeekFurnitureAllRecord.proto +++ b/proto/HomeSeekFurnitureAllRecord.proto @@ -1,11 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "HomeSeekFurnitureOneRecord.proto"; - -// Name: OGMFJCGONHB +// Obf: CJFKKMCHPKG message HomeSeekFurnitureAllRecord { - repeated HomeSeekFurnitureOneRecord record_list = 12; + repeated HomeSeekFurnitureOneRecord record_list = 4; } - diff --git a/proto/HomeSeekFurnitureGalleryScoreNotify.proto b/proto/HomeSeekFurnitureGalleryScoreNotify.proto index ebd349a8..a1323097 100644 --- a/proto/HomeSeekFurnitureGalleryScoreNotify.proto +++ b/proto/HomeSeekFurnitureGalleryScoreNotify.proto @@ -20,10 +20,11 @@ option java_package = "emu.grasscutter.net.proto"; import "HomeSeekFurnitureOneRecord.proto"; -import "GalleryStopReason.proto"; +import "HDDANIDHCMI.proto"; // CmdId: 4749 +// Obf: MDCJGGFAKAN message HomeSeekFurnitureGalleryScoreNotify { HomeSeekFurnitureOneRecord record = 8; - GalleryStopReason reason = 9; + HDDANIDHCMI reason = 9; uint32 gallery_id = 6; } diff --git a/proto/HomeSeekFurnitureInfo.proto b/proto/HomeSeekFurnitureInfo.proto deleted file mode 100644 index 3526b26f..00000000 --- a/proto/HomeSeekFurnitureInfo.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - - - -message HomeSeekFurnitureInfo { - uint32 Unk3300_LGEAPLJCJFH = 10; - uint32 Unk3300_DAEEBIEAOMN = 11; - uint32 Unk3300_ENKOGPIEHFD = 8; - map playerScoreMap = 12; -} diff --git a/proto/HomeSeekFurnitureOneRecord.proto b/proto/HomeSeekFurnitureOneRecord.proto index e63e582c..236d18b6 100644 --- a/proto/HomeSeekFurnitureOneRecord.proto +++ b/proto/HomeSeekFurnitureOneRecord.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "HomeSeekFurniturePlayerScore.proto"; +// Obf: PAJGLJGGGNO message HomeSeekFurnitureOneRecord { repeated HomeSeekFurniturePlayerScore engaged_player_score_list = 13; uint32 timestamp = 5; diff --git a/proto/HomeSeekFurniturePlayerScore.proto b/proto/HomeSeekFurniturePlayerScore.proto index 95e6cf5f..a3a7dabd 100644 --- a/proto/HomeSeekFurniturePlayerScore.proto +++ b/proto/HomeSeekFurniturePlayerScore.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "HomeGroupPlayerInfo.proto"; +// Obf: NINHFCFLPGA message HomeSeekFurniturePlayerScore { HomeGroupPlayerInfo player_info = 4; uint32 score = 1; diff --git a/proto/HomeUpdateArrangementInfoReq.proto b/proto/HomeUpdateArrangementInfoReq.proto index 2ef57c22..52eb712a 100644 --- a/proto/HomeUpdateArrangementInfoReq.proto +++ b/proto/HomeUpdateArrangementInfoReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "HomeSceneArrangementInfo.proto"; // CmdId: 4871 +// Obf: AHPNGIHKNPH message HomeUpdateArrangementInfoReq { HomeSceneArrangementInfo scene_arrangement_info = 6; } diff --git a/proto/HomeUpdateArrangementInfoRsp.proto b/proto/HomeUpdateArrangementInfoRsp.proto index 33d34591..da25ae6d 100644 --- a/proto/HomeUpdateArrangementInfoRsp.proto +++ b/proto/HomeUpdateArrangementInfoRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4771 +// Obf: LPIILLEHCAB message HomeUpdateArrangementInfoRsp { int32 retcode = 13; } diff --git a/proto/HomeVerifyFurnitureData.proto b/proto/HomeVerifyFurnitureData.proto deleted file mode 100644 index 23fd0fa4..00000000 --- a/proto/HomeVerifyFurnitureData.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - -// Name: PGINEKANCNG -message HomeVerifyFurnitureData { - repeated uint32 type = 6; - uint32 num = 13; - uint32 id = 5; -} - diff --git a/proto/HostPlayerNotify.proto b/proto/HostPlayerNotify.proto index e940a325..542a936f 100644 --- a/proto/HostPlayerNotify.proto +++ b/proto/HostPlayerNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 302 +// Obf: DGNMEHADJDI message HostPlayerNotify { uint32 host_peer_id = 8; uint32 host_uid = 3; diff --git a/proto/MBPEIAOFFNP.proto b/proto/IADHPCJGOHN.proto similarity index 93% rename from proto/MBPEIAOFFNP.proto rename to proto/IADHPCJGOHN.proto index 0d84ef5b..8c992cb6 100644 --- a/proto/MBPEIAOFFNP.proto +++ b/proto/IADHPCJGOHN.proto @@ -19,6 +19,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -message MBPEIAOFFNP { - uint32 JIJLJOJOIGI = 11; +message IADHPCJGOHN { + repeated uint32 PGLGPKHIDIN = 14; } diff --git a/proto/IFONLLKBEAC.proto b/proto/IFONLLKBEAC.proto new file mode 100644 index 00000000..71df165c --- /dev/null +++ b/proto/IFONLLKBEAC.proto @@ -0,0 +1,27 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +message IFONLLKBEAC { + uint32 max_score = 8; + repeated uint64 CLFODFEFDLA = 15; + uint32 level_id = 4; + uint32 MOGKCOAEAGI = 5; +} diff --git a/proto/IKKIFILAFFM.proto b/proto/IKKIFILAFFM.proto new file mode 100644 index 00000000..2b0f4c11 --- /dev/null +++ b/proto/IKKIFILAFFM.proto @@ -0,0 +1,27 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +message IKKIFILAFFM { + uint32 level_id = 3; + repeated uint32 affix_list = 13; + uint32 max_score = 10; + uint32 OPGBGHPHELB = 15; +} diff --git a/proto/InferencePageInfo.proto b/proto/InferencePageInfo.proto index adb34318..66470808 100644 --- a/proto/InferencePageInfo.proto +++ b/proto/InferencePageInfo.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "InfernceWordInfo.proto"; +// Obf: IONBOCLLKIJ message InferencePageInfo { repeated InfernceWordInfo unlock_word_list = 15; uint32 page_id = 7; diff --git a/proto/InfernceWordInfo.proto b/proto/InfernceWordInfo.proto index 763855d0..d8a96dc2 100644 --- a/proto/InfernceWordInfo.proto +++ b/proto/InfernceWordInfo.proto @@ -19,10 +19,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: DNOJNFKPDBO message InfernceWordInfo { - bool NHBJGFKJLPG = 6; + bool FLEJAGNGBBA = 6; uint32 word_id = 4; - bool DLJEIBFOICE = 11; - bool JHPDNACEAFH = 12; + bool PIHNBNJCOIM = 11; + bool FKHGLHPBMPH = 12; uint32 unlock_by_word_id = 10; } diff --git a/proto/InstableSprayAvatarInfo.proto b/proto/InstableSprayAvatarInfo.proto index e6fdbe80..1f456db2 100644 --- a/proto/InstableSprayAvatarInfo.proto +++ b/proto/InstableSprayAvatarInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: JIOLGMNCBND message InstableSprayAvatarInfo { bool is_trial = 11; uint64 avatar_id = 1; diff --git a/proto/InstableSprayDetailInfo.proto b/proto/InstableSprayDetailInfo.proto new file mode 100644 index 00000000..211d4a49 --- /dev/null +++ b/proto/InstableSprayDetailInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "InstableSprayStageInfo.proto"; +// Obf: JPJHKNMPHCC +message InstableSprayDetailInfo { + repeated InstableSprayStageInfo stage_info_list = 13; +} diff --git a/proto/InstableSprayDungeonSettleInfo.proto b/proto/InstableSprayDungeonSettleInfo.proto new file mode 100644 index 00000000..7836a1b9 --- /dev/null +++ b/proto/InstableSprayDungeonSettleInfo.proto @@ -0,0 +1,30 @@ +// 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: CAMOHBCDHAL +message InstableSprayDungeonSettleInfo { + uint32 level_id = 11; + uint32 difficulty = 6; + uint32 stage_id = 1; + bool is_new_record = 10; + uint32 round = 4; + repeated uint32 score_list = 8; +} diff --git a/proto/InstableSprayStageInfo.proto b/proto/InstableSprayStageInfo.proto new file mode 100644 index 00000000..a8253fd6 --- /dev/null +++ b/proto/InstableSprayStageInfo.proto @@ -0,0 +1,29 @@ +// 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 "InstableSprayTeamInfo.proto"; +// Obf: GDNJIMFKDFO +message InstableSprayStageInfo { + uint32 max_score = 10; + bool is_finished = 14; + repeated InstableSprayTeamInfo team_info_list = 3; + uint32 stage_id = 15; +} diff --git a/proto/InstableSprayTeamInfo.proto b/proto/InstableSprayTeamInfo.proto new file mode 100644 index 00000000..528ac142 --- /dev/null +++ b/proto/InstableSprayTeamInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "InstableSprayAvatarInfo.proto"; +// Obf: CNHNIHMDAKN +message InstableSprayTeamInfo { + repeated InstableSprayAvatarInfo avatar_info_list = 12; +} diff --git a/proto/InterOpType.proto b/proto/InterOpType.proto index db9b3f3c..fd88357c 100644 --- a/proto/InterOpType.proto +++ b/proto/InterOpType.proto @@ -1,11 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Name: DGDNJFDLBNB +// Obf: NOCKAENAGBE enum InterOpType { INTER_OP_TYPE_FINISH = 0; INTER_OP_TYPE_START = 1; } - diff --git a/proto/InteractType.proto b/proto/InteractType.proto index 5ffdce61..444cf7b5 100644 --- a/proto/InteractType.proto +++ b/proto/InteractType.proto @@ -1,26 +1,41 @@ +// 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"; -// Name: JJNNDFMMKMA +// Obf: IJMMJPAEDFE enum InteractType { - INTERACT_TYPE_NONE = 0; - INTERACT_TYPE_PICK_ITEM = 1; - INTERACT_TYPE_GATHER = 2; - INTERACT_TYPE_OPEN_CHEST = 3; - INTERACT_TYPE_OPEN_STATUE = 4; - INTERACT_TYPE_CONSUM = 5; - INTERACT_TYPE_MP_PLAY_REWARD = 6; - INTERACT_TYPE_VIEW = 7; - INTERACT_TYPE_GENERAL_REWARD = 8; - INTERACT_TYPE_MIRACLE_RING = 9; - INTERACT_TYPE_FOUNDATION = 10; - INTERACT_TYPE_ECHO_SHELL = 11; - INTERACT_TYPE_HOME_GATHER = 12; - INTERACT_TYPE_ENV_ANIMAL = 13; - INTERACT_TYPE_QUEST_GADGET = 14; - INTERACT_TYPE_UI_INTERACT = 15; - INTERACT_TYPE_DESHRET_OBELISK = 16; + INTERACT_TYPE_NONE = 0; + INTERACT_TYPE_PICK_ITEM = 1; + INTERACT_TYPE_GATHER = 2; + INTERACT_TYPE_OPEN_CHEST = 3; + INTERACT_TYPE_OPEN_STATUE = 4; + INTERACT_TYPE_CONSUM = 5; + INTERACT_TYPE_MP_PLAY_REWARD = 6; + INTERACT_TYPE_VIEW = 7; + INTERACT_TYPE_GENERAL_REWARD = 8; + INTERACT_TYPE_MIRACLE_RING = 9; + INTERACT_TYPE_FOUNDATION = 10; + INTERACT_TYPE_ECHO_SHELL = 11; + INTERACT_TYPE_HOME_GATHER = 12; + INTERACT_TYPE_ENV_ANIMAL = 13; + INTERACT_TYPE_QUEST_GADGET = 14; + INTERACT_TYPE_UI_INTERACT = 15; + INTERACT_TYPE_DESHRET_OBELISK = 16; } - diff --git a/proto/Investigation.proto b/proto/Investigation.proto index 9027de2e..33382add 100644 --- a/proto/Investigation.proto +++ b/proto/Investigation.proto @@ -19,13 +19,15 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: BOLKGGNMHLK message Investigation { - enum State { - INVALID = 0; - IN_PROGRESS = 1; - COMPLETE = 2; - REWARD_TAKEN = 3; - } + // Obf: MPOBDBLHGOF + enum State { + INVALID = 0; + IN_PROGRESS = 1; + COMPLETE = 2; + REWARD_TAKEN = 3; + } uint32 progress = 4; uint32 id = 10; diff --git a/proto/InvestigationMonster.proto b/proto/InvestigationMonster.proto index 98dd09c1..1d24d458 100644 --- a/proto/InvestigationMonster.proto +++ b/proto/InvestigationMonster.proto @@ -21,15 +21,17 @@ option java_package = "emu.grasscutter.net.proto"; import "WeeklyBossResinDiscountInfo.proto"; import "Vector.proto"; +// Obf: IFMHPEMPKEA message InvestigationMonster { + // Obf: JANHGIBAEBI enum LockState { - LOCK_NONE = 0; - LOCK_QUEST = 1; - } + LOCK_NONE = 0; + LOCK_QUEST = 1; + } uint32 resin = 5; uint32 scene_id = 1; - uint32 next_boss_chest_refresh_time = 9; + uint32 refresh_interval = 9; uint32 monster_id = 1971; WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 11; LockState lock_state = 12; @@ -37,11 +39,11 @@ message InvestigationMonster { uint32 boss_chest_num = 4; uint32 id = 2; uint32 city_id = 8; - uint32 next_refresh_time = 3; - bool is_area_locked = 6; - bool is_alive = 14; - uint32 max_boss_chest_num = 10; - uint32 refresh_interval = 7; + uint32 ODGFEEPJAJA = 3; + bool is_alive = 6; + bool is_area_locked = 14; + uint32 next_refresh_time = 10; + uint32 max_boss_chest_num = 7; Vector pos = 15; uint32 group_id = 1266; } diff --git a/proto/InvestigationMonsterUpdateNotify.proto b/proto/InvestigationMonsterUpdateNotify.proto index 50b7113b..3f2d9608 100644 --- a/proto/InvestigationMonsterUpdateNotify.proto +++ b/proto/InvestigationMonsterUpdateNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "InvestigationMonster.proto"; // CmdId: 1924 +// Obf: MIPONPDFIHM message InvestigationMonsterUpdateNotify { InvestigationMonster investigation_monster = 7; } diff --git a/proto/InvestigationQuestDailyNotify.proto b/proto/InvestigationQuestDailyNotify.proto index 9e80095a..de59f841 100644 --- a/proto/InvestigationQuestDailyNotify.proto +++ b/proto/InvestigationQuestDailyNotify.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1908 +// Obf: BJMGDOLKAAL message InvestigationQuestDailyNotify { } diff --git a/proto/InvestigationReadQuestDailyNotify.proto b/proto/InvestigationReadQuestDailyNotify.proto index 5fe77348..e46ebde6 100644 --- a/proto/InvestigationReadQuestDailyNotify.proto +++ b/proto/InvestigationReadQuestDailyNotify.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1913 +// Obf: LGMLNOBFNDN message InvestigationReadQuestDailyNotify { } diff --git a/proto/InvestigationTarget.proto b/proto/InvestigationTarget.proto index 68215ea9..a4148261 100644 --- a/proto/InvestigationTarget.proto +++ b/proto/InvestigationTarget.proto @@ -19,13 +19,15 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: OBIKILBIEGP message InvestigationTarget { + // Obf: HBKLOLAACJJ enum State { - INVALID = 0; - IN_PROGRESS = 1; - COMPLETE = 2; - REWARD_TAKEN = 3; - } + INVALID = 0; + IN_PROGRESS = 1; + COMPLETE = 2; + REWARD_TAKEN = 3; + } uint32 investigation_id = 5; State state = 6; diff --git a/proto/IrodoriActivityDetailInfo.proto b/proto/IrodoriActivityDetailInfo.proto new file mode 100644 index 00000000..3e951274 --- /dev/null +++ b/proto/IrodoriActivityDetailInfo.proto @@ -0,0 +1,32 @@ +// 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 "IrodoriFlowerData.proto"; +import "IrodoriChessData.proto"; +import "IrodoriPoetryData.proto"; +import "IrodoriMasterLevelInfo.proto"; +// Obf: CJMCFPIKLJG +message IrodoriActivityDetailInfo { + IrodoriFlowerData flower_data = 1; + IrodoriChessData chess_data = 2; + IrodoriPoetryData poetry_data = 13; + repeated IrodoriMasterLevelInfo master_level_list = 3; +} diff --git a/proto/IrodoriChessData.proto b/proto/IrodoriChessData.proto new file mode 100644 index 00000000..694650c8 --- /dev/null +++ b/proto/IrodoriChessData.proto @@ -0,0 +1,27 @@ +// 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 "IrodoriChessLevelData.proto"; +// Obf: PHEJAAEEOFP +message IrodoriChessData { + repeated IrodoriChessLevelData level_data_list = 8; + bool is_open = 5; +} diff --git a/proto/IrodoriChessEntranceDetailInfo.proto b/proto/IrodoriChessEntranceDetailInfo.proto new file mode 100644 index 00000000..3ebaebb3 --- /dev/null +++ b/proto/IrodoriChessEntranceDetailInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "IrodoriChessEntranceInfo.proto"; +// Obf: CFNFNIIIKBL +message IrodoriChessEntranceDetailInfo { + repeated IrodoriChessEntranceInfo info_list = 5; +} diff --git a/proto/IrodoriChessEntranceInfo.proto b/proto/IrodoriChessEntranceInfo.proto new file mode 100644 index 00000000..fa1c1d41 --- /dev/null +++ b/proto/IrodoriChessEntranceInfo.proto @@ -0,0 +1,27 @@ +// 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 "IrodoriChessMonsterInfo.proto"; +// Obf: MFOKPMJJLGC +message IrodoriChessEntranceInfo { + uint32 entrance_point_id = 3; + repeated IrodoriChessMonsterInfo monster_info_list = 1; +} diff --git a/proto/IrodoriChessEquipCardReq.proto b/proto/IrodoriChessEquipCardReq.proto index f07b1b3d..85bebbad 100644 --- a/proto/IrodoriChessEquipCardReq.proto +++ b/proto/IrodoriChessEquipCardReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 8144 +// Obf: LCHALPMLDDP message IrodoriChessEquipCardReq { uint32 card_id = 10; uint32 level_id = 1; diff --git a/proto/IrodoriChessEquipCardRsp.proto b/proto/IrodoriChessEquipCardRsp.proto index 6c93594a..74621a72 100644 --- a/proto/IrodoriChessEquipCardRsp.proto +++ b/proto/IrodoriChessEquipCardRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 8089 +// Obf: KJHAENANFKD message IrodoriChessEquipCardRsp { int32 retcode = 10; bool is_hard_map = 12; diff --git a/proto/IrodoriChessLevelData.proto b/proto/IrodoriChessLevelData.proto new file mode 100644 index 00000000..379f58ab --- /dev/null +++ b/proto/IrodoriChessLevelData.proto @@ -0,0 +1,29 @@ +// 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 "IrodoriChessMapData.proto"; +// Obf: HMFBJJPMDLP +message IrodoriChessLevelData { + uint32 open_time = 6; + IrodoriChessMapData NAKGPBPPLHD = 12; + uint32 level_id = 5; + IrodoriChessMapData AFGHJHDFGAK = 11; +} diff --git a/proto/IrodoriChessMapData.proto b/proto/IrodoriChessMapData.proto new file mode 100644 index 00000000..09551c24 --- /dev/null +++ b/proto/IrodoriChessMapData.proto @@ -0,0 +1,29 @@ +// 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 "IrodoriChessEntranceDetailInfo.proto"; +// Obf: DAMDDJCAMKK +message IrodoriChessMapData { + uint32 map_id = 11; + IrodoriChessEntranceDetailInfo entrance_detail_info = 7; + repeated uint32 equiped_card_list = 5; + uint32 best_score = 2; +} diff --git a/proto/IrodoriChessMonsterInfo.proto b/proto/IrodoriChessMonsterInfo.proto new file mode 100644 index 00000000..2e056c1c --- /dev/null +++ b/proto/IrodoriChessMonsterInfo.proto @@ -0,0 +1,28 @@ +// 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: HHDPBPHKCMD +message IrodoriChessMonsterInfo { + uint32 monster_id = 5; + uint32 grant_points = 15; + repeated uint32 affix_list = 10; + uint32 level = 9; +} diff --git a/proto/IrodoriFlowerData.proto b/proto/IrodoriFlowerData.proto new file mode 100644 index 00000000..deefe723 --- /dev/null +++ b/proto/IrodoriFlowerData.proto @@ -0,0 +1,27 @@ +// 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"; +// Obf: CMGJPGHLANB +message IrodoriFlowerData { + repeated ItemParam used_flower_list = 6; + repeated uint32 finished_theme_list = 5; +} diff --git a/proto/IrodoriMasterLevelDetailInfo.proto b/proto/IrodoriMasterLevelDetailInfo.proto new file mode 100644 index 00000000..8c68f7b7 --- /dev/null +++ b/proto/IrodoriMasterLevelDetailInfo.proto @@ -0,0 +1,28 @@ +// 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: ECNEMFHPDMN +message IrodoriMasterLevelDetailInfo { + uint32 min_finish_time = 9; + bool is_finish = 14; + bool is_have_try = 1; + uint32 BNMHJGCJAPB = 10; +} diff --git a/proto/IrodoriMasterLevelInfo.proto b/proto/IrodoriMasterLevelInfo.proto new file mode 100644 index 00000000..1acbffcc --- /dev/null +++ b/proto/IrodoriMasterLevelInfo.proto @@ -0,0 +1,27 @@ +// 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 "IrodoriMasterLevelDetailInfo.proto"; +// Obf: EMCIPFMAAHF +message IrodoriMasterLevelInfo { + repeated IrodoriMasterLevelDetailInfo detail_info = 3; + uint32 level_id = 14; +} diff --git a/proto/IrodoriPoetryData.proto b/proto/IrodoriPoetryData.proto new file mode 100644 index 00000000..7ec11916 --- /dev/null +++ b/proto/IrodoriPoetryData.proto @@ -0,0 +1,27 @@ +// 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 "IrodoriPoetryThemeData.proto"; +// Obf: NGOPLHAHODO +message IrodoriPoetryData { + uint32 cur_theme_id = 14; + repeated IrodoriPoetryThemeData theme_data_list = 3; +} diff --git a/proto/IrodoriPoetryThemeData.proto b/proto/IrodoriPoetryThemeData.proto new file mode 100644 index 00000000..e9f37801 --- /dev/null +++ b/proto/IrodoriPoetryThemeData.proto @@ -0,0 +1,31 @@ +// 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: DMGENCIFFLL +message IrodoriPoetryThemeData { + uint32 progress = 11; + uint32 MOFMBBIKDAN = 8; + uint32 MCMKKEIHOKO = 14; + uint32 EDGJDLHHJHC = 15; + uint32 CLJLOCICDLB = 3; + repeated uint32 HCACAKPBLND = 13; + repeated uint32 BKFJDAGCAIM = 9; +} diff --git a/proto/IslandPartyDetailInfo.proto b/proto/IslandPartyDetailInfo.proto new file mode 100644 index 00000000..f2765683 --- /dev/null +++ b/proto/IslandPartyDetailInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "IslandPartyStageData.proto"; +// Obf: KFNOMHOMJBL +message IslandPartyDetailInfo { + repeated IslandPartyStageData stage_data_list = 3; +} diff --git a/proto/IslandPartyStageData.proto b/proto/IslandPartyStageData.proto new file mode 100644 index 00000000..e099596c --- /dev/null +++ b/proto/IslandPartyStageData.proto @@ -0,0 +1,27 @@ +// 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: OIOHOFNIFMG +message IslandPartyStageData { + uint32 best_score = 5; + bool is_open = 2; + uint32 stage_id = 13; +} diff --git a/proto/Item.proto b/proto/Item.proto index 092a1ef5..d2f68eec 100644 --- a/proto/Item.proto +++ b/proto/Item.proto @@ -1,19 +1,34 @@ +// 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 "Material.proto"; import "Equip.proto"; import "Furniture.proto"; -import "Material.proto"; - -// Name: FKONGMBBBAN +// Obf: EBCKEILKJOG message Item { - uint32 item_id = 1; - uint64 guid = 2; - oneof detail { - Material material = 5; - Equip equip = 6; - Furniture furniture = 7; - } + uint32 item_id = 1; + uint64 guid = 2; + oneof detail { + Material material = 5; + Equip equip = 6; + Furniture furniture = 7; + } } - diff --git a/proto/ItemAddHintNotify.proto b/proto/ItemAddHintNotify.proto index 4fb626bb..ddd2beca 100644 --- a/proto/ItemAddHintNotify.proto +++ b/proto/ItemAddHintNotify.proto @@ -22,13 +22,14 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemHint.proto"; import "Vector.proto"; // CmdId: 655 +// Obf: FOCMGEBMEOH message ItemAddHintNotify { - bool DOKPNFNGLOK = 7; - bool PPHJOFNMMAJ = 5; + bool GCNFBOCLHPE = 7; + bool PJLFNPEEBNP = 5; repeated ItemHint overflow_transformed_item_list = 1; repeated ItemHint item_list = 13; uint32 quest_id = 15; Vector position = 8; - bool IBCJJEBBKJE = 9; + bool MMHKDGBFKAC = 9; uint32 reason = 4; } diff --git a/proto/ItemCdGroupTimeNotify.proto b/proto/ItemCdGroupTimeNotify.proto index 30a0d926..b7695680 100644 --- a/proto/ItemCdGroupTimeNotify.proto +++ b/proto/ItemCdGroupTimeNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 603 +// Obf: BCNAPIAJLOO message ItemCdGroupTimeNotify { map item_cd_map = 6; } diff --git a/proto/ItemExceedLimitMsgType.proto b/proto/ItemExceedLimitMsgType.proto deleted file mode 100644 index b805921d..00000000 --- a/proto/ItemExceedLimitMsgType.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - - -enum ItemExceedLimitMsgType { - ITEM_EXCEED_LIMIT_MSG_TYPE_DEFAULT = 0; - ITEM_EXCEED_LIMIT_MSG_TYPE_TEXT = 1; - ITEM_EXCEED_LIMIT_MSG_TYPE_DIALOG = 2; - ITEM_EXCEED_LIMIT_MSG_TYPE_DIALOG_NONBLOCK = 3; -} diff --git a/proto/ItemGivingReq.proto b/proto/ItemGivingReq.proto index d9bef6c0..4333eb16 100644 --- a/proto/ItemGivingReq.proto +++ b/proto/ItemGivingReq.proto @@ -21,10 +21,12 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; // CmdId: 197 +// Obf: DFPNDCEELAF message ItemGivingReq { + // Obf: MAEJHBECLNL enum ItemGivingType { - Quest = 0; - Gadget = 1; + QUEST = 0; + GADGET = 1; } map item_guid_count_map = 6; diff --git a/proto/ItemGivingRsp.proto b/proto/ItemGivingRsp.proto index e125e004..d48ece0c 100644 --- a/proto/ItemGivingRsp.proto +++ b/proto/ItemGivingRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 170 +// Obf: GFHBNIHMOOB message ItemGivingRsp { uint32 giving_group_id = 7; int32 retcode = 9; diff --git a/proto/ItemGivingType.proto b/proto/ItemGivingType.proto deleted file mode 100644 index 8284d59e..00000000 --- a/proto/ItemGivingType.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - - -enum ItemGivingType { - ITEM_GIVING_TYPE_NONE = 0; //?? - ITEM_GIVING_TYPE_GADGET = 1; -} diff --git a/proto/ItemHint.proto b/proto/ItemHint.proto index bb4c6dfb..5636dc26 100644 --- a/proto/ItemHint.proto +++ b/proto/ItemHint.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: GIFBLICPKMI message ItemHint { uint32 item_id = 5; uint32 count = 10; diff --git a/proto/ItemParam.proto b/proto/ItemParam.proto index 27897068..e2d539b3 100644 --- a/proto/ItemParam.proto +++ b/proto/ItemParam.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: JOLBKGJKDDN message ItemParam { uint32 item_id = 1; uint32 count = 2; diff --git a/proto/ItemRenameAvatarReq.proto b/proto/ItemRenameAvatarReq.proto index 688e17f9..79629e42 100644 --- a/proto/ItemRenameAvatarReq.proto +++ b/proto/ItemRenameAvatarReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1697 +// Obf: MKOBGFBIPJE message ItemRenameAvatarReq { uint32 rename_id = 11; string avatar_name = 4; diff --git a/proto/ItemRenameAvatarRsp.proto b/proto/ItemRenameAvatarRsp.proto index cfaec6e1..e05f2f86 100644 --- a/proto/ItemRenameAvatarRsp.proto +++ b/proto/ItemRenameAvatarRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1715 +// Obf: KHHAIONIOOK message ItemRenameAvatarRsp { uint32 cd_time = 7; int32 retcode = 9; diff --git a/proto/JIJHDFJFNJM.proto b/proto/JIJHDFJFNJM.proto new file mode 100644 index 00000000..0a4333df --- /dev/null +++ b/proto/JIJHDFJFNJM.proto @@ -0,0 +1,27 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +message JIJHDFJFNJM { + uint32 level_id = 9; + bool is_open = 14; + bool is_finish = 1; + uint32 BGLFHHAEEBK = 8; +} diff --git a/proto/JJFAPPOGLLE.proto b/proto/JJFAPPOGLLE.proto new file mode 100644 index 00000000..0e0f7582 --- /dev/null +++ b/proto/JJFAPPOGLLE.proto @@ -0,0 +1,25 @@ +// 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 "JIJHDFJFNJM.proto"; +message JJFAPPOGLLE { + repeated JIJHDFJFNJM level_info_list = 7; +} diff --git a/proto/JNNKDCBMHMP.proto b/proto/JNNKDCBMHMP.proto new file mode 100644 index 00000000..fa09aa0e --- /dev/null +++ b/proto/JNNKDCBMHMP.proto @@ -0,0 +1,27 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +message JNNKDCBMHMP { + bool is_open = 12; + uint32 level_id = 7; + uint32 min_finish_time = 10; + uint32 JOCCKLGBFKP = 13; +} diff --git a/proto/JigsawPictureData.proto b/proto/JigsawPictureData.proto new file mode 100644 index 00000000..506444d2 --- /dev/null +++ b/proto/JigsawPictureData.proto @@ -0,0 +1,28 @@ +// 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: MPBCMDGDHHA +message JigsawPictureData { + bool is_open = 8; + uint32 HKLBAPAMEOK = 14; + uint32 APNDNCIJLKB = 15; + bool is_finished = 1; +} diff --git a/proto/MFJNHGLKNGA.proto b/proto/LENNDLOGFIM.proto similarity index 94% rename from proto/MFJNHGLKNGA.proto rename to proto/LENNDLOGFIM.proto index 74ad8fdc..cc1f3002 100644 --- a/proto/MFJNHGLKNGA.proto +++ b/proto/LENNDLOGFIM.proto @@ -19,6 +19,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -message MFJNHGLKNGA { - uint32 OHEOAOJGLMN = 1; +message LENNDLOGFIM { + uint32 AOMEFIFECFK = 1; } diff --git a/proto/LFDOHAHCGAN.proto b/proto/LFDOHAHCGAN.proto new file mode 100644 index 00000000..c8a51f5f --- /dev/null +++ b/proto/LFDOHAHCGAN.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "IKKIFILAFFM.proto"; +message LFDOHAHCGAN { + bool OPMAAOEHBPB = 2; + repeated IKKIFILAFFM level_data_list = 13; +} diff --git a/proto/LanternProjectionInfo.proto b/proto/LanternProjectionInfo.proto index 078524e3..7d75145a 100644 --- a/proto/LanternProjectionInfo.proto +++ b/proto/LanternProjectionInfo.proto @@ -1,15 +1,30 @@ +// 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 "ClientInputType.proto"; + import "LanternProjectionLevelInfo.proto"; - -// Name: FICLFAMINEH +import "ClientInputType.proto"; +// Obf: PCNDNIOHPPA message LanternProjectionInfo { - repeated ClientInputType OFBHBGHNMKN = 9; - repeated ClientInputType KDDNLOBMNFD = 12; - repeated uint32 open_stage_list = 14; - repeated LanternProjectionLevelInfo level_list = 1; + repeated LanternProjectionLevelInfo level_list = 6; + repeated ClientInputType PPBJGJCPALO = 12; + repeated uint32 open_stage_list = 15; + repeated ClientInputType PGIIONPLNPJ = 10; } - diff --git a/proto/LanternProjectionLevelInfo.proto b/proto/LanternProjectionLevelInfo.proto index 6929a71e..39af3044 100644 --- a/proto/LanternProjectionLevelInfo.proto +++ b/proto/LanternProjectionLevelInfo.proto @@ -1,14 +1,29 @@ +// 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"; -// Name: CGOBFABMIJI +// Obf: FCGKNGEPNDI message LanternProjectionLevelInfo { - uint32 id = 5; - bool is_finished = 1; - bool is_show_tips = 15; - uint32 min_finish_time = 8; - bool is_can_start = 6; + bool BHFCMBEMGIN = 2; + uint32 id = 1; + bool is_finished = 13; + bool OEBMEKDJDIO = 5; + uint32 min_finish_time = 10; } - diff --git a/proto/LanternRiteActivityDetailInfo.proto b/proto/LanternRiteActivityDetailInfo.proto new file mode 100644 index 00000000..86e84850 --- /dev/null +++ b/proto/LanternRiteActivityDetailInfo.proto @@ -0,0 +1,33 @@ +// 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 "LanternRiteFireworksInfo.proto"; +import "LanternProjectionInfo.proto"; +import "SalvageStageInfo.proto"; +// Obf: JJKBLBCBCEH +message LanternRiteActivityDetailInfo { + LanternRiteFireworksInfo fireworks_info = 15; + bool HHHOIKIBHOA = 11; + LanternProjectionInfo projection_info = 7; + bool NGDCCCDNHHE = 5; + bool is_content_closed = 12; + repeated SalvageStageInfo stage_info_list = 4; +} diff --git a/proto/LanternRiteActivityInfo.proto b/proto/LanternRiteActivityInfo.proto deleted file mode 100644 index a8462279..00000000 --- a/proto/LanternRiteActivityInfo.proto +++ /dev/null @@ -1,18 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - - -import "LanternRiteFireworksInfo.proto"; -import "LanternProjectionInfo.proto"; -import "SalvageStageInfo.proto"; - -message LanternRiteActivityInfo { - LanternRiteFireworksInfo fireworksInfo = 6; - LanternProjectionInfo projectionInfo = 11; - bool leftMonsters = 9; - bool Unk3300_PDFJNCDGKGH = 3; - repeated SalvageStageInfo stageInfoList = 1; - bool Unk3300_DKBJLCIMBAL = 7; -} diff --git a/proto/LanternRiteFireworksChallengeInfo.proto b/proto/LanternRiteFireworksChallengeInfo.proto index b36a427b..86d545c9 100644 --- a/proto/LanternRiteFireworksChallengeInfo.proto +++ b/proto/LanternRiteFireworksChallengeInfo.proto @@ -1,12 +1,27 @@ +// 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"; -// Name: PHALMEICHMB +// Obf: EEMHANAPHOB message LanternRiteFireworksChallengeInfo { - uint32 challenge_id = 5; - uint32 best_score = 14; - bool is_full_score = 13; + bool is_full_score = 6; + uint32 best_score = 9; + uint32 challenge_id = 2; } - diff --git a/proto/LanternRiteFireworksInfo.proto b/proto/LanternRiteFireworksInfo.proto index b83a491c..c1858120 100644 --- a/proto/LanternRiteFireworksInfo.proto +++ b/proto/LanternRiteFireworksInfo.proto @@ -1,11 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "LanternRiteFireworksStageInfo.proto"; - -// Name: CKGPIIMDNMJ +// Obf: DCFHHMDCJEJ message LanternRiteFireworksInfo { - repeated LanternRiteFireworksStageInfo stage_info_list = 11; + repeated LanternRiteFireworksStageInfo stage_info_list = 11; } - diff --git a/proto/LanternRiteFireworksStageInfo.proto b/proto/LanternRiteFireworksStageInfo.proto index e94c5ce5..c9c5a43c 100644 --- a/proto/LanternRiteFireworksStageInfo.proto +++ b/proto/LanternRiteFireworksStageInfo.proto @@ -1,13 +1,28 @@ +// 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 "LanternRiteFireworksChallengeInfo.proto"; - -// Name: AHGKMMHDLNC +// Obf: BMHAFKDMMME message LanternRiteFireworksStageInfo { - repeated LanternRiteFireworksChallengeInfo challenge_info_list = 3; - uint32 stage_id = 5; - bool is_open = 7; + bool is_open = 11; + uint32 stage_id = 9; + repeated LanternRiteFireworksChallengeInfo challenge_info_list = 13; } - diff --git a/proto/LevelupCityReq.proto b/proto/LevelupCityReq.proto index fa55e76a..f3e4935d 100644 --- a/proto/LevelupCityReq.proto +++ b/proto/LevelupCityReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 274 +// Obf: BNHEFCDPKAM message LevelupCityReq { uint32 item_num = 12; uint32 scene_id = 4; diff --git a/proto/LifeStateChangeNotify.proto b/proto/LifeStateChangeNotify.proto index 4373ec5b..0792d007 100644 --- a/proto/LifeStateChangeNotify.proto +++ b/proto/LifeStateChangeNotify.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "PlayerDieType.proto"; import "ServerBuff.proto"; // CmdId: 1296 +// Obf: HPNGCLIJJKP message LifeStateChangeNotify { uint32 life_state = 3; PlayerDieType die_type = 12; diff --git a/proto/LockedPersonallineData.proto b/proto/LockedPersonallineData.proto index bfb7d16b..12fe60e5 100644 --- a/proto/LockedPersonallineData.proto +++ b/proto/LockedPersonallineData.proto @@ -19,10 +19,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: LPPGEMGIIIC message LockedPersonallineData { - enum LockReason { - Level = 0; - Quest = 1; + enum JEMKDFPLHKI { + JEMKDFPLHKI_Level = 0; + JEMKDFPLHKI_Quest = 1; } message MKKLIJOGAKA { @@ -30,11 +31,11 @@ message LockedPersonallineData { uint32 chapter_id = 3; } - LockReason lock_reason = 13; + JEMKDFPLHKI lock_reason = 13; uint32 personal_line_id = 14; - oneof MNHOBCJCBKK { - uint32 LOKAHBIPGED = 6; - uint32 PFONMIFJKNB = 7; + oneof param { + uint32 chapter_id = 6; + uint32 level = 7; MKKLIJOGAKA LIDHDAOKHIH = 1; } } diff --git a/proto/CKIBKCAKBNI.proto b/proto/LuminanceStoneChallengeActivityDetailInfo.proto similarity index 81% rename from proto/CKIBKCAKBNI.proto rename to proto/LuminanceStoneChallengeActivityDetailInfo.proto index 02f2e440..fdaaf032 100644 --- a/proto/CKIBKCAKBNI.proto +++ b/proto/LuminanceStoneChallengeActivityDetailInfo.proto @@ -19,12 +19,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -message CKIBKCAKBNI { - string product_id = 1; - string price_tier = 2; - uint32 LPMAKOEFNOC = 3; - uint32 HADCKCBAJKO = 4; - uint32 begin_time = 5; - uint32 end_time = 6; - uint32 OPONLNLPMCE = 7; +// Obf: BCDOENHEMIL +message LuminanceStoneChallengeActivityDetailInfo { + uint32 current_stage_id = 2; + uint32 best_score = 1; + bool is_final_gallery_complete = 9; + bool is_content_closed = 13; } diff --git a/proto/LunaRiteAreaInfo.proto b/proto/LunaRiteAreaInfo.proto new file mode 100644 index 00000000..00267991 --- /dev/null +++ b/proto/LunaRiteAreaInfo.proto @@ -0,0 +1,30 @@ +// 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 "LunaRiteHintStatusType.proto"; +// Obf: KIKAFOBMLKD +message LunaRiteAreaInfo { + repeated uint32 sacrifice_list = 12; + uint32 area_id = 3; + uint32 challenge_index = 6; + repeated uint32 sacrifice_reward_list = 13; + LunaRiteHintStatusType hint_status = 8; +} diff --git a/proto/LunaRiteDetailInfo.proto b/proto/LunaRiteDetailInfo.proto new file mode 100644 index 00000000..02b9b9a0 --- /dev/null +++ b/proto/LunaRiteDetailInfo.proto @@ -0,0 +1,28 @@ +// 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 "LunaRiteAreaInfo.proto"; +import "LunaRiteHintPoint.proto"; +// Obf: HICKPBHAGFM +message LunaRiteDetailInfo { + repeated LunaRiteAreaInfo area_info_list = 9; + repeated LunaRiteHintPoint hint_point = 11; +} diff --git a/proto/LPLOENMNIOC.proto b/proto/LunaRiteHintPoint.proto similarity index 81% rename from proto/LPLOENMNIOC.proto rename to proto/LunaRiteHintPoint.proto index 61c98f82..ca6a3057 100644 --- a/proto/LPLOENMNIOC.proto +++ b/proto/LunaRiteHintPoint.proto @@ -20,12 +20,11 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; -message LPLOENMNIOC { - uint32 config_id = 11; - bool NOMBNOKOKMN = 9; - uint32 group_id = 10; - bool is_hint_valid = 4; - Vector hint_center_pos = 3; - uint32 MELJODAFPCD = 8; - uint32 material_id = 13; +import "LunaRiteHintPointType.proto"; +// Obf: EOGOMPLBCGB +message LunaRiteHintPoint { + uint32 area_id = 1; + Vector pos = 15; + LunaRiteHintPointType type = 14; + uint32 index = 10; } diff --git a/proto/LunaRiteHintPointType.proto b/proto/LunaRiteHintPointType.proto new file mode 100644 index 00000000..caa632f8 --- /dev/null +++ b/proto/LunaRiteHintPointType.proto @@ -0,0 +1,27 @@ +// 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: CHIOFLNBPOE +enum LunaRiteHintPointType { + LUNA_RITE_HINT_TYPE_NONE = 0; + LUNA_RITE_HINT_TYPE_RUNE = 1; + LUNA_RITE_HINT_TYPE_CHEST = 2; +} diff --git a/proto/LunaRiteHintStatusType.proto b/proto/LunaRiteHintStatusType.proto index b93aa25c..12dcdd7c 100644 --- a/proto/LunaRiteHintStatusType.proto +++ b/proto/LunaRiteHintStatusType.proto @@ -19,8 +19,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: GELHLMJFAGP enum LunaRiteHintStatusType { - LunaRiteHintStatusType_LunaRiteHintStatusDefault = 0; - LunaRiteHintStatusType_LunaRiteHintStatusNoCount = 1; - LunaRiteHintStatusType_LunaRiteHintStatusFinish = 2; + LUNA_RITE_HINT_STATUS_DEFAULT = 0; + LUNA_RITE_HINT_STATUS_NO_COUNT = 1; + LUNA_RITE_HINT_STATUS_FINISH = 2; } diff --git a/proto/LunchBoxData.proto b/proto/LunchBoxData.proto index 4fca7892..6910be18 100644 --- a/proto/LunchBoxData.proto +++ b/proto/LunchBoxData.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: NMPOJEDAAMJ message LunchBoxData { map slot_material_map = 8; } diff --git a/proto/MLMOJDGCFBN.proto b/proto/MLMOJDGCFBN.proto new file mode 100644 index 00000000..cee752fb --- /dev/null +++ b/proto/MLMOJDGCFBN.proto @@ -0,0 +1,25 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +message MLMOJDGCFBN { + uint32 stage_id = 8; + bool is_open = 4; +} diff --git a/proto/MPCBEPPJBHA.proto b/proto/MPCBEPPJBHA.proto new file mode 100644 index 00000000..21bb7c53 --- /dev/null +++ b/proto/MPCBEPPJBHA.proto @@ -0,0 +1,31 @@ +// 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 "IADHPCJGOHN.proto"; +import "EMIEAKAMEGC.proto"; +import "DGDDOPJOOIH.proto"; +import "DMFPJALOPBI.proto"; +message MPCBEPPJBHA { + IADHPCJGOHN LHPBOAAGGOL = 13; + EMIEAKAMEGC COCFNMBBIME = 11; + DGDDOPJOOIH HBBKLIDFIME = 10; + DMFPJALOPBI MMGMFFIPACO = 8; +} diff --git a/proto/MPLevelEntityInfo.proto b/proto/MPLevelEntityInfo.proto index 649e7233..65c292db 100644 --- a/proto/MPLevelEntityInfo.proto +++ b/proto/MPLevelEntityInfo.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AbilitySyncStateInfo.proto"; +// Obf: DBEDDNAPIOA message MPLevelEntityInfo { AbilitySyncStateInfo ability_info = 11; uint32 entity_id = 14; diff --git a/proto/MailChangeNotify.proto b/proto/MailChangeNotify.proto index 91e2687f..6d318437 100644 --- a/proto/MailChangeNotify.proto +++ b/proto/MailChangeNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "MailData.proto"; // CmdId: 1496 +// Obf: HGHEBLMKNHD message MailChangeNotify { repeated uint32 del_mail_id_list = 10; repeated MailData mail_list = 1; diff --git a/proto/MailCollectState.proto b/proto/MailCollectState.proto index 22452fe8..90871870 100644 --- a/proto/MailCollectState.proto +++ b/proto/MailCollectState.proto @@ -1,13 +1,28 @@ +// 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"; -// Name: COONHFJFEHG +// Obf: DPIHCPLMCID enum MailCollectState { - MAIL_COLLECT_STATE_COLLECTIBLE_UNKNOWN = 0; - MAIL_COLLECT_STATE_NOT_COLLECTIBLE = 1; - MAIL_COLLECT_STATE_COLLECTIBLE_UNCOLLECTED = 2; - MAIL_COLLECT_STATE_COLLECTIBLE_COLLECTED = 3; + MAIL_COLLECT_STATE_COLLECTIBLE_UNKNOWN = 0; + MAIL_COLLECT_STATE_NOT_COLLECTIBLE = 1; + MAIL_COLLECT_STATE_COLLECTIBLE_UNCOLLECTED = 2; + MAIL_COLLECT_STATE_COLLECTIBLE_COLLECTED = 3; } - diff --git a/proto/MailData.proto b/proto/MailData.proto index f5eb0f01..8d1bdf10 100644 --- a/proto/MailData.proto +++ b/proto/MailData.proto @@ -22,8 +22,9 @@ option java_package = "emu.grasscutter.net.proto"; import "MailTextContent.proto"; import "MailItem.proto"; import "MailCollectState.proto"; +// Obf: OAGKLHBIAAF message MailData { - uint32 mail_id = 1; + uint32 mailId = 1; MailTextContent mail_text_content = 4; repeated MailItem item_list = 7; uint32 send_time = 8; diff --git a/proto/MailItem.proto b/proto/MailItem.proto index 76df8465..84105d74 100644 --- a/proto/MailItem.proto +++ b/proto/MailItem.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "EquipParam.proto"; import "MaterialDeleteInfo.proto"; +// Obf: MBAJGGFCGGC message MailItem { EquipParam equip_param = 1; MaterialDeleteInfo delete_info = 2; diff --git a/proto/MailTextContent.proto b/proto/MailTextContent.proto index 1f833f2d..9e94d965 100644 --- a/proto/MailTextContent.proto +++ b/proto/MailTextContent.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: CPIHMMKKOIG message MailTextContent { string title = 1; string content = 2; diff --git a/proto/MapAreaInfo.proto b/proto/MapAreaInfo.proto index 403052f3..0b189016 100644 --- a/proto/MapAreaInfo.proto +++ b/proto/MapAreaInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: FBNGIOBADBH message MapAreaInfo { uint32 map_area_id = 1; bool is_open = 2; diff --git a/proto/MapMarkFromType.proto b/proto/MapMarkFromType.proto index 1c666e9f..684c2c20 100644 --- a/proto/MapMarkFromType.proto +++ b/proto/MapMarkFromType.proto @@ -1,12 +1,27 @@ +// 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"; -// Name: ICFEJHJADHJ +// Obf: PNMEOLJPFCC enum MapMarkFromType { - MAP_MARK_FROM_TYPE_NONE = 0; - MAP_MARK_FROM_TYPE_MONSTER = 1; - MAP_MARK_FROM_TYPE_QUEST = 2; + MAP_MARK_FROM_TYPE_NONE = 0; + MAP_MARK_FROM_TYPE_MONSTER = 1; + MAP_MARK_FROM_TYPE_QUEST = 2; } - diff --git a/proto/MapMarkPoint.proto b/proto/MapMarkPoint.proto index 4eda64fa..9dadbdef 100644 --- a/proto/MapMarkPoint.proto +++ b/proto/MapMarkPoint.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; import "MapMarkPointType.proto"; import "MapMarkFromType.proto"; +// Obf: GOBPDEPLBLM message MapMarkPoint { uint32 scene_id = 1; string name = 2; diff --git a/proto/MapMarkPointType.proto b/proto/MapMarkPointType.proto index 6b568ee9..a038cd22 100644 --- a/proto/MapMarkPointType.proto +++ b/proto/MapMarkPointType.proto @@ -1,16 +1,31 @@ +// 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"; -// Name: IPLKIIFIDJK +// Obf: DBNNAIEGABK enum MapMarkPointType { - MAP_MARK_POINT_TYPE_NPC = 0; - MAP_MARK_POINT_TYPE_QUEST = 1; - MAP_MARK_POINT_TYPE_SPECIAL = 2; - MAP_MARK_POINT_TYPE_MINE = 3; - MAP_MARK_POINT_TYPE_COLLECTION = 4; - MAP_MARK_POINT_TYPE_MONSTER = 5; - MAP_MARK_POINT_TYPE_FISH_POOL = 6; + MAP_MARK_POINT_TYPE_NPC = 0; + MAP_MARK_POINT_TYPE_QUEST = 1; + MAP_MARK_POINT_TYPE_SPECIAL = 2; + MAP_MARK_POINT_TYPE_MINE = 3; + MAP_MARK_POINT_TYPE_COLLECTION = 4; + MAP_MARK_POINT_TYPE_MONSTER = 5; + MAP_MARK_POINT_TYPE_FISH_POOL = 6; } - diff --git a/proto/MarkMapReq.proto b/proto/MarkMapReq.proto index a6e23d77..c4b9bd15 100644 --- a/proto/MarkMapReq.proto +++ b/proto/MarkMapReq.proto @@ -21,12 +21,14 @@ option java_package = "emu.grasscutter.net.proto"; import "MapMarkPoint.proto"; // CmdId: 3389 +// Obf: MFHPKHNAIBA message MarkMapReq { + // Obf: PLJOBIBHMNF enum Operation { OPERATION_ADD = 0; - OPERATION_MOD = 1; - OPERATION_DEL = 2; - OPERATION_GET = 3; + OPERATION_MOD = 1; + OPERATION_DEL = 2; + OPERATION_GET = 3; } MapMarkPoint old = 5; diff --git a/proto/MarkMapRsp.proto b/proto/MarkMapRsp.proto index fe306937..256147b8 100644 --- a/proto/MarkMapRsp.proto +++ b/proto/MarkMapRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "MapMarkPoint.proto"; // CmdId: 3239 +// Obf: CHEHBLCPPJH message MarkMapRsp { repeated MapMarkPoint mark_list = 12; int32 retcode = 3; diff --git a/proto/MarkNewNotify.proto b/proto/MarkNewNotify.proto index 5fec27c2..023541bb 100644 --- a/proto/MarkNewNotify.proto +++ b/proto/MarkNewNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1264 +// Obf: HKDODIFHHNI message MarkNewNotify { repeated uint32 id_list = 11; uint32 mark_new_type = 14; diff --git a/proto/MarkTargetInvestigationMonsterNotify.proto b/proto/MarkTargetInvestigationMonsterNotify.proto index 4cda33bc..935d5539 100644 --- a/proto/MarkTargetInvestigationMonsterNotify.proto +++ b/proto/MarkTargetInvestigationMonsterNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1912 +// Obf: FJBCDLIHGKJ message MarkTargetInvestigationMonsterNotify { uint32 monster_id = 3; uint32 group_id = 7; diff --git a/proto/MassivePropParam.proto b/proto/MassivePropParam.proto index f9446c30..f78af3ea 100644 --- a/proto/MassivePropParam.proto +++ b/proto/MassivePropParam.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: EEBMHDBBEEH message MassivePropParam { int32 type = 1; repeated uint32 reaction_info_list = 2; diff --git a/proto/MassivePropSyncInfo.proto b/proto/MassivePropSyncInfo.proto index 63ebcbfa..c13eb1ab 100644 --- a/proto/MassivePropSyncInfo.proto +++ b/proto/MassivePropSyncInfo.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "MassivePropParam.proto"; +// Obf: HNDJPPEKOPF message MassivePropSyncInfo { int64 id = 1; repeated MassivePropParam prop_list = 2; diff --git a/proto/Material.proto b/proto/Material.proto index 67969e43..5d166681 100644 --- a/proto/Material.proto +++ b/proto/Material.proto @@ -1,12 +1,27 @@ +// 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 "MaterialDeleteInfo.proto"; - -// Name: GPJLHPAJOKK +// Obf: KOKDLGLHBDK message Material { - uint32 count = 1; - MaterialDeleteInfo delete_info = 2; + uint32 count = 1; + MaterialDeleteInfo delete_info = 2; } - diff --git a/proto/MaterialDeleteInfo.proto b/proto/MaterialDeleteInfo.proto index 1f0c588b..d2328e49 100644 --- a/proto/MaterialDeleteInfo.proto +++ b/proto/MaterialDeleteInfo.proto @@ -19,26 +19,30 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: LDGCGEKOPNP message MaterialDeleteInfo { - message CGLLDOGBCHF { + // Obf: CGLLDOGBCHF + message CountDownDelete { map delete_time_num_map = 1; uint32 config_count_down_time = 2; } - message AGGPDECMMIG { - uint32 delete_time_num_map = 1; + // Obf: AGGPDECMMIG + message DateTimeDelete { + uint32 delete_time = 1; } - message GIAAHILNMBN { + // Obf: GIAAHILNMBN + message DelayWeekCountDownDelete { map delete_time_num_map = 1; - uint32 PBIKNJFLBCC = 2; + uint32 config_delay_week = 2; uint32 config_count_down_time = 3; } bool has_delete_config = 1; - oneof KOHLDAAGPPE { - CGLLDOGBCHF DFBKEFLEBID = 2; - AGGPDECMMIG JKGPFIDBGDP = 3; - GIAAHILNMBN JKNOEFNBAAG = 4; + oneof delete_info { + CountDownDelete count_down_delete = 2; + DateTimeDelete date_delete = 3; + DelayWeekCountDownDelete delay_week_count_down_delete = 4; } } diff --git a/proto/MaterialDeleteReturnNotify.proto b/proto/MaterialDeleteReturnNotify.proto index 4c33601e..ee05040c 100644 --- a/proto/MaterialDeleteReturnNotify.proto +++ b/proto/MaterialDeleteReturnNotify.proto @@ -21,8 +21,9 @@ option java_package = "emu.grasscutter.net.proto"; import "MaterialDeleteReturnType.proto"; // CmdId: 623 +// Obf: JKLIILONGOM message MaterialDeleteReturnNotify { - map KGPKJGDFDGH = 4; + map GMKEMPBHDOA = 4; MaterialDeleteReturnType type = 6; - map NKNIMCDIDEB = 10; + map CMLDFHFNPHG = 10; } diff --git a/proto/MaterialDeleteReturnType.proto b/proto/MaterialDeleteReturnType.proto index b9066847..80840734 100644 --- a/proto/MaterialDeleteReturnType.proto +++ b/proto/MaterialDeleteReturnType.proto @@ -19,7 +19,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: EACMIGMMBCA enum MaterialDeleteReturnType { - MaterialDeleteReturnType_MaterialDeleteReturnBag = 0; - MaterialDeleteReturnType_MaterialDeleteReturnSeed = 1; + MATERIAL_DELETE_RETURN_BAG = 0; + MATERIAL_DELETE_RETURN_SEED = 1; } diff --git a/proto/MaterialDeleteUpdateNotify.proto b/proto/MaterialDeleteUpdateNotify.proto index 7c6631bd..18b46c6e 100644 --- a/proto/MaterialDeleteUpdateNotify.proto +++ b/proto/MaterialDeleteUpdateNotify.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 609 +// Obf: GIOKMCHNNHM message MaterialDeleteUpdateNotify { } diff --git a/proto/MaterialInfo.proto b/proto/MaterialInfo.proto index 4ee1ede9..a06f065f 100644 --- a/proto/MaterialInfo.proto +++ b/proto/MaterialInfo.proto @@ -1,9 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Name: KBJIEJFLEPA + +// Obf: CEIJNOGDKID message MaterialInfo { - uint32 count = 3; - uint64 guid = 14; + uint32 count = 13; + uint64 guid = 2; } diff --git a/proto/MathQuaternion.proto b/proto/MathQuaternion.proto index df2debbb..fa01747a 100644 --- a/proto/MathQuaternion.proto +++ b/proto/MathQuaternion.proto @@ -1,13 +1,28 @@ +// 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"; -// Name: HGDBFKLPLMK +// Obf: DAKBAOLCLCB message MathQuaternion { - float x = 1; - float y = 2; - float z = 3; - float w = 4; + float x = 1; + float y = 2; + float z = 3; + float w = 4; } - diff --git a/proto/McoinExchangeHcoinReq.proto b/proto/McoinExchangeHcoinReq.proto index 47aa2c2b..7de75ef2 100644 --- a/proto/McoinExchangeHcoinReq.proto +++ b/proto/McoinExchangeHcoinReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 674 +// Obf: DIBDGGGENIF message McoinExchangeHcoinReq { uint32 mcoin_cost = 15; uint32 hcoin = 13; diff --git a/proto/McoinExchangeHcoinRsp.proto b/proto/McoinExchangeHcoinRsp.proto index f4eedd38..c8ee8117 100644 --- a/proto/McoinExchangeHcoinRsp.proto +++ b/proto/McoinExchangeHcoinRsp.proto @@ -20,8 +20,9 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 617 +// Obf: KFGCMIDKGMC message McoinExchangeHcoinRsp { - uint32 BGNKMEAPJFF = 1; - uint32 JBIAMGLMFKE = 5; + uint32 hcoin = 1; + uint32 mcoin_cost = 5; int32 retcode = 11; } diff --git a/proto/MichiaeMatsuriActivityDetailInfo.proto b/proto/MichiaeMatsuriActivityDetailInfo.proto new file mode 100644 index 00000000..12b97406 --- /dev/null +++ b/proto/MichiaeMatsuriActivityDetailInfo.proto @@ -0,0 +1,32 @@ +// 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 "MichiaeMatsuriChestPositionInfo.proto"; +import "MichiaeMatsuriChallengePositionInfo.proto"; +import "MichiaeMatsuriStage.proto"; +// Obf: EJAINFBCALP +message MichiaeMatsuriActivityDetailInfo { + repeated MichiaeMatsuriChestPositionInfo chest_pos_list = 11; + repeated uint32 unlocked_crystal_skill_list = 6; + uint32 gain_crystal_exp = 9; + repeated MichiaeMatsuriChallengePositionInfo challenge_pos_list = 7; + repeated MichiaeMatsuriStage stage_list = 15; +} diff --git a/proto/MichiaeMatsuriChallengePositionInfo.proto b/proto/MichiaeMatsuriChallengePositionInfo.proto new file mode 100644 index 00000000..ae6f0ab0 --- /dev/null +++ b/proto/MichiaeMatsuriChallengePositionInfo.proto @@ -0,0 +1,28 @@ +// 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: FKOFDCNFGIN +message MichiaeMatsuriChallengePositionInfo { + uint32 group_id = 11; + Vector pos = 3; + uint32 gadget_id = 12; +} diff --git a/proto/MichiaeMatsuriChestPositionInfo.proto b/proto/MichiaeMatsuriChestPositionInfo.proto new file mode 100644 index 00000000..3c037457 --- /dev/null +++ b/proto/MichiaeMatsuriChestPositionInfo.proto @@ -0,0 +1,28 @@ +// 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: NGFDAJNNCKL +message MichiaeMatsuriChestPositionInfo { + uint32 group_id = 2; + Vector pos = 11; + uint32 config_id = 5; +} diff --git a/proto/CFFGCLHLGPN.proto b/proto/MichiaeMatsuriStage.proto similarity index 87% rename from proto/CFFGCLHLGPN.proto rename to proto/MichiaeMatsuriStage.proto index 79aebed7..d9449fa9 100644 --- a/proto/CFFGCLHLGPN.proto +++ b/proto/MichiaeMatsuriStage.proto @@ -19,8 +19,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "EANCFIOAJDF.proto"; -message CFFGCLHLGPN { - repeated EANCFIOAJDF FOIDOJEOALO = 3; - uint32 EFIHBBCCCKH = 14; +// Obf: JHKDEDKDIJH +message MichiaeMatsuriStage { + bool is_open = 3; + uint32 stage_id = 9; + uint32 open_time = 13; } diff --git a/proto/MiracleRingDeliverItemReq.proto b/proto/MiracleRingDeliverItemReq.proto index 5dc97c78..f148f4f2 100644 --- a/proto/MiracleRingDeliverItemReq.proto +++ b/proto/MiracleRingDeliverItemReq.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; import "InterOpType.proto"; // CmdId: 5225 +// Obf: BNJDIEFADNA message MiracleRingDeliverItemReq { uint32 gadget_id = 11; uint32 gadget_entity_id = 4; diff --git a/proto/MiracleRingDeliverItemRsp.proto b/proto/MiracleRingDeliverItemRsp.proto index 452093e7..ce5ad361 100644 --- a/proto/MiracleRingDeliverItemRsp.proto +++ b/proto/MiracleRingDeliverItemRsp.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "InterOpType.proto"; import "InteractType.proto"; // CmdId: 5207 +// Obf: OPJAAKOAPKD message MiracleRingDeliverItemRsp { int32 retcode = 2; InterOpType op_type = 6; diff --git a/proto/MistTrialActivityDetailInfo.proto b/proto/MistTrialActivityDetailInfo.proto new file mode 100644 index 00000000..90a742df --- /dev/null +++ b/proto/MistTrialActivityDetailInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "MistTrialLevelData.proto"; +// Obf: GAMAHBMCHGE +message MistTrialActivityDetailInfo { + repeated MistTrialLevelData trial_level_data_list = 4; +} diff --git a/proto/MistTrialActivityInfo.proto b/proto/MistTrialActivityInfo.proto deleted file mode 100644 index 36ae4abe..00000000 --- a/proto/MistTrialActivityInfo.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - - -import "MistTrialLevelData.proto"; - -message MistTrialActivityInfo { - repeated MistTrialLevelData trialLevelDataList = 7; -} diff --git a/proto/MistTrialBestAvatar.proto b/proto/MistTrialBestAvatar.proto index 36184049..d9349e05 100644 --- a/proto/MistTrialBestAvatar.proto +++ b/proto/MistTrialBestAvatar.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AvatarType.proto"; +// Obf: EAJAANLKGMM message MistTrialBestAvatar { AvatarType avatar_type = 5; uint32 costume_id = 11; diff --git a/proto/MistTrialLevelData.proto b/proto/MistTrialLevelData.proto index 8f0ea732..7c312365 100644 --- a/proto/MistTrialLevelData.proto +++ b/proto/MistTrialLevelData.proto @@ -1,16 +1,31 @@ +// 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 "MistTrialBestAvatar.proto"; - -// Name: MNHBJMJPKAP +// Obf: IIDDKHKAAON message MistTrialLevelData { - repeated MistTrialBestAvatar best_avatar_list = 12; - uint32 first_pass_time = 9; - bool is_open = 10; - MistTrialBestAvatar best_hit_avatar = 14; - uint32 level_id = 15; - uint32 open_time = 8; + uint32 first_pass_time = 4; + uint32 open_time = 11; + bool is_open = 9; + repeated MistTrialBestAvatar best_avatar_list = 6; + MistTrialBestAvatar best_hit_avatar = 8; + uint32 level_id = 13; } - diff --git a/proto/ModifierAction.proto b/proto/ModifierAction.proto index 5ac8d911..6d9308ea 100644 --- a/proto/ModifierAction.proto +++ b/proto/ModifierAction.proto @@ -1,11 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Name: HPODJPJFNAC +// Obf: KKFENCAJMAP enum ModifierAction { - MODIFIER_ACTION_ADDED = 0; - MODIFIER_ACTION_REMOVED = 1; + MODIFIER_ACTION_ADDED = 0; + MODIFIER_ACTION_REMOVED = 1; } - diff --git a/proto/ModifierDurability.proto b/proto/ModifierDurability.proto index 45f09964..271e287b 100644 --- a/proto/ModifierDurability.proto +++ b/proto/ModifierDurability.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: NHMMAJIGHNF message ModifierDurability { float reduce_ratio = 1; float remaining_durability = 2; diff --git a/proto/ModifierProperty.proto b/proto/ModifierProperty.proto index 2926541b..8801b9e5 100644 --- a/proto/ModifierProperty.proto +++ b/proto/ModifierProperty.proto @@ -1,12 +1,27 @@ +// 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 "AbilityString.proto"; - -// Name: MHKLKDOLLLF +// Obf: HDNMEHLEAGE message ModifierProperty { - AbilityString key = 12; - float value = 14; + float value = 4; + AbilityString key = 12; } - diff --git a/proto/MonsterAIConfigHashNotify.proto b/proto/MonsterAIConfigHashNotify.proto index 0c62b8f9..205e2056 100644 --- a/proto/MonsterAIConfigHashNotify.proto +++ b/proto/MonsterAIConfigHashNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 3141 +// Obf: ODGHGCAKPHI message MonsterAIConfigHashNotify { uint32 job_id = 1; uint32 entity_id = 9; diff --git a/proto/MonsterBornType.proto b/proto/MonsterBornType.proto index 989ce6d0..af3cdeb2 100644 --- a/proto/MonsterBornType.proto +++ b/proto/MonsterBornType.proto @@ -1,12 +1,27 @@ +// 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"; -// Name: PKKAPIFAEHB +// Obf: CNKCBENCCOC enum MonsterBornType { MONSTER_BORN_TYPE_NONE = 0; MONSTER_BORN_TYPE_DEFAULT = 1; MONSTER_BORN_TYPE_RANDOM = 2; } - diff --git a/proto/MonsterPointArrayRouteUpdateNotify.proto b/proto/MonsterPointArrayRouteUpdateNotify.proto index 03d6ca36..9464387f 100644 --- a/proto/MonsterPointArrayRouteUpdateNotify.proto +++ b/proto/MonsterPointArrayRouteUpdateNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "MonsterRoute.proto"; // CmdId: 3064 +// Obf: DACNMFEKIII message MonsterPointArrayRouteUpdateNotify { uint32 entity_id = 4; MonsterRoute monster_route = 8; diff --git a/proto/MonsterRoute.proto b/proto/MonsterRoute.proto index c1ab6603..7e5cc319 100644 --- a/proto/MonsterRoute.proto +++ b/proto/MonsterRoute.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "RoutePoint.proto"; +// Obf: DPMNEGAPBAK message MonsterRoute { repeated RoutePoint route_points = 1; uint32 speed_level = 2; diff --git a/proto/MoonfinTrialActivityDetailInfo.proto b/proto/MoonfinTrialActivityDetailInfo.proto new file mode 100644 index 00000000..330da2b3 --- /dev/null +++ b/proto/MoonfinTrialActivityDetailInfo.proto @@ -0,0 +1,27 @@ +// 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 "MoonfinTrialLevelInfo.proto"; +// Obf: MAJAOJJADHK +message MoonfinTrialActivityDetailInfo { + map level_info_map = 1; + uint32 special_fish_count = 5; +} diff --git a/proto/MoonfinTrialLevelInfo.proto b/proto/MoonfinTrialLevelInfo.proto new file mode 100644 index 00000000..71804e64 --- /dev/null +++ b/proto/MoonfinTrialLevelInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +// Obf: ANHIGENPEPA +message MoonfinTrialLevelInfo { + uint32 open_time = 3; + uint32 best_record = 14; +} diff --git a/proto/MotionInfo.proto b/proto/MotionInfo.proto index dcc48bf4..9b0a6a42 100644 --- a/proto/MotionInfo.proto +++ b/proto/MotionInfo.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; import "MotionState.proto"; +// Obf: JELNCMPFEFL message MotionInfo { Vector pos = 1; Vector rot = 2; diff --git a/proto/MotionState.proto b/proto/MotionState.proto index 4ae78e70..fd52c468 100644 --- a/proto/MotionState.proto +++ b/proto/MotionState.proto @@ -1,67 +1,82 @@ +// 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"; -// Name: CKBDHMCNIFJ +// Obf: NCLOPCFKODI enum MotionState { - MOTION_STATE_NONE = 0; - MOTION_STATE_RESET = 1; - MOTION_STATE_STANDBY = 2; - MOTION_STATE_STANDBY_MOVE = 3; - MOTION_STATE_WALK = 4; - MOTION_STATE_RUN = 5; - MOTION_STATE_DASH = 6; - MOTION_STATE_CLIMB = 7; - MOTION_STATE_CLIMB_JUMP = 8; - MOTION_STATE_STANDBY_TO_CLIMB = 9; - MOTION_STATE_FIGHT = 10; - MOTION_STATE_JUMP = 11; - MOTION_STATE_DROP = 12; - MOTION_STATE_FLY = 13; - MOTION_STATE_SWIM_MOVE = 14; - MOTION_STATE_SWIM_IDLE = 15; - MOTION_STATE_SWIM_DASH = 16; - MOTION_STATE_SWIM_JUMP = 17; - MOTION_STATE_SLIP = 18; - MOTION_STATE_GO_UPSTAIRS = 19; - MOTION_STATE_FALL_ON_GROUND = 20; - MOTION_STATE_JUMP_UP_WALL_FOR_STANDBY = 21; - MOTION_STATE_JUMP_OFF_WALL = 22; - MOTION_STATE_POWERED_FLY = 23; - MOTION_STATE_LADDER_IDLE = 24; - MOTION_STATE_LADDER_MOVE = 25; - MOTION_STATE_LADDER_SLIP = 26; - MOTION_STATE_STANDBY_TO_LADDER = 27; - MOTION_STATE_LADDER_TO_STANDBY = 28; - MOTION_STATE_DANGER_STANDBY = 29; - MOTION_STATE_DANGER_STANDBY_MOVE = 30; - MOTION_STATE_DANGER_WALK = 31; - MOTION_STATE_DANGER_RUN = 32; - MOTION_STATE_DANGER_DASH = 33; - MOTION_STATE_CROUCH_IDLE = 34; - MOTION_STATE_CROUCH_MOVE = 35; - MOTION_STATE_CROUCH_ROLL = 36; - MOTION_STATE_NOTIFY = 37; - MOTION_STATE_LAND_SPEED = 38; - MOTION_STATE_MOVE_FAIL_ACK = 39; - MOTION_STATE_WATERFALL = 40; - MOTION_STATE_DASH_BEFORE_SHAKE = 41; - MOTION_STATE_SIT_IDLE = 42; - MOTION_STATE_FORCE_SET_POS = 43; - MOTION_STATE_QUEST_FORCE_DRAG = 44; - MOTION_STATE_FOLLOW_ROUTE = 45; - MOTION_STATE_SKIFF_BOARDING = 46; - MOTION_STATE_SKIFF_NORMAL = 47; - MOTION_STATE_SKIFF_DASH = 48; - MOTION_STATE_SKIFF_POWERED_DASH = 49; - MOTION_STATE_DESTROY_VEHICLE = 50; - MOTION_STATE_FLY_IDLE = 51; - MOTION_STATE_FLY_SLOW = 52; - MOTION_STATE_FLY_FAST = 53; - MOTION_STATE_AIM_MOVE = 54; - MOTION_STATE_AIR_COMPENSATION = 55; - MOTION_STATE_SORUSH_NORMAL = 56; - MOTION_STATE_NUM = 57; + MOTION_STATE_NONE = 0; + MOTION_STATE_RESET = 1; + MOTION_STATE_STANDBY = 2; + MOTION_STATE_STANDBY_MOVE = 3; + MOTION_STATE_WALK = 4; + MOTION_STATE_RUN = 5; + MOTION_STATE_DASH = 6; + MOTION_STATE_CLIMB = 7; + MOTION_STATE_CLIMB_JUMP = 8; + MOTION_STATE_STANDBY_TO_CLIMB = 9; + MOTION_STATE_FIGHT = 10; + MOTION_STATE_JUMP = 11; + MOTION_STATE_DROP = 12; + MOTION_STATE_FLY = 13; + MOTION_STATE_SWIM_MOVE = 14; + MOTION_STATE_SWIM_IDLE = 15; + MOTION_STATE_SWIM_DASH = 16; + MOTION_STATE_SWIM_JUMP = 17; + MOTION_STATE_SLIP = 18; + MOTION_STATE_GO_UPSTAIRS = 19; + MOTION_STATE_FALL_ON_GROUND = 20; + MOTION_STATE_JUMP_UP_WALL_FOR_STANDBY = 21; + MOTION_STATE_JUMP_OFF_WALL = 22; + MOTION_STATE_POWERED_FLY = 23; + MOTION_STATE_LADDER_IDLE = 24; + MOTION_STATE_LADDER_MOVE = 25; + MOTION_STATE_LADDER_SLIP = 26; + MOTION_STATE_STANDBY_TO_LADDER = 27; + MOTION_STATE_LADDER_TO_STANDBY = 28; + MOTION_STATE_DANGER_STANDBY = 29; + MOTION_STATE_DANGER_STANDBY_MOVE = 30; + MOTION_STATE_DANGER_WALK = 31; + MOTION_STATE_DANGER_RUN = 32; + MOTION_STATE_DANGER_DASH = 33; + MOTION_STATE_CROUCH_IDLE = 34; + MOTION_STATE_CROUCH_MOVE = 35; + MOTION_STATE_CROUCH_ROLL = 36; + MOTION_STATE_NOTIFY = 37; + MOTION_STATE_LAND_SPEED = 38; + MOTION_STATE_MOVE_FAIL_ACK = 39; + MOTION_STATE_WATERFALL = 40; + MOTION_STATE_DASH_BEFORE_SHAKE = 41; + MOTION_STATE_SIT_IDLE = 42; + MOTION_STATE_FORCE_SET_POS = 43; + MOTION_STATE_QUEST_FORCE_DRAG = 44; + MOTION_STATE_FOLLOW_ROUTE = 45; + MOTION_STATE_SKIFF_BOARDING = 46; + MOTION_STATE_SKIFF_NORMAL = 47; + MOTION_STATE_SKIFF_DASH = 48; + MOTION_STATE_SKIFF_POWERED_DASH = 49; + MOTION_STATE_DESTROY_VEHICLE = 50; + MOTION_STATE_FLY_IDLE = 51; + MOTION_STATE_FLY_SLOW = 52; + MOTION_STATE_FLY_FAST = 53; + MOTION_STATE_AIM_MOVE = 54; + MOTION_STATE_AIR_COMPENSATION = 55; + MOTION_STATE_SORUSH_NORMAL = 56; + MOTION_STATE_NUM = 57; } - diff --git a/proto/MovingPlatformType.proto b/proto/MovingPlatformType.proto index 4bc62a3b..0d54cbfb 100644 --- a/proto/MovingPlatformType.proto +++ b/proto/MovingPlatformType.proto @@ -1,13 +1,28 @@ +// 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"; -// Name: OKNINCMBNLI +// Obf: EKIOLBCKCAO enum MovingPlatformType { MOVING_PLATFORM_TYPE_NONE = 0; MOVING_PLATFORM_TYPE_USE_CONFIG = 1; MOVING_PLATFORM_TYPE_ABILITY = 2; MOVING_PLATFORM_TYPE_ROUTE = 3; } - diff --git a/proto/MpPlayRewardInfo.proto b/proto/MpPlayRewardInfo.proto index 5274eaa4..c255344b 100644 --- a/proto/MpPlayRewardInfo.proto +++ b/proto/MpPlayRewardInfo.proto @@ -1,12 +1,27 @@ +// 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"; -// Name: DCPIKCIDILK +// Obf: OACEIOAILNE message MpPlayRewardInfo { - uint32 resin = 1; - repeated uint32 remain_uid_list = 2; - repeated uint32 qualify_uid_list = 3; + uint32 resin = 1; + repeated uint32 remain_uid_list = 2; + repeated uint32 qualify_uid_list = 3; } - diff --git a/proto/MpSettingType.proto b/proto/MpSettingType.proto index af0306d2..ba6887db 100644 --- a/proto/MpSettingType.proto +++ b/proto/MpSettingType.proto @@ -1,12 +1,27 @@ +// 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"; -// Name: CEBEGOKNPHM +// Obf: BBPFDAGPFLE enum MpSettingType { - MP_SETTING_TYPE_NO_ENTER = 0; - MP_SETTING_TYPE_ENTER_FREELY = 1; - MP_SETTING_TYPE_ENTER_AFTER_APPLY = 2; + MP_SETTING_TYPE_NO_ENTER = 0; + MP_SETTING_TYPE_ENTER_FREELY = 1; + MP_SETTING_TYPE_ENTER_AFTER_APPLY = 2; } - diff --git a/proto/MuqadasPotionActivityDetailInfo.proto b/proto/MuqadasPotionActivityDetailInfo.proto new file mode 100644 index 00000000..92dfc19e --- /dev/null +++ b/proto/MuqadasPotionActivityDetailInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "MuqadasPotionLevelData.proto"; +// Obf: EIMFDNMNPHA +message MuqadasPotionActivityDetailInfo { + repeated MuqadasPotionLevelData muqadas_potion_level_data_list = 13; +} diff --git a/proto/MuqadasPotionDungeonSettleNotify.proto b/proto/MuqadasPotionDungeonSettleNotify.proto index b421d1f3..079fd192 100644 --- a/proto/MuqadasPotionDungeonSettleNotify.proto +++ b/proto/MuqadasPotionDungeonSettleNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 23874 +// Obf: KNHJNEILKAJ message MuqadasPotionDungeonSettleNotify { bool is_success = 15; bool is_new_record = 7; diff --git a/proto/MuqadasPotionLevelData.proto b/proto/MuqadasPotionLevelData.proto new file mode 100644 index 00000000..49f0b6b9 --- /dev/null +++ b/proto/MuqadasPotionLevelData.proto @@ -0,0 +1,27 @@ +// 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: KMDHKAFACEP +message MuqadasPotionLevelData { + uint32 max_score = 13; + bool is_open = 2; + uint32 level_id = 11; +} diff --git a/proto/NLEMHBCLPLJ.proto b/proto/NLEMHBCLPLJ.proto deleted file mode 100644 index 902d6b01..00000000 --- a/proto/NLEMHBCLPLJ.proto +++ /dev/null @@ -1,26 +0,0 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - -message NLEMHBCLPLJ { - uint32 material_id = 8; - uint32 IMCGAFLIONH = 1; - uint32 NKCAAOLCMDK = 11; -} diff --git a/proto/NightCrowGadgetInfo.proto b/proto/NightCrowGadgetInfo.proto index 76a04705..53c4db54 100644 --- a/proto/NightCrowGadgetInfo.proto +++ b/proto/NightCrowGadgetInfo.proto @@ -1,10 +1,25 @@ +// 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"; -// Name: PCHOAFIIIDE +// Obf: CDFJGPAHAAJ message NightCrowGadgetInfo { - repeated uint32 argument_list = 1; + repeated uint32 argument_list = 1; } - diff --git a/proto/NpcTalkReq.proto b/proto/NpcTalkReq.proto index 620baaa2..3eed7d17 100644 --- a/proto/NpcTalkReq.proto +++ b/proto/NpcTalkReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 575 +// Obf: AHMDGGDKIJC message NpcTalkReq { uint32 npc_entity_id = 2; uint32 talk_id = 14; diff --git a/proto/NpcTalkRsp.proto b/proto/NpcTalkRsp.proto index 6db1d2f3..70218552 100644 --- a/proto/NpcTalkRsp.proto +++ b/proto/NpcTalkRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 596 +// Obf: OAFFPIJPBBM message NpcTalkRsp { uint32 entity_id = 15; uint32 cur_talk_id = 1; diff --git a/proto/OEHLKBGHEDC.proto b/proto/OEHLKBGHEDC.proto new file mode 100644 index 00000000..fe3aad3c --- /dev/null +++ b/proto/OEHLKBGHEDC.proto @@ -0,0 +1,27 @@ +// 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"; + + +enum OEHLKBGHEDC { + OEHLKBGHEDC_SandwormLevelNotOpen = 0; + OEHLKBGHEDC_SandwormLevelPreQuest = 1; + OEHLKBGHEDC_SandwormLevelStart = 2; + OEHLKBGHEDC_SandwormLevelSequelQuest = 3; +} diff --git a/proto/OMNDDJHEJKO.proto b/proto/OMNDDJHEJKO.proto deleted file mode 100644 index 1916758f..00000000 --- a/proto/OMNDDJHEJKO.proto +++ /dev/null @@ -1,44 +0,0 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - -message OMNDDJHEJKO { - uint32 FMODIKFHCGI = 202; - bool NMPCHDBKBKO = 4; - uint64 GFIONAJOGKP = 7; - uint32 EFIHBBCCCKH = 15; - bool KEKPCCHODPN = 5; - uint32 DDCGEJMOLDO = 1797; - uint32 ILJHMEHDFOP = 6; - uint32 KLCDHPAOCBB = 3; - bool is_psn_platform = 2; - uint32 ODNJOCHFFGK = 1022; - repeated uint32 ALBOKNGANPB = 283; - uint32 NBHIELAJIOJ = 10; - uint32 LDMHFDOLFNG = 11; - uint64 ugc_guid = 1; - bool HCPDGMMGEGA = 9; - uint32 version = 14; - uint32 EOIEPOLHIEJ = 8; - repeated uint32 CEAPCIPEOPG = 1951; - uint32 max_score = 13; - string PKGJBGDLKMI = 12; - uint32 HGGBLBFJEDO = 587; -} diff --git a/proto/OOOHGLFDFCI.proto b/proto/OOOHGLFDFCI.proto index 40a9fa37..c66060a1 100644 --- a/proto/OOOHGLFDFCI.proto +++ b/proto/OOOHGLFDFCI.proto @@ -20,5 +20,5 @@ option java_package = "emu.grasscutter.net.proto"; message OOOHGLFDFCI { - uint32 LNCHCADNJGN = 1; + uint32 DDMGIGACIGD = 1; } diff --git a/proto/FGNNOLDBLNO.proto b/proto/OPEMEOGOHME.proto similarity index 94% rename from proto/FGNNOLDBLNO.proto rename to proto/OPEMEOGOHME.proto index 68135b39..ed349f47 100644 --- a/proto/FGNNOLDBLNO.proto +++ b/proto/OPEMEOGOHME.proto @@ -19,6 +19,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -message FGNNOLDBLNO { - bool GDPMONPHEPH = 1; +message OPEMEOGOHME { + uint32 level_id = 1; } diff --git a/proto/ObstacleInfo.proto b/proto/ObstacleInfo.proto index 83ec13d6..ac049fe4 100644 --- a/proto/ObstacleInfo.proto +++ b/proto/ObstacleInfo.proto @@ -22,10 +22,12 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; import "MathQuaternion.proto"; import "Vector3Int.proto"; +// Obf: IIEGGGIMBHP message ObstacleInfo { + // Obf: ICJGJHAOCFL enum ShapeType { - ObstacleShapeCapsule = 0; - ObstacleShapeBox = 1; + OBSTACLE_SHAPE_CAPSULE = 0; + OBSTACLE_SHAPE_BOX = 1; } int32 obstacle_id = 4; diff --git a/proto/ObstacleModifyNotify.proto b/proto/ObstacleModifyNotify.proto index 214bba5a..a87e1935 100644 --- a/proto/ObstacleModifyNotify.proto +++ b/proto/ObstacleModifyNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ObstacleInfo.proto"; // CmdId: 2302 +// Obf: JJMONLNMKPP message ObstacleModifyNotify { repeated int32 remove_obstacle_ids = 1; repeated ObstacleInfo add_obstacles = 5; diff --git a/proto/OfferingInfo.proto b/proto/OfferingInfo.proto index a96382c8..12ea8f75 100644 --- a/proto/OfferingInfo.proto +++ b/proto/OfferingInfo.proto @@ -1,10 +1,25 @@ +// 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"; -// Name: APJFIICJMBD +// Obf: PKHMLMBDEPB message OfferingInfo { - uint32 offering_id = 1; + uint32 offering_id = 1; } - diff --git a/proto/OfficialCustomDungeon.proto b/proto/OfficialCustomDungeon.proto new file mode 100644 index 00000000..4cd7d9c5 --- /dev/null +++ b/proto/OfficialCustomDungeon.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +// Obf: AEENJMJINAK +message OfficialCustomDungeon { + uint32 win_times = 3; + uint32 dungeon_id = 11; +} diff --git a/proto/OneoffGatherPointDetectorData.proto b/proto/OneoffGatherPointDetectorData.proto index 3ef48c5a..c750ed63 100644 --- a/proto/OneoffGatherPointDetectorData.proto +++ b/proto/OneoffGatherPointDetectorData.proto @@ -1,17 +1,32 @@ +// 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"; - -// Name: JEFLHCMKIFB +// Obf: LPLOENMNIOC message OneoffGatherPointDetectorData { - Vector hint_center_pos = 4; - bool is_hint_valid = 11; - uint32 config_id = 10; - bool is_all_collected = 5; - uint32 hint_radius = 1; - uint32 group_id = 7; - uint32 material_id = 14; + uint32 config_id = 11; + bool is_all_collected = 9; + uint32 group_id = 10; + bool is_hint_valid = 4; + Vector hint_center_pos = 3; + uint32 hint_radius = 8; + uint32 material_id = 13; } - diff --git a/proto/OnlinePlayerInfo.proto b/proto/OnlinePlayerInfo.proto index 8d7596f9..5305e672 100644 --- a/proto/OnlinePlayerInfo.proto +++ b/proto/OnlinePlayerInfo.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "MpSettingType.proto"; import "ProfilePicture.proto"; +// Obf: KFAGEFMEFCD message OnlinePlayerInfo { uint32 uid = 1; string nickname = 2; diff --git a/proto/OpActivityInfo.proto b/proto/OpActivityInfo.proto index 5add09fe..335eb40f 100644 --- a/proto/OpActivityInfo.proto +++ b/proto/OpActivityInfo.proto @@ -19,12 +19,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "MBPEIAOFFNP.proto"; +import "BonusOpActivityInfo.proto"; +// Obf: FIIPHGJMGEB message OpActivityInfo { uint32 schedule_id = 10; uint32 end_time = 1; uint32 activity_id = 12; bool is_has_change = 14; uint32 begin_time = 6; - optional MBPEIAOFFNP CFKPIDGBHBC = 9; + optional BonusOpActivityInfo bonus_info = 9; } diff --git a/proto/OpType.proto b/proto/OpType.proto deleted file mode 100644 index c60ce802..00000000 --- a/proto/OpType.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - - -enum OpType { - OP_TYPE_NONE = 0; - OP_TYPE_ACTIVATE = 1; - OP_TYPE_DEACTIVATE = 2; -} diff --git a/proto/OpenStateChangeNotify.proto b/proto/OpenStateChangeNotify.proto index 7eabafd3..13a01263 100644 --- a/proto/OpenStateChangeNotify.proto +++ b/proto/OpenStateChangeNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 176 +// Obf: ICNJPPNCHCD message OpenStateChangeNotify { map open_state_map = 1; } diff --git a/proto/OpenStateUpdateNotify.proto b/proto/OpenStateUpdateNotify.proto index 1961ff3f..001b8089 100644 --- a/proto/OpenStateUpdateNotify.proto +++ b/proto/OpenStateUpdateNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 131 +// Obf: NMDDJJCDOPG message OpenStateUpdateNotify { map open_state_map = 1; } diff --git a/proto/PMKDNBGDCIH.proto b/proto/PMKDNBGDCIH.proto new file mode 100644 index 00000000..6f720fb2 --- /dev/null +++ b/proto/PMKDNBGDCIH.proto @@ -0,0 +1,25 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +message PMKDNBGDCIH { + uint32 level_id = 13; + uint32 min_finish_time = 12; +} diff --git a/proto/PSPlayerApplyEnterMpReq.proto b/proto/PSPlayerApplyEnterMpReq.proto index d2972ad9..1ca355cf 100644 --- a/proto/PSPlayerApplyEnterMpReq.proto +++ b/proto/PSPlayerApplyEnterMpReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1801 +// Obf: MMPEGBPFHDD message PSPlayerApplyEnterMpReq { string target_psn_id = 6; } diff --git a/proto/PSPlayerApplyEnterMpRsp.proto b/proto/PSPlayerApplyEnterMpRsp.proto index 28146489..5cc4c7cb 100644 --- a/proto/PSPlayerApplyEnterMpRsp.proto +++ b/proto/PSPlayerApplyEnterMpRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1842 +// Obf: LBNPFNBAJOI message PSPlayerApplyEnterMpRsp { uint32 param = 12; string target_psn_id = 10; diff --git a/proto/PacketHead.proto b/proto/PacketHead.proto index 4ac7f93a..3ee4dcd3 100644 --- a/proto/PacketHead.proto +++ b/proto/PacketHead.proto @@ -1,27 +1,42 @@ +// 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"; -// Name: OPEGMEBLMFH +// Obf: NEPABBOKLDD message PacketHead { - uint32 packet_id = 1; - uint32 rpc_id = 2; - uint32 client_sequence_id = 3; - uint32 enet_channel_id = 4; - uint32 enet_is_reliable = 5; - uint64 sent_ms = 6; - uint32 user_id = 11; - uint32 user_ip = 12; - uint32 user_session_id = 13; - uint64 recv_time_ms = 21; - uint32 rpc_begin_time_ms = 22; - map ext_map = 23; - uint32 sender_app_id = 24; - uint32 source_service = 31; - uint32 target_service = 32; - map service_app_id_map = 33; - bool is_set_game_thread = 34; - uint32 game_thread_index = 35; + uint32 packet_id = 1; + uint32 rpc_id = 2; + uint32 client_sequence_id = 3; + uint32 enet_channel_id = 4; + uint32 enet_is_reliable = 5; + uint64 sent_ms = 6; + uint32 user_id = 11; + uint32 user_ip = 12; + uint32 user_session_id = 13; + uint64 recv_time_ms = 21; + uint32 rpc_begin_time_ms = 22; + map ext_map = 23; + uint32 sender_app_id = 24; + uint32 source_service = 31; + uint32 target_service = 32; + map service_app_id_map = 33; + bool is_set_game_thread = 34; + uint32 game_thread_index = 35; } - diff --git a/proto/PacmanSettleInfo.proto b/proto/PacmanSettleInfo.proto new file mode 100644 index 00000000..f114f7a7 --- /dev/null +++ b/proto/PacmanSettleInfo.proto @@ -0,0 +1,30 @@ +// 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 "AEIMLNONEAP.proto"; +// Obf: CIOHOKKNJLI +message PacmanSettleInfo { + uint32 final_score = 12; + uint32 CGLDHPKMAGO = 4; + bool is_new_record = 9; + uint32 AFJNAIOEMJG = 1; + AEIMLNONEAP reason = 14; +} diff --git a/proto/ParamList.proto b/proto/ParamList.proto index 11702358..297f0c36 100644 --- a/proto/ParamList.proto +++ b/proto/ParamList.proto @@ -1,10 +1,25 @@ +// 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"; -// Name: BOKAFEOCLAA +// Obf: CBCCEMJAHPB message ParamList { - repeated uint32 param_list = 1; + repeated uint32 param_list = 1; } - diff --git a/proto/ParentQuest.proto b/proto/ParentQuest.proto index a223b038..968726a4 100644 --- a/proto/ParentQuest.proto +++ b/proto/ParentQuest.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "InferencePageInfo.proto"; import "ChildQuest.proto"; import "ParentQuestRandomInfo.proto"; +// Obf: NHFLHNIKBLK message ParentQuest { uint32 accept_time = 9; repeated int32 quest_var = 15; diff --git a/proto/ParentQuestInferenceDataNotify.proto b/proto/ParentQuestInferenceDataNotify.proto index 0132d52f..233ad946 100644 --- a/proto/ParentQuestInferenceDataNotify.proto +++ b/proto/ParentQuestInferenceDataNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "InferencePageInfo.proto"; // CmdId: 469 +// Obf: GJIDJKKLDMI message ParentQuestInferenceDataNotify { uint32 parent_quest_id = 12; repeated InferencePageInfo inference_page_list = 7; diff --git a/proto/ParentQuestRandomInfo.proto b/proto/ParentQuestRandomInfo.proto index 0cb3fc0a..2a939654 100644 --- a/proto/ParentQuestRandomInfo.proto +++ b/proto/ParentQuestRandomInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: NIIAKFJMIEN message ParentQuestRandomInfo { repeated uint32 factor_list = 12; uint32 template_id = 1; diff --git a/proto/ParkourLevelInfo.proto b/proto/ParkourLevelInfo.proto new file mode 100644 index 00000000..80edb9b9 --- /dev/null +++ b/proto/ParkourLevelInfo.proto @@ -0,0 +1,29 @@ +// 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: BCMINADPFCD +message ParkourLevelInfo { + uint32 open_time = 14; + bool is_open = 7; + Vector pos = 3; + uint32 best_record = 2; +} diff --git a/proto/PathfindingEnterSceneReq.proto b/proto/PathfindingEnterSceneReq.proto index ac84c2ac..579fcc5c 100644 --- a/proto/PathfindingEnterSceneReq.proto +++ b/proto/PathfindingEnterSceneReq.proto @@ -21,11 +21,12 @@ option java_package = "emu.grasscutter.net.proto"; import "ObstacleInfo.proto"; // CmdId: 2355 +// Obf: DABOPANJCMH message PathfindingEnterSceneReq { uint32 version = 4; uint32 scene_id = 12; repeated ObstacleInfo obstacles = 7; - uint32 FAENDEMBCIP = 3; + uint32 MPIPHNNEMBK = 3; bool is_editor = 14; - uint32 IHDGBHCALFA = 11; + uint32 JAAGGFLGGGL = 11; } diff --git a/proto/PathfindingEnterSceneRsp.proto b/proto/PathfindingEnterSceneRsp.proto index c00b46ec..b9984e2a 100644 --- a/proto/PathfindingEnterSceneRsp.proto +++ b/proto/PathfindingEnterSceneRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2348 +// Obf: NEOFCFKGPFI message PathfindingEnterSceneRsp { int32 retcode = 1; } diff --git a/proto/PersonalLineAllDataReq.proto b/proto/PersonalLineAllDataReq.proto index db7633bd..ea6b74dd 100644 --- a/proto/PersonalLineAllDataReq.proto +++ b/proto/PersonalLineAllDataReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 498 +// Obf: LELAFJBLNGN message PersonalLineAllDataReq { } diff --git a/proto/PersonalLineAllDataRsp.proto b/proto/PersonalLineAllDataRsp.proto index bff67e4a..ad09f83e 100644 --- a/proto/PersonalLineAllDataRsp.proto +++ b/proto/PersonalLineAllDataRsp.proto @@ -21,11 +21,12 @@ option java_package = "emu.grasscutter.net.proto"; import "LockedPersonallineData.proto"; // CmdId: 446 +// Obf: FOOHJFIPKCO message PersonalLineAllDataRsp { int32 retcode = 12; - repeated uint32 can_be_unlocked_personal_line_list = 10; + repeated uint32 ongoing_personal_line_list = 10; uint32 cur_finished_daily_task_count = 15; uint32 legendary_key_count = 5; - repeated uint32 ongoing_personal_line_list = 13; + repeated uint32 can_be_unlocked_personal_line_list = 13; repeated LockedPersonallineData locked_personal_line_list = 8; } diff --git a/proto/PersonalSceneJumpReq.proto b/proto/PersonalSceneJumpReq.proto index 66a0ee7b..ef5b84cd 100644 --- a/proto/PersonalSceneJumpReq.proto +++ b/proto/PersonalSceneJumpReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 219 +// Obf: LDHAOJBJLEE message PersonalSceneJumpReq { uint32 point_id = 4; } diff --git a/proto/PersonalSceneJumpRsp.proto b/proto/PersonalSceneJumpRsp.proto index 4304f3b8..3bb8452b 100644 --- a/proto/PersonalSceneJumpRsp.proto +++ b/proto/PersonalSceneJumpRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; // CmdId: 289 +// Obf: PLGLDALKIJC message PersonalSceneJumpRsp { Vector dest_pos = 8; uint32 dest_scene_id = 5; diff --git a/proto/PhotoActivityDetailInfo.proto b/proto/PhotoActivityDetailInfo.proto new file mode 100644 index 00000000..5f100c23 --- /dev/null +++ b/proto/PhotoActivityDetailInfo.proto @@ -0,0 +1,27 @@ +// 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 "PhotoPosData.proto"; +// Obf: EPLOANILOOP +message PhotoActivityDetailInfo { + repeated PhotoPosData photo_pos_data_list = 10; + bool is_content_closed = 7; +} diff --git a/proto/PhotoPosData.proto b/proto/PhotoPosData.proto new file mode 100644 index 00000000..3c28f141 --- /dev/null +++ b/proto/PhotoPosData.proto @@ -0,0 +1,30 @@ +// 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: BDIKBENAFPG +message PhotoPosData { + bool is_open = 5; + Vector center = 6; + bool is_view = 10; + uint32 pos_id = 15; + uint32 open_time = 14; +} diff --git a/proto/PingReq.proto b/proto/PingReq.proto index 3e7c0d4f..0943e6f9 100644 --- a/proto/PingReq.proto +++ b/proto/PingReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 55 +// Obf: IKMINMLKIKP message PingReq { bytes sc_data = 9; double total_tick_time = 3; diff --git a/proto/PingRsp.proto b/proto/PingRsp.proto index 0bab21d4..f5f4b3ba 100644 --- a/proto/PingRsp.proto +++ b/proto/PingRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 48 +// Obf: IDDOIEHMKEF message PingRsp { uint32 client_time = 15; int32 retcode = 14; diff --git a/proto/PlantFlowerActivityDetailInfo.proto b/proto/PlantFlowerActivityDetailInfo.proto new file mode 100644 index 00000000..9467003e --- /dev/null +++ b/proto/PlantFlowerActivityDetailInfo.proto @@ -0,0 +1,30 @@ +// 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: DANKOINBJBL +message PlantFlowerActivityDetailInfo { + bool is_today_has_awarded = 13; + map EBJAFJCLNCE = 10; + map NGCDHHIDHIH = 11; + uint32 today_seed_reward_id = 15; + uint32 day_index = 4; + bool is_content_closed = 12; +} diff --git a/proto/PlatformChangeRouteNotify.proto b/proto/PlatformChangeRouteNotify.proto index c2d811b8..3818cce4 100644 --- a/proto/PlatformChangeRouteNotify.proto +++ b/proto/PlatformChangeRouteNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "PlatformInfo.proto"; // CmdId: 201 +// Obf: BGNOPBLONBJ message PlatformChangeRouteNotify { uint32 entity_id = 8; PlatformInfo platform = 6; diff --git a/proto/PlatformInfo.proto b/proto/PlatformInfo.proto index 6e026af3..8b7a0ca8 100644 --- a/proto/PlatformInfo.proto +++ b/proto/PlatformInfo.proto @@ -23,6 +23,7 @@ import "Vector.proto"; import "MathQuaternion.proto"; import "MovingPlatformType.proto"; import "Route.proto"; +// Obf: JIHNBDJFOFI message PlatformInfo { uint32 route_id = 1; int32 start_index = 2; diff --git a/proto/PlatformStartRouteNotify.proto b/proto/PlatformStartRouteNotify.proto index 7d33eaad..a770ccb4 100644 --- a/proto/PlatformStartRouteNotify.proto +++ b/proto/PlatformStartRouteNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "PlatformInfo.proto"; // CmdId: 270 +// Obf: EIGBJMKAFCD message PlatformStartRouteNotify { uint32 scene_time = 14; uint32 entity_id = 13; diff --git a/proto/PlatformStopRouteNotify.proto b/proto/PlatformStopRouteNotify.proto index f6bfdfcc..24b03ae2 100644 --- a/proto/PlatformStopRouteNotify.proto +++ b/proto/PlatformStopRouteNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "PlatformInfo.proto"; // CmdId: 261 +// Obf: HBEPLCNKODM message PlatformStopRouteNotify { PlatformInfo platform = 7; uint32 entity_id = 11; diff --git a/proto/PlatformType.proto b/proto/PlatformType.proto index 96a1fe54..87382ebd 100644 --- a/proto/PlatformType.proto +++ b/proto/PlatformType.proto @@ -1,9 +1,25 @@ +// 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"; -// Name: IIINMHIAOCN +// Obf: OBGLBKLIHPE enum PlatformType { PLATFORM_TYPE_EDITOR = 0; PLATFORM_TYPE_IOS = 1; @@ -21,4 +37,3 @@ enum PlatformType { PLATFORM_TYPE_CLOUD_THIRD_PARTY_MOBILE = 13; PLATFORM_TYPE_CLOUD_THIRD_PARTY_PC = 14; } - diff --git a/proto/PlayTeamEntityInfo.proto b/proto/PlayTeamEntityInfo.proto index a6fb5aef..b71c4236 100644 --- a/proto/PlayTeamEntityInfo.proto +++ b/proto/PlayTeamEntityInfo.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AbilitySyncStateInfo.proto"; +// Obf: BCJDGLPGIFK message PlayTeamEntityInfo { uint32 entity_id = 1; uint32 player_uid = 2; diff --git a/proto/PlayerApplyEnterMpNotify.proto b/proto/PlayerApplyEnterMpNotify.proto index 2d3af3ec..34171f18 100644 --- a/proto/PlayerApplyEnterMpNotify.proto +++ b/proto/PlayerApplyEnterMpNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "OnlinePlayerInfo.proto"; // CmdId: 1828 +// Obf: AOPCBABBFLA message PlayerApplyEnterMpNotify { OnlinePlayerInfo src_player_info = 12; uint32 src_app_id = 2; diff --git a/proto/PlayerApplyEnterMpReq.proto b/proto/PlayerApplyEnterMpReq.proto index 6ad102ba..795029f5 100644 --- a/proto/PlayerApplyEnterMpReq.proto +++ b/proto/PlayerApplyEnterMpReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1808 +// Obf: HODBBPLJLCP message PlayerApplyEnterMpReq { uint32 target_uid = 6; } diff --git a/proto/PlayerApplyEnterMpResultNotify.proto b/proto/PlayerApplyEnterMpResultNotify.proto index 526dfe6c..38a75495 100644 --- a/proto/PlayerApplyEnterMpResultNotify.proto +++ b/proto/PlayerApplyEnterMpResultNotify.proto @@ -20,22 +20,24 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1821 +// Obf: MAKFNJCFBCJ message PlayerApplyEnterMpResultNotify { + // Obf: DMNILJCFCCF enum Reason { REASON_PLAYER_JUDGE = 0; - REASON_SCENE_CANNOT_ENTER = 1; - REASON_PLAYER_CANNOT_ENTER_MP = 2; - REASON_SYSTEM_JUDGE = 3; - REASON_ALLOW_ENTER_PLAYER_FULL = 4; - REASON_WORLD_LEVEL_LOWER_THAN_HOST = 5; - REASON_HOST_IN_MATCH = 6; - REASON_PLAYER_IN_BLACKLIST = 7; - REASON_PS_PLAYER_NOT_ACCEPT_OTHERS = 8; - REASON_HOST_IS_BLOCKED = 9; - REASON_OTHER_DATA_VERSION_NOT_LATEST = 10; - REASON_DATA_VERSION_NOT_LATEST = 11; - REASON_PLAYER_NOT_IN_PLAYER_WORLD = 12; - REASON_MAX_PLAYER = 13; + REASON_SCENE_CANNOT_ENTER = 1; + REASON_PLAYER_CANNOT_ENTER_MP = 2; + REASON_SYSTEM_JUDGE = 3; + REASON_ALLOW_ENTER_PLAYER_FULL = 4; + REASON_WORLD_LEVEL_LOWER_THAN_HOST = 5; + REASON_HOST_IN_MATCH = 6; + REASON_PLAYER_IN_BLACKLIST = 7; + REASON_PS_PLAYER_NOT_ACCEPT_OTHERS = 8; + REASON_HOST_IS_BLOCKED = 9; + REASON_OTHER_DATA_VERSION_NOT_LATEST = 10; + REASON_DATA_VERSION_NOT_LATEST = 11; + REASON_PLAYER_NOT_IN_PLAYER_WORLD = 12; + REASON_MAX_PLAYER = 13; } string target_nickname = 3; diff --git a/proto/PlayerApplyEnterMpResultReq.proto b/proto/PlayerApplyEnterMpResultReq.proto index 47916ac5..7b50ec39 100644 --- a/proto/PlayerApplyEnterMpResultReq.proto +++ b/proto/PlayerApplyEnterMpResultReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1826 +// Obf: CGEKLKJEDEA message PlayerApplyEnterMpResultReq { uint32 apply_uid = 9; bool is_agreed = 13; diff --git a/proto/PlayerApplyEnterMpResultRsp.proto b/proto/PlayerApplyEnterMpResultRsp.proto index 7f3c8fe6..85f20907 100644 --- a/proto/PlayerApplyEnterMpResultRsp.proto +++ b/proto/PlayerApplyEnterMpResultRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1839 +// Obf: CFJHBMMFNBA message PlayerApplyEnterMpResultRsp { bool is_agreed = 15; uint32 param = 7; diff --git a/proto/PlayerApplyEnterMpRsp.proto b/proto/PlayerApplyEnterMpRsp.proto index 14c91420..5c05c2d4 100644 --- a/proto/PlayerApplyEnterMpRsp.proto +++ b/proto/PlayerApplyEnterMpRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1837 +// Obf: BIGOGCCBLJB message PlayerApplyEnterMpRsp { int32 retcode = 13; uint32 param = 5; diff --git a/proto/PlayerChatNotify.proto b/proto/PlayerChatNotify.proto index 3587fc4c..e5e56661 100644 --- a/proto/PlayerChatNotify.proto +++ b/proto/PlayerChatNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ChatInfo.proto"; // CmdId: 3254 +// Obf: NFFHECAIEPB message PlayerChatNotify { ChatInfo chat_info = 4; uint32 channel_id = 1; diff --git a/proto/PlayerChatReq.proto b/proto/PlayerChatReq.proto index 1f02fdad..0ed8d953 100644 --- a/proto/PlayerChatReq.proto +++ b/proto/PlayerChatReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ChatInfo.proto"; // CmdId: 3359 +// Obf: DBOADNLHMAK message PlayerChatReq { ChatInfo chat_info = 13; uint32 channel_id = 7; diff --git a/proto/PlayerChatRsp.proto b/proto/PlayerChatRsp.proto index 3c224c54..711b190c 100644 --- a/proto/PlayerChatRsp.proto +++ b/proto/PlayerChatRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 3369 +// Obf: IABIBNLADIM message PlayerChatRsp { uint32 chat_forbidden_endtime = 7; int32 retcode = 5; diff --git a/proto/PlayerCompoundMaterialBoostReq.proto b/proto/PlayerCompoundMaterialBoostReq.proto index 46cca934..6d00eec7 100644 --- a/proto/PlayerCompoundMaterialBoostReq.proto +++ b/proto/PlayerCompoundMaterialBoostReq.proto @@ -20,9 +20,10 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 114 +// Obf: DFEPFLOHFBD message PlayerCompoundMaterialBoostReq { - uint32 OILJPEAIKGI = 12; - uint32 MEALACEMCPE = 11; + uint32 HDPLMDCFPAF = 12; + uint32 MBEFPCNDEII = 11; bool is_boost_all = 9; - uint32 BPCKNKJOJDO = 7; + uint32 MHMAGJKPDIO = 7; } diff --git a/proto/PlayerCompoundMaterialBoostRsp.proto b/proto/PlayerCompoundMaterialBoostRsp.proto index 02205a80..390ad330 100644 --- a/proto/PlayerCompoundMaterialBoostRsp.proto +++ b/proto/PlayerCompoundMaterialBoostRsp.proto @@ -23,6 +23,7 @@ import "CompoundQueueData.proto"; import "CompoundBoostTakeStatusType.proto"; import "ItemParam.proto"; // CmdId: 173 +// Obf: OECDPFKACOM message PlayerCompoundMaterialBoostRsp { repeated CompoundQueueData compoundQueueDataList = 2; CompoundBoostTakeStatusType take_status = 3; diff --git a/proto/PlayerCompoundMaterialReq.proto b/proto/PlayerCompoundMaterialReq.proto index ca8f684f..73c2f8fd 100644 --- a/proto/PlayerCompoundMaterialReq.proto +++ b/proto/PlayerCompoundMaterialReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 142 +// Obf: CIDMNOMHPKC message PlayerCompoundMaterialReq { uint32 count = 6; uint32 compound_id = 12; diff --git a/proto/PlayerCompoundMaterialRsp.proto b/proto/PlayerCompoundMaterialRsp.proto index b51c5220..95afc21b 100644 --- a/proto/PlayerCompoundMaterialRsp.proto +++ b/proto/PlayerCompoundMaterialRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "CompoundQueueData.proto"; // CmdId: 107 +// Obf: JJIKDLOONLH message PlayerCompoundMaterialRsp { CompoundQueueData compoundQueueData = 7; int32 retcode = 10; diff --git a/proto/PlayerCookArgsReq.proto b/proto/PlayerCookArgsReq.proto index 858a0c0d..17eea4ba 100644 --- a/proto/PlayerCookArgsReq.proto +++ b/proto/PlayerCookArgsReq.proto @@ -20,7 +20,8 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 161 +// Obf: FDMAEEECEHB message PlayerCookArgsReq { - uint32 DLCKBGNIKOG = 9; - uint32 HPENEDEPEBM = 13; + uint32 recipe_id = 9; + uint32 assist_avatar = 13; } diff --git a/proto/PlayerCookArgsRsp.proto b/proto/PlayerCookArgsRsp.proto index 87a35d0e..1ec6e3c5 100644 --- a/proto/PlayerCookArgsRsp.proto +++ b/proto/PlayerCookArgsRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 101 +// Obf: CAJPAGGCEHI message PlayerCookArgsRsp { int32 retcode = 6; float qte_range_ratio = 10; diff --git a/proto/PlayerCookReq.proto b/proto/PlayerCookReq.proto index f44b85cf..e19ef561 100644 --- a/proto/PlayerCookReq.proto +++ b/proto/PlayerCookReq.proto @@ -20,9 +20,10 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 126 +// Obf: DIHALIDCKGK message PlayerCookReq { - uint32 assist_avatar = 8; - uint32 cook_count = 13; - uint32 recipe_id = 6; + uint32 recipe_id = 8; + uint32 assist_avatar = 13; + uint32 cook_count = 6; uint32 qte_quality = 4; } diff --git a/proto/PlayerCookRsp.proto b/proto/PlayerCookRsp.proto index e9c65077..b4b2820f 100644 --- a/proto/PlayerCookRsp.proto +++ b/proto/PlayerCookRsp.proto @@ -22,11 +22,12 @@ option java_package = "emu.grasscutter.net.proto"; import "CookRecipeData.proto"; import "ItemParam.proto"; // CmdId: 120 +// Obf: GEGBDMOEEJL message PlayerCookRsp { CookRecipeData recipe_data = 4; int32 retcode = 2; - uint32 qte_quality = 5; - uint32 cook_count = 13; + uint32 cook_count = 5; + uint32 qte_quality = 13; repeated ItemParam item_list = 3; repeated ItemParam extral_item_list = 14; } diff --git a/proto/PlayerDataNotify.proto b/proto/PlayerDataNotify.proto index 14606b85..e444b9f9 100644 --- a/proto/PlayerDataNotify.proto +++ b/proto/PlayerDataNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "PropValue.proto"; // CmdId: 135 +// Obf: KHJPIMNFILK message PlayerDataNotify { uint64 server_time = 5; string nick_name = 8; diff --git a/proto/PlayerDieType.proto b/proto/PlayerDieType.proto index dc3ac7d2..81f33709 100644 --- a/proto/PlayerDieType.proto +++ b/proto/PlayerDieType.proto @@ -1,9 +1,25 @@ +// 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"; -// Name: AFOALEMHCMM +// Obf: GMCDBNJBEHA enum PlayerDieType { PLAYER_DIE_TYPE_NONE = 0; PLAYER_DIE_TYPE_KILL_BY_MONSTER = 1; @@ -15,4 +31,3 @@ enum PlayerDieType { PLAYER_DIE_TYPE_CLIMATE_COLD = 7; PLAYER_DIE_TYPE_STORM_LIGHTING = 8; } - diff --git a/proto/PlayerEnterDungeonReq.proto b/proto/PlayerEnterDungeonReq.proto index 7dce71e6..7c1f4d20 100644 --- a/proto/PlayerEnterDungeonReq.proto +++ b/proto/PlayerEnterDungeonReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "DungeonEnterPosInfo.proto"; // CmdId: 902 +// Obf: EECBNNIALIE message PlayerEnterDungeonReq { uint32 dungeon_id = 15; uint32 point_id = 13; diff --git a/proto/PlayerEnterDungeonRsp.proto b/proto/PlayerEnterDungeonRsp.proto index ad937372..4b759b18 100644 --- a/proto/PlayerEnterDungeonRsp.proto +++ b/proto/PlayerEnterDungeonRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 972 +// Obf: LKMOKPDJCPJ message PlayerEnterDungeonRsp { uint32 point_id = 3; int32 retcode = 10; diff --git a/proto/PlayerEnterSceneInfoNotify.proto b/proto/PlayerEnterSceneInfoNotify.proto index 628a69f9..fb9a9459 100644 --- a/proto/PlayerEnterSceneInfoNotify.proto +++ b/proto/PlayerEnterSceneInfoNotify.proto @@ -23,6 +23,7 @@ import "TeamEnterSceneInfo.proto"; import "MPLevelEntityInfo.proto"; import "AvatarEnterSceneInfo.proto"; // CmdId: 247 +// Obf: BLEGICCMNNO message PlayerEnterSceneInfoNotify { TeamEnterSceneInfo team_enter_info = 3; MPLevelEntityInfo mp_level_entity_info = 15; diff --git a/proto/PlayerEnterSceneNotify.proto b/proto/PlayerEnterSceneNotify.proto index 3aee0f58..794865bb 100644 --- a/proto/PlayerEnterSceneNotify.proto +++ b/proto/PlayerEnterSceneNotify.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "EnterType.proto"; import "Vector.proto"; // CmdId: 275 +// Obf: BKECKGFKLNP message PlayerEnterSceneNotify { uint32 enter_scene_token = 4; uint32 enter_reason = 1592; diff --git a/proto/PlayerForceExitRsp.proto b/proto/PlayerForceExitRsp.proto index 855673a7..9cc1ec0c 100644 --- a/proto/PlayerForceExitRsp.proto +++ b/proto/PlayerForceExitRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 140 +// Obf: LIBPJCAAPKH message PlayerForceExitRsp { int32 retcode = 8; } diff --git a/proto/PlayerGameTimeNotify.proto b/proto/PlayerGameTimeNotify.proto index 7ab36186..b6a89eca 100644 --- a/proto/PlayerGameTimeNotify.proto +++ b/proto/PlayerGameTimeNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 184 +// Obf: LHPHBCOAAJI message PlayerGameTimeNotify { uint32 game_time = 6; uint32 uid = 3; diff --git a/proto/PlayerGetForceQuitBanInfoReq.proto b/proto/PlayerGetForceQuitBanInfoReq.proto index d6ce7c80..b0521388 100644 --- a/proto/PlayerGetForceQuitBanInfoReq.proto +++ b/proto/PlayerGetForceQuitBanInfoReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4185 +// Obf: JGGJABGBLMP message PlayerGetForceQuitBanInfoReq { } diff --git a/proto/PlayerGetForceQuitBanInfoRsp.proto b/proto/PlayerGetForceQuitBanInfoRsp.proto index fae233d2..feeb7132 100644 --- a/proto/PlayerGetForceQuitBanInfoRsp.proto +++ b/proto/PlayerGetForceQuitBanInfoRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4181 +// Obf: JGAHMLNHPLE message PlayerGetForceQuitBanInfoRsp { int32 retcode = 11; uint32 match_id = 6; diff --git a/proto/PlayerHomeCompInfo.proto b/proto/PlayerHomeCompInfo.proto index 21739f28..5587fefe 100644 --- a/proto/PlayerHomeCompInfo.proto +++ b/proto/PlayerHomeCompInfo.proto @@ -20,9 +20,10 @@ option java_package = "emu.grasscutter.net.proto"; import "FriendEnterHomeOption.proto"; +// Obf: KOGGBOKJHGO message PlayerHomeCompInfo { FriendEnterHomeOption friend_enter_home_option = 14; - repeated uint32 unlocked_module_id_list = 15; + repeated uint32 levelup_reward_got_level_list = 15; repeated uint32 seen_module_id_list = 2; - repeated uint32 levelup_reward_got_level_list = 1; + repeated uint32 unlocked_module_id_list = 1; } diff --git a/proto/PlayerHomeCompInfoNotify.proto b/proto/PlayerHomeCompInfoNotify.proto index d6ba1fbf..ffad863e 100644 --- a/proto/PlayerHomeCompInfoNotify.proto +++ b/proto/PlayerHomeCompInfoNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "PlayerHomeCompInfo.proto"; // CmdId: 4769 +// Obf: CBGMFLDFHFN message PlayerHomeCompInfoNotify { PlayerHomeCompInfo comp_info = 14; } diff --git a/proto/PlayerInvestigationAllInfoNotify.proto b/proto/PlayerInvestigationAllInfoNotify.proto index ac0892f4..cb1c0337 100644 --- a/proto/PlayerInvestigationAllInfoNotify.proto +++ b/proto/PlayerInvestigationAllInfoNotify.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Investigation.proto"; import "InvestigationTarget.proto"; // CmdId: 1919 +// Obf: CHGDBPOCDKC message PlayerInvestigationAllInfoNotify { repeated Investigation investigation_list = 11; repeated InvestigationTarget investigation_target_list = 12; diff --git a/proto/PlayerInvestigationNotify.proto b/proto/PlayerInvestigationNotify.proto index 26dfe4f7..eacd8687 100644 --- a/proto/PlayerInvestigationNotify.proto +++ b/proto/PlayerInvestigationNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Investigation.proto"; // CmdId: 1909 +// Obf: CCDOCNOPOMC message PlayerInvestigationNotify { repeated Investigation investigation_list = 6; } diff --git a/proto/PlayerInvestigationTargetNotify.proto b/proto/PlayerInvestigationTargetNotify.proto index fa31f1c0..1fa17639 100644 --- a/proto/PlayerInvestigationTargetNotify.proto +++ b/proto/PlayerInvestigationTargetNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "InvestigationTarget.proto"; // CmdId: 1927 +// Obf: NMHPHAJMFGP message PlayerInvestigationTargetNotify { repeated InvestigationTarget investigation_target_list = 12; } diff --git a/proto/PlayerLevelRewardUpdateNotify.proto b/proto/PlayerLevelRewardUpdateNotify.proto index 60c3f18f..60b030df 100644 --- a/proto/PlayerLevelRewardUpdateNotify.proto +++ b/proto/PlayerLevelRewardUpdateNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 109 +// Obf: JNNKIPADMND message PlayerLevelRewardUpdateNotify { repeated uint32 level_list = 9; } diff --git a/proto/PlayerLocationInfo.proto b/proto/PlayerLocationInfo.proto index 6f1a8ff7..f0591c4b 100644 --- a/proto/PlayerLocationInfo.proto +++ b/proto/PlayerLocationInfo.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; +// Obf: AHLIHONCKCL message PlayerLocationInfo { Vector rot = 8; uint32 uid = 15; diff --git a/proto/PlayerLoginReq.proto b/proto/PlayerLoginReq.proto index c0f6c106..8b21f81a 100644 --- a/proto/PlayerLoginReq.proto +++ b/proto/PlayerLoginReq.proto @@ -22,9 +22,10 @@ option java_package = "emu.grasscutter.net.proto"; import "TrackingIOInfo.proto"; import "AdjustTrackingInfo.proto"; // CmdId: 102 +// Obf: NFMLOOMMIKN message PlayerLoginReq { uint32 account_type = 35; - string PICJKDBKFEL = 405; + string FHMBGHEMDLJ = 405; uint32 tag = 383; string device_info = 14; uint32 target_home_owner_uid = 1446; @@ -33,12 +34,12 @@ message PlayerLoginReq { bytes environment_error_code = 1199; uint32 target_uid = 12; uint32 channel_id = 1569; - string JHCMOKKNHDH = 1202; + string OCDJHHBMIDG = 1202; uint64 login_rand = 11; bytes security_cmd_reply = 592; - uint32 OFBJDBPPFBB = 499; + uint32 EOFMJLNBLJC = 499; string token = 15; - uint32 DPCBKHKCMFH = 726; + uint32 NPMKPHCKPDF = 726; uint32 gm_uid = 889; TrackingIOInfo tracking_io_info = 144; uint32 platform_type = 8; @@ -47,13 +48,13 @@ message PlayerLoginReq { string client_version = 9; uint32 reg_platform = 1174; string account_uid = 7; - string EKGDNJGCMON = 1919; + string EMAFAFPOGEE = 1919; bytes extra_bin_data = 457; string online_id = 1855; string system_version = 10; string device_name = 5; - string OIILEDKOONG = 166; - uint32 PFGGPBJAEHB = 1863; + string FMHKKHBHIOB = 166; + uint32 HMEKOBCAMLL = 1863; AdjustTrackingInfo adjust_tracking_info = 1003; string checksum = 178; bool is_transfer = 219; @@ -65,5 +66,5 @@ message PlayerLoginReq { string checksum_client_version = 1087; string psn_id = 1335; string country_code = 1696; - uint32 CDBPHMJGBBB = 1116; + uint32 OPHCJKGDHMJ = 1116; } diff --git a/proto/PlayerLoginRsp.proto b/proto/PlayerLoginRsp.proto index ba37a024..9f400867 100644 --- a/proto/PlayerLoginRsp.proto +++ b/proto/PlayerLoginRsp.proto @@ -24,13 +24,14 @@ import "ShortAbilityHashPair.proto"; import "ResVersionConfig.proto"; import "BlockInfo.proto"; // CmdId: 172 +// Obf: EGNJOBMKBHK message PlayerLoginRsp { int32 retcode = 15; string next_resource_url = 163; int32 ability_hash_code = 14; string client_version_suffix = 1903; - bool MBNHICHODLK = 7; - bytes HMHJKNGKBDN = 136; + bool NENMBLFJAMC = 7; + bytes playerData = 136; string client_md5 = 715; string game_biz = 10; repeated FeatureBlockInfo feature_block_info_list = 114; @@ -39,10 +40,10 @@ message PlayerLoginRsp { repeated ShortAbilityHashPair short_ability_hash_map = 130; bool is_use_ability_hash = 11; bool is_transfer = 705; - bool LNOKNOGHPOI = 902; + bool ALCEGKPMOHB = 902; bool is_audit = 997; - ResVersionConfig next_res_version_config = 1912; - ResVersionConfig res_version_config = 915; + ResVersionConfig res_version_config = 1912; + ResVersionConfig next_res_version_config = 915; string client_silence_version_suffix = 702; uint32 target_home_owner_uid = 1909; string client_silence_md5 = 1123; @@ -50,14 +51,14 @@ message PlayerLoginRsp { bool is_sc_open = 1908; map ability_hash_map = 8; bool is_data_need_relogin = 252; - bool AMEPHJJIOFL = 1209; + bool GIKDHIDHBEE = 1209; uint64 login_rand = 9; string birthday = 383; double total_tick_time = 903; string country_code = 1280; uint32 client_data_version = 4; - bytes sc_info = 3; - bool LKPBJJJPLIM = 13; + bytes scInfo = 3; + bool GPMHJGJLAFH = 13; uint32 client_silence_data_version = 6; uint32 player_data_version = 2; } diff --git a/proto/PlayerPropChangeNotify.proto b/proto/PlayerPropChangeNotify.proto index 0af97223..f61a429b 100644 --- a/proto/PlayerPropChangeNotify.proto +++ b/proto/PlayerPropChangeNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 188 +// Obf: NMMNNPCFPKN message PlayerPropChangeNotify { uint32 prop_type = 8; uint32 prop_delta = 5; diff --git a/proto/PlayerPropChangeReasonNotify.proto b/proto/PlayerPropChangeReasonNotify.proto index b64b868e..709e3be7 100644 --- a/proto/PlayerPropChangeReasonNotify.proto +++ b/proto/PlayerPropChangeReasonNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "PropChangeReason.proto"; // CmdId: 1230 +// Obf: OEDIGGOJKGL message PlayerPropChangeReasonNotify { PropChangeReason reason = 6; uint32 prop_type = 5; diff --git a/proto/PlayerPropNotify.proto b/proto/PlayerPropNotify.proto index 8d8e0e18..2792c2ee 100644 --- a/proto/PlayerPropNotify.proto +++ b/proto/PlayerPropNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "PropValue.proto"; // CmdId: 164 +// Obf: GONAPELADMF message PlayerPropNotify { map prop_map = 8; } diff --git a/proto/PlayerQuitDungeonReq.proto b/proto/PlayerQuitDungeonReq.proto index 43900cba..1e7b1428 100644 --- a/proto/PlayerQuitDungeonReq.proto +++ b/proto/PlayerQuitDungeonReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 955 +// Obf: HGDHINONLCB message PlayerQuitDungeonReq { bool is_quit_immediately = 8; uint32 point_id = 4; diff --git a/proto/PlayerRTTInfo.proto b/proto/PlayerRTTInfo.proto index a5f6ff33..4b8fea3d 100644 --- a/proto/PlayerRTTInfo.proto +++ b/proto/PlayerRTTInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: BINJAMDAACF message PlayerRTTInfo { uint32 uid = 11; uint32 rtt = 1; diff --git a/proto/PlayerSetPauseReq.proto b/proto/PlayerSetPauseReq.proto index bc4cede3..0f1bdc91 100644 --- a/proto/PlayerSetPauseReq.proto +++ b/proto/PlayerSetPauseReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 171 +// Obf: HMKAEACPFJM message PlayerSetPauseReq { bool is_paused = 11; } diff --git a/proto/PlayerSetPauseRsp.proto b/proto/PlayerSetPauseRsp.proto index ab702415..f86e152b 100644 --- a/proto/PlayerSetPauseRsp.proto +++ b/proto/PlayerSetPauseRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 149 +// Obf: IGMIFEKGJNK message PlayerSetPauseRsp { int32 retcode = 4; } diff --git a/proto/PlayerStoreNotify.proto b/proto/PlayerStoreNotify.proto index c1a3c47e..1b01e6b5 100644 --- a/proto/PlayerStoreNotify.proto +++ b/proto/PlayerStoreNotify.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Item.proto"; import "StoreType.proto"; // CmdId: 675 +// Obf: HGPCEKDICPC message PlayerStoreNotify { uint32 weight_limit = 15; repeated Item item_list = 10; diff --git a/proto/PlayerTimeNotify.proto b/proto/PlayerTimeNotify.proto index d6906561..650049a4 100644 --- a/proto/PlayerTimeNotify.proto +++ b/proto/PlayerTimeNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 111 +// Obf: GGKAHPHPKKE message PlayerTimeNotify { uint64 player_time = 2; bool is_paused = 3; diff --git a/proto/PlayerWidgetInfo.proto b/proto/PlayerWidgetInfo.proto index d7f77148..3380e4d7 100644 --- a/proto/PlayerWidgetInfo.proto +++ b/proto/PlayerWidgetInfo.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "WidgetSlotData.proto"; +// Obf: GOKMIMMNPFK message PlayerWidgetInfo { uint32 uid = 13; repeated WidgetSlotData slot_list = 14; diff --git a/proto/PlayerWorldLocationInfo.proto b/proto/PlayerWorldLocationInfo.proto index 46777bec..c6dad29f 100644 --- a/proto/PlayerWorldLocationInfo.proto +++ b/proto/PlayerWorldLocationInfo.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "PlayerLocationInfo.proto"; +// Obf: GLMHEOCDHBH message PlayerWorldLocationInfo { PlayerLocationInfo player_loc = 2; uint32 scene_id = 7; diff --git a/proto/PlayerWorldSceneInfo.proto b/proto/PlayerWorldSceneInfo.proto index 9a0d01ce..91c60d90 100644 --- a/proto/PlayerWorldSceneInfo.proto +++ b/proto/PlayerWorldSceneInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: IGFHEIKIJAO message PlayerWorldSceneInfo { uint32 scene_id = 2; repeated uint32 scene_tag_id_list = 11; diff --git a/proto/PlayerWorldSceneInfoListNotify.proto b/proto/PlayerWorldSceneInfoListNotify.proto index e34ed3b3..31bffbd4 100644 --- a/proto/PlayerWorldSceneInfoListNotify.proto +++ b/proto/PlayerWorldSceneInfoListNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "PlayerWorldSceneInfo.proto"; // CmdId: 3422 +// Obf: BJMKMMHILOB message PlayerWorldSceneInfoListNotify { repeated PlayerWorldSceneInfo info_list = 12; } diff --git a/proto/PostEnterSceneReq.proto b/proto/PostEnterSceneReq.proto index 32551557..067aa7c8 100644 --- a/proto/PostEnterSceneReq.proto +++ b/proto/PostEnterSceneReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 3242 +// Obf: OKINGAGKEDD message PostEnterSceneReq { uint32 enter_scene_token = 4; } diff --git a/proto/PostEnterSceneRsp.proto b/proto/PostEnterSceneRsp.proto index d8472947..b1cbaae9 100644 --- a/proto/PostEnterSceneRsp.proto +++ b/proto/PostEnterSceneRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 3474 +// Obf: JKJOIOIIFID message PostEnterSceneRsp { int32 retcode = 10; uint32 enter_scene_token = 5; diff --git a/proto/PotionActivityDetailInfo.proto b/proto/PotionActivityDetailInfo.proto new file mode 100644 index 00000000..4623cfbc --- /dev/null +++ b/proto/PotionActivityDetailInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "PotionStageData.proto"; +// Obf: DPNFNNKEEOP +message PotionActivityDetailInfo { + repeated PotionStageData stage_list = 4; +} diff --git a/proto/PotionAvatarInfo.proto b/proto/PotionAvatarInfo.proto index 7ab43faf..74707868 100644 --- a/proto/PotionAvatarInfo.proto +++ b/proto/PotionAvatarInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: EGFDGFANNGN message PotionAvatarInfo { uint64 avatar_id = 7; bool is_trial = 10; diff --git a/proto/PotionDungeonResultInfo.proto b/proto/PotionDungeonResultInfo.proto new file mode 100644 index 00000000..552dee58 --- /dev/null +++ b/proto/PotionDungeonResultInfo.proto @@ -0,0 +1,30 @@ +// 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: IOJHPHOFDNC +message PotionDungeonResultInfo { + uint32 final_score = 1; + uint32 mode_id = 2; + uint32 level_id = 6; + uint32 stage_id = 4; + uint32 difficulty_level = 8; + uint32 left_time = 14; +} diff --git a/proto/PotionLevelData.proto b/proto/PotionLevelData.proto new file mode 100644 index 00000000..7156a78c --- /dev/null +++ b/proto/PotionLevelData.proto @@ -0,0 +1,28 @@ +// 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: BAAOONGJGNO +message PotionLevelData { + uint32 level_id = 14; + uint32 difficulty_level = 11; + uint32 mode_id = 9; + uint32 score = 7; +} diff --git a/proto/PotionStageData.proto b/proto/PotionStageData.proto new file mode 100644 index 00000000..13a8180c --- /dev/null +++ b/proto/PotionStageData.proto @@ -0,0 +1,30 @@ +// 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 "PotionLevelData.proto"; +// Obf: NPKFDGPCMMK +message PotionStageData { + repeated PotionLevelData level_list = 3; + repeated uint32 OPPNDAHKFHF = 7; + bool is_open = 9; + uint32 stage_id = 14; + repeated uint32 OCBJDGFPCEP = 8; +} diff --git a/proto/PrivateChatNotify.proto b/proto/PrivateChatNotify.proto index 4af2afc2..eec67cd9 100644 --- a/proto/PrivateChatNotify.proto +++ b/proto/PrivateChatNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ChatInfo.proto"; // CmdId: 4952 +// Obf: EMJIAEBHGFP message PrivateChatNotify { ChatInfo chat_info = 9; } diff --git a/proto/PrivateChatReq.proto b/proto/PrivateChatReq.proto index cf5eb994..152ed3c6 100644 --- a/proto/PrivateChatReq.proto +++ b/proto/PrivateChatReq.proto @@ -20,10 +20,11 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 5025 +// Obf: ILJNAECHFLC message PrivateChatReq { uint32 target_uid = 2; oneof content { - string icon = 4; - uint32 text = 5; + string text = 4; + uint32 icon = 5; } } diff --git a/proto/ProfilePicture.proto b/proto/ProfilePicture.proto index d6109bcc..3870d1fc 100644 --- a/proto/ProfilePicture.proto +++ b/proto/ProfilePicture.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: ECNCPJCKFAE message ProfilePicture { uint32 avatar_id = 1; uint32 costume_id = 2; diff --git a/proto/ProfilePictureChangeNotify.proto b/proto/ProfilePictureChangeNotify.proto index fc600d7d..2859a588 100644 --- a/proto/ProfilePictureChangeNotify.proto +++ b/proto/ProfilePictureChangeNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ProfilePicture.proto"; // CmdId: 4074 +// Obf: BACBAKKDEGF message ProfilePictureChangeNotify { ProfilePicture profile_picture = 4; } diff --git a/proto/PropChangeReason.proto b/proto/PropChangeReason.proto index c539d0c1..5787ce6f 100644 --- a/proto/PropChangeReason.proto +++ b/proto/PropChangeReason.proto @@ -1,23 +1,38 @@ +// 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"; -// Name: MFDDAHPDKOD +// Obf: PGCOKALJOJB enum PropChangeReason { - PROP_CHANGE_REASON_NONE = 0; - PROP_CHANGE_REASON_STATUE_RECOVER = 1; - PROP_CHANGE_REASON_ENERGY_BALL = 2; - PROP_CHANGE_REASON_ABILITY = 3; - PROP_CHANGE_REASON_LEVELUP = 4; - PROP_CHANGE_REASON_ITEM = 5; - PROP_CHANGE_REASON_AVATAR_CARD = 6; - PROP_CHANGE_REASON_CITY_LEVELUP = 7; - PROP_CHANGE_REASON_AVATAR_UPGRADE = 8; - PROP_CHANGE_REASON_AVATAR_PROMOTE = 9; - PROP_CHANGE_REASON_PLAYER_ADD_EXP = 10; - PROP_CHANGE_REASON_FINISH_QUEST = 11; - PROP_CHANGE_REASON_GM = 12; - PROP_CHANGE_REASON_MANUAL_ADJUST_WORLD_LEVEL = 13; + PROP_CHANGE_REASON_NONE = 0; + PROP_CHANGE_REASON_STATUE_RECOVER = 1; + PROP_CHANGE_REASON_ENERGY_BALL = 2; + PROP_CHANGE_REASON_ABILITY = 3; + PROP_CHANGE_REASON_LEVELUP = 4; + PROP_CHANGE_REASON_ITEM = 5; + PROP_CHANGE_REASON_AVATAR_CARD = 6; + PROP_CHANGE_REASON_CITY_LEVELUP = 7; + PROP_CHANGE_REASON_AVATAR_UPGRADE = 8; + PROP_CHANGE_REASON_AVATAR_PROMOTE = 9; + PROP_CHANGE_REASON_PLAYER_ADD_EXP = 10; + PROP_CHANGE_REASON_FINISH_QUEST = 11; + PROP_CHANGE_REASON_GM = 12; + PROP_CHANGE_REASON_MANUAL_ADJUST_WORLD_LEVEL = 13; } - diff --git a/proto/PropPair.proto b/proto/PropPair.proto index 0feb1508..ab3f06bf 100644 --- a/proto/PropPair.proto +++ b/proto/PropPair.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "PropValue.proto"; +// Obf: NIJPPOKHJEH message PropPair { uint32 type = 1; PropValue prop_value = 2; diff --git a/proto/PropValue.proto b/proto/PropValue.proto index 9a880373..c8e0b018 100644 --- a/proto/PropValue.proto +++ b/proto/PropValue.proto @@ -1,15 +1,30 @@ +// 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"; -// Name: PAPLIDJPGCN +// Obf: PFAKCFKJKIC message PropValue { - uint32 type = 1; - int64 val = 4; - oneof value { - int64 ival = 2; - float fval = 3; - } + uint32 type = 1; + int64 val = 4; + oneof value { + int64 ival = 2; + float fval = 3; + } } - diff --git a/proto/ProtEntityType.proto b/proto/ProtEntityType.proto index 8e7723df..3681f3ee 100644 --- a/proto/ProtEntityType.proto +++ b/proto/ProtEntityType.proto @@ -1,9 +1,25 @@ +// 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"; -// Name: BBAHHNMJMJH +// Obf: KLLMIOGKNNI enum ProtEntityType { PROT_ENTITY_TYPE_NONE = 0; PROT_ENTITY_TYPE_AVATAR = 1; @@ -21,4 +37,3 @@ enum ProtEntityType { PROT_ENTITY_TYPE_EYE_POINT = 13; PROT_ENTITY_TYPE_MAX = 14; } - diff --git a/proto/ProudSkillChangeNotify.proto b/proto/ProudSkillChangeNotify.proto index 75be2821..cc7daad9 100644 --- a/proto/ProudSkillChangeNotify.proto +++ b/proto/ProudSkillChangeNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1084 +// Obf: EMABHKGFJMF message ProudSkillChangeNotify { uint32 entity_id = 15; uint64 avatar_guid = 11; diff --git a/proto/ProudSkillExtraLevelNotify.proto b/proto/ProudSkillExtraLevelNotify.proto index 5d533a90..ea8fd318 100644 --- a/proto/ProudSkillExtraLevelNotify.proto +++ b/proto/ProudSkillExtraLevelNotify.proto @@ -20,9 +20,10 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1094 +// Obf: GCKJMOIPFPE message ProudSkillExtraLevelNotify { - uint32 extra_level = 12; - uint32 talent_type = 5; + uint32 talent_index = 12; + uint32 extra_level = 5; uint64 avatar_guid = 13; - uint32 talent_index = 6; + uint32 talent_type = 6; } diff --git a/proto/PullPrivateChatReq.proto b/proto/PullPrivateChatReq.proto index 0ba1f662..a31274c1 100644 --- a/proto/PullPrivateChatReq.proto +++ b/proto/PullPrivateChatReq.proto @@ -20,8 +20,9 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4998 +// Obf: IKHNPDPBFIG message PullPrivateChatReq { uint32 target_uid = 12; - uint32 MAOLHGABAAF = 8; - uint32 KKIEADODDCN = 11; + uint32 from_sequence = 8; + uint32 pull_num = 11; } diff --git a/proto/PullPrivateChatRsp.proto b/proto/PullPrivateChatRsp.proto index e7526b34..22ebbbd7 100644 --- a/proto/PullPrivateChatRsp.proto +++ b/proto/PullPrivateChatRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ChatInfo.proto"; // CmdId: 5008 +// Obf: IFGLPJOKPOE message PullPrivateChatRsp { repeated ChatInfo chat_info = 12; int32 retcode = 2; diff --git a/proto/PullRecentChatReq.proto b/proto/PullRecentChatReq.proto index 630df1b9..b0500d8f 100644 --- a/proto/PullRecentChatReq.proto +++ b/proto/PullRecentChatReq.proto @@ -20,7 +20,8 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4985 +// Obf: AGIBPLMCLFN message PullRecentChatReq { - uint32 MGNHCHJBMAH = 7; - uint32 KKIEADODDCN = 3; + uint32 begin_sequence = 7; + uint32 pull_num = 3; } diff --git a/proto/PullRecentChatRsp.proto b/proto/PullRecentChatRsp.proto index 46565131..cae40b30 100644 --- a/proto/PullRecentChatRsp.proto +++ b/proto/PullRecentChatRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ChatInfo.proto"; // CmdId: 5037 +// Obf: COBHBCIEBCF message PullRecentChatRsp { int32 retcode = 10; repeated ChatInfo chat_info = 14; diff --git a/proto/QueryCodexMonsterBeKilledNumReq.proto b/proto/QueryCodexMonsterBeKilledNumReq.proto index 3eb56c6f..a0ee512f 100644 --- a/proto/QueryCodexMonsterBeKilledNumReq.proto +++ b/proto/QueryCodexMonsterBeKilledNumReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4208 +// Obf: PMNPCHBJJAP message QueryCodexMonsterBeKilledNumReq { repeated uint32 codex_id_list = 2; } diff --git a/proto/QueryCodexMonsterBeKilledNumRsp.proto b/proto/QueryCodexMonsterBeKilledNumRsp.proto index 16bfa34f..a35f822b 100644 --- a/proto/QueryCodexMonsterBeKilledNumRsp.proto +++ b/proto/QueryCodexMonsterBeKilledNumRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4210 +// Obf: HPIAAICHPHD message QueryCodexMonsterBeKilledNumRsp { repeated uint32 be_captured_num_list = 1; repeated uint32 be_killed_num_list = 12; diff --git a/proto/QueryCurrRegionHttpRsp.proto b/proto/QueryCurrRegionHttpRsp.proto index 9d88b7ab..2e692658 100644 --- a/proto/QueryCurrRegionHttpRsp.proto +++ b/proto/QueryCurrRegionHttpRsp.proto @@ -1,23 +1,38 @@ +// 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 "ForceUpdateInfo.proto"; + import "RegionInfo.proto"; +import "ForceUpdateInfo.proto"; import "StopServerInfo.proto"; - -// Name: KDAEKECNJGG +// Obf: EBEJJGCKFNF message QueryCurrRegionHttpRsp { - int32 retcode = 1; - string msg = 2; - RegionInfo region_info = 3; - bytes client_secret_key = 11; - bytes region_custom_config_encrypted = 12; - bytes client_region_custom_config_encrypted = 13; - string FPLPGEGEJJM = 14; - oneof detail { - ForceUpdateInfo force_update = 4; - StopServerInfo stop_server = 5; - } + int32 retcode = 1; + string msg = 2; + RegionInfo region_info = 3; + bytes client_secret_key = 11; + bytes region_custom_config_encrypted = 12; + bytes client_region_custom_config_encrypted = 13; + string AKEBLCKKHJK = 14; + oneof detail { + ForceUpdateInfo force_update = 4; + StopServerInfo stop_server = 5; + } } - diff --git a/proto/QueryFilter.proto b/proto/QueryFilter.proto new file mode 100644 index 00000000..42a3d28e --- /dev/null +++ b/proto/QueryFilter.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +// Obf: FOFMOHPPKPO +message QueryFilter { + int32 DHGFHBFCGOL = 10; + int32 HFJNAAGCKFJ = 3; +} diff --git a/proto/QueryPathReq.proto b/proto/QueryPathReq.proto index ba28e756..5ce768a7 100644 --- a/proto/QueryPathReq.proto +++ b/proto/QueryPathReq.proto @@ -19,23 +19,25 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "FOFMOHPPKPO.proto"; +import "QueryFilter.proto"; import "Vector3Int.proto"; import "Vector.proto"; // CmdId: 2375 +// Obf: NEHFAPFJMDE message QueryPathReq { - enum CHNMLGAIJDL { - OptionNone = 0; - OptionNormal = 1; - OptionFirstCanGo = 2; + // Obf: CHNMLGAIJDL + enum OptionType { + OPTION_NONE = 0; + OPTION_NORMAL = 1; + OPTION_FIRST_CAN_GO = 2; } - FOFMOHPPKPO DNENHNOGAJN = 8; - Vector3Int FMALKPNLFIE = 10; + QueryFilter filter = 8; + Vector3Int COBIGJHHLJJ = 10; Vector source_pos = 12; int32 query_id = 5; - CHNMLGAIJDL PPENFPGIFFL = 4; + OptionType query_type = 4; repeated Vector destination_pos = 14; - Vector3Int CDJMADILEBN = 15; + Vector3Int OCDLHELPCKN = 15; uint32 scene_id = 11; } diff --git a/proto/QueryPathRsp.proto b/proto/QueryPathRsp.proto index a5104143..d18961d2 100644 --- a/proto/QueryPathRsp.proto +++ b/proto/QueryPathRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "PathStatusType.proto"; import "Vector.proto"; // CmdId: 2396 +// Obf: MMGFDHKGJPM message QueryPathRsp { PathStatusType query_status = 2; int32 retcode = 3; diff --git a/proto/QueryRegionListHttpRsp.proto b/proto/QueryRegionListHttpRsp.proto index a9f91f83..94b341af 100644 --- a/proto/QueryRegionListHttpRsp.proto +++ b/proto/QueryRegionListHttpRsp.proto @@ -1,15 +1,30 @@ +// 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 "RegionSimpleInfo.proto"; - -// Name: BHOFPAFHBIE +// Obf: IGDHIBNDKBO message QueryRegionListHttpRsp { - int32 retcode = 1; - repeated RegionSimpleInfo region_list = 2; - bytes client_secret_key = 5; - bytes client_custom_config_encrypted = 6; - bool enable_login_pc = 7; + int32 retcode = 1; + repeated RegionSimpleInfo region_list = 2; + bytes client_secret_key = 5; + bytes client_custom_config_encrypted = 6; + bool enable_login_pc = 7; } - diff --git a/proto/Quest.proto b/proto/Quest.proto index 3fca1828..19599cc8 100644 --- a/proto/Quest.proto +++ b/proto/Quest.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: LGKNABFOEKJ message Quest { uint32 quest_id = 1; uint32 state = 2; diff --git a/proto/QuestCreateEntityReq.proto b/proto/QuestCreateEntityReq.proto index e1e24efc..280480ce 100644 --- a/proto/QuestCreateEntityReq.proto +++ b/proto/QuestCreateEntityReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "CreateEntityInfo.proto"; // CmdId: 430 +// Obf: BBJKMAIOOLD message QuestCreateEntityReq { bool is_rewind = 12; uint32 quest_id = 15; diff --git a/proto/QuestCreateEntityRsp.proto b/proto/QuestCreateEntityRsp.proto index da0cdcc4..210f8cbc 100644 --- a/proto/QuestCreateEntityRsp.proto +++ b/proto/QuestCreateEntityRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "CreateEntityInfo.proto"; // CmdId: 484 +// Obf: OFKELNHNCGE message QuestCreateEntityRsp { uint32 parent_quest_id = 14; bool is_rewind = 8; diff --git a/proto/QuestDelNotify.proto b/proto/QuestDelNotify.proto index 6735830b..d2d35074 100644 --- a/proto/QuestDelNotify.proto +++ b/proto/QuestDelNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 402 +// Obf: IJMJIMCHBHG message QuestDelNotify { uint32 quest_id = 12; } diff --git a/proto/QuestDestroyEntityReq.proto b/proto/QuestDestroyEntityReq.proto index d01c61d0..414739da 100644 --- a/proto/QuestDestroyEntityReq.proto +++ b/proto/QuestDestroyEntityReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 464 +// Obf: IEOGBDBICAI message QuestDestroyEntityReq { uint32 scene_id = 9; uint32 quest_id = 8; diff --git a/proto/QuestDestroyEntityRsp.proto b/proto/QuestDestroyEntityRsp.proto index b5c593c9..0eb6b341 100644 --- a/proto/QuestDestroyEntityRsp.proto +++ b/proto/QuestDestroyEntityRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 421 +// Obf: JNNIADAIGHF message QuestDestroyEntityRsp { uint32 scene_id = 15; int32 retcode = 11; diff --git a/proto/QuestDestroyNpcReq.proto b/proto/QuestDestroyNpcReq.proto index 281d3b46..8d9303a1 100644 --- a/proto/QuestDestroyNpcReq.proto +++ b/proto/QuestDestroyNpcReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 406 +// Obf: HCHIKGMAOBA message QuestDestroyNpcReq { uint32 parent_quest_id = 8; uint32 npc_id = 10; diff --git a/proto/QuestDestroyNpcRsp.proto b/proto/QuestDestroyNpcRsp.proto index a0915b28..28cdb1f5 100644 --- a/proto/QuestDestroyNpcRsp.proto +++ b/proto/QuestDestroyNpcRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 433 +// Obf: NJGLMNLBNKD message QuestDestroyNpcRsp { uint32 npc_id = 13; uint32 parent_quest_id = 2; diff --git a/proto/QuestGlobalVar.proto b/proto/QuestGlobalVar.proto index f6a358e5..8587c527 100644 --- a/proto/QuestGlobalVar.proto +++ b/proto/QuestGlobalVar.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: ADPDFNABDCI message QuestGlobalVar { int32 value = 13; uint32 key = 8; diff --git a/proto/QuestGlobalVarNotify.proto b/proto/QuestGlobalVarNotify.proto index ed5d182a..78183b19 100644 --- a/proto/QuestGlobalVarNotify.proto +++ b/proto/QuestGlobalVarNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "QuestGlobalVar.proto"; // CmdId: 403 +// Obf: BICAFJINAPH message QuestGlobalVarNotify { repeated QuestGlobalVar var_list = 12; } diff --git a/proto/QuestListNotify.proto b/proto/QuestListNotify.proto index 6ce9b06e..8a2513fc 100644 --- a/proto/QuestListNotify.proto +++ b/proto/QuestListNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Quest.proto"; // CmdId: 475 +// Obf: PKOLNCFFINJ message QuestListNotify { repeated Quest quest_list = 11; } diff --git a/proto/QuestListUpdateNotify.proto b/proto/QuestListUpdateNotify.proto index 02d9b603..be63b365 100644 --- a/proto/QuestListUpdateNotify.proto +++ b/proto/QuestListUpdateNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Quest.proto"; // CmdId: 496 +// Obf: HFGOKLHAEPB message QuestListUpdateNotify { repeated Quest quest_list = 5; } diff --git a/proto/QuestProgressUpdateNotify.proto b/proto/QuestProgressUpdateNotify.proto index 11ec5f88..be4ca5e2 100644 --- a/proto/QuestProgressUpdateNotify.proto +++ b/proto/QuestProgressUpdateNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 428 +// Obf: DFKPLKPAEJP message QuestProgressUpdateNotify { uint32 quest_id = 11; repeated uint32 finish_progress_list = 1; diff --git a/proto/QuestRenameAvatarReq.proto b/proto/QuestRenameAvatarReq.proto index bdc7fec0..b7a334c9 100644 --- a/proto/QuestRenameAvatarReq.proto +++ b/proto/QuestRenameAvatarReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 417 +// Obf: MJJNFPDAEJC message QuestRenameAvatarReq { bool is_check = 4; uint32 rename_id = 8; diff --git a/proto/QuestRenameAvatarRsp.proto b/proto/QuestRenameAvatarRsp.proto index cc2b1eeb..edfbd8db 100644 --- a/proto/QuestRenameAvatarRsp.proto +++ b/proto/QuestRenameAvatarRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 497 +// Obf: GEONAMCBPDO message QuestRenameAvatarRsp { bool is_check = 15; uint32 rename_id = 4; diff --git a/proto/QuestTransmitReq.proto b/proto/QuestTransmitReq.proto index 989c99d2..d0a3df1e 100644 --- a/proto/QuestTransmitReq.proto +++ b/proto/QuestTransmitReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 442 +// Obf: NBIBEFFJOJP message QuestTransmitReq { uint32 quest_id = 8; uint32 point_id = 13; diff --git a/proto/QuestTransmitRsp.proto b/proto/QuestTransmitRsp.proto index f70cf8b5..0ed20bab 100644 --- a/proto/QuestTransmitRsp.proto +++ b/proto/QuestTransmitRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 407 +// Obf: MDDOBAJAHDH message QuestTransmitRsp { uint32 point_id = 12; uint32 quest_id = 7; diff --git a/proto/QuestUpdateQuestTimeVarNotify.proto b/proto/QuestUpdateQuestTimeVarNotify.proto index 2fc373e8..aa566b8c 100644 --- a/proto/QuestUpdateQuestTimeVarNotify.proto +++ b/proto/QuestUpdateQuestTimeVarNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 449 +// Obf: FFMNPJJJCDK message QuestUpdateQuestTimeVarNotify { map time_var_map = 5; uint32 parent_quest_id = 4; diff --git a/proto/QuestUpdateQuestVarNotify.proto b/proto/QuestUpdateQuestVarNotify.proto index dd17c7d0..9629d54e 100644 --- a/proto/QuestUpdateQuestVarNotify.proto +++ b/proto/QuestUpdateQuestVarNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 468 +// Obf: GFFPGFDCBIK message QuestUpdateQuestVarNotify { repeated int32 quest_var = 15; uint32 parent_quest_id = 14; diff --git a/proto/QuestUpdateQuestVarReq.proto b/proto/QuestUpdateQuestVarReq.proto index 033b6d7a..ee06c288 100644 --- a/proto/QuestUpdateQuestVarReq.proto +++ b/proto/QuestUpdateQuestVarReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "QuestVarOp.proto"; // CmdId: 438 +// Obf: JDNJONIOMEA message QuestUpdateQuestVarReq { uint32 parent_quest_var_seq = 11; uint32 parent_quest_id = 1; diff --git a/proto/QuestUpdateQuestVarRsp.proto b/proto/QuestUpdateQuestVarRsp.proto index 87ca0136..6f705a5f 100644 --- a/proto/QuestUpdateQuestVarRsp.proto +++ b/proto/QuestUpdateQuestVarRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 488 +// Obf: DDAOEAHEAEK message QuestUpdateQuestVarRsp { uint32 parent_quest_var_seq = 12; uint32 parent_quest_id = 5; diff --git a/proto/QuestVarOp.proto b/proto/QuestVarOp.proto index 6f835405..e51f8dac 100644 --- a/proto/QuestVarOp.proto +++ b/proto/QuestVarOp.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: MKOAOABANJO message QuestVarOp { int32 value = 14; bool is_add = 9; diff --git a/proto/QuickUseWidgetRsp.proto b/proto/QuickUseWidgetRsp.proto index 42ac0310..3ed02017 100644 --- a/proto/QuickUseWidgetRsp.proto +++ b/proto/QuickUseWidgetRsp.proto @@ -19,16 +19,17 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "LPLOENMNIOC.proto"; -import "NLEMHBCLPLJ.proto"; -import "GECIONGCJJF.proto"; +import "OneoffGatherPointDetectorData.proto"; +import "ClientCollectorData.proto"; +import "SkyCrystalDetectorQuickUseResult.proto"; // CmdId: 4253 +// Obf: PIBILHMMMKA message QuickUseWidgetRsp { uint32 material_id = 9; int32 retcode = 5; oneof param { - LPLOENMNIOC OMHCCEGDIBI = 4; - NLEMHBCLPLJ LICBBNPMKBD = 11; - GECIONGCJJF ALLAIDPLMFC = 150503; + OneoffGatherPointDetectorData detector_data = 4; + ClientCollectorData client_collector_data = 11; + SkyCrystalDetectorQuickUseResult sky_crystal_detector_quick_use_result = 150503; } } diff --git a/proto/ReadMailNotify.proto b/proto/ReadMailNotify.proto index 28b3a58c..8da04187 100644 --- a/proto/ReadMailNotify.proto +++ b/proto/ReadMailNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1402 +// Obf: EIMKILMHOCI message ReadMailNotify { repeated uint32 mail_id_list = 6; } diff --git a/proto/ReadPrivateChatReq.proto b/proto/ReadPrivateChatReq.proto index 1efd43b1..fd8f5be4 100644 --- a/proto/ReadPrivateChatReq.proto +++ b/proto/ReadPrivateChatReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4980 +// Obf: CEBEFOJBCIE message ReadPrivateChatReq { uint32 target_uid = 1; } diff --git a/proto/RecordUsage.proto b/proto/RecordUsage.proto index 9b975324..95173a96 100644 --- a/proto/RecordUsage.proto +++ b/proto/RecordUsage.proto @@ -19,10 +19,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: MJDHHOAILGG enum RecordUsage { - RecordUsage_UgcRecordUsageNone = 0; - RecordUsage_UgcRecordUsageImport = 1; - RecordUsage_UgcRecordUsagePlay = 2; - RecordUsage_UgcRecordUsageTrial = 3; - RecordUsage_UgcRecordUsageCompare = 4; + UGC_RECORD_USAGE_NONE = 0; + UGC_RECORD_USAGE_IMPORT = 1; + UGC_RECORD_USAGE_PLAY = 2; + UGC_RECORD_USAGE_TRIAL = 3; + UGC_RECORD_USAGE_COMPARE = 4; } diff --git a/proto/RegionInfo.proto b/proto/RegionInfo.proto index 55a41900..dc0001ab 100644 --- a/proto/RegionInfo.proto +++ b/proto/RegionInfo.proto @@ -1,39 +1,54 @@ +// 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 "ResVersionConfig.proto"; - -// Name: ECJIHDDFOCO +// Obf: NBDGDBINJAH message RegionInfo { - string gateserver_ip = 1; - uint32 gateserver_port = 2; - string pay_callback_url = 3; - string area_type = 7; - string resource_url = 8; - string data_url = 9; - string feedback_url = 10; - string bulletin_url = 11; - string resource_url_bak = 12; - string data_url_bak = 13; - uint32 client_data_version = 14; - string handbook_url = 16; - uint32 client_silence_data_version = 18; - string client_data_md5 = 19; - string client_silence_data_md5 = 20; - ResVersionConfig res_version_config = 22; - bytes secret_key = 23; - string official_community_url = 24; - string client_version_suffix = 26; - string client_silence_version_suffix = 27; - bool use_gateserver_domain_name = 28; - string gateserver_domain_name = 29; - string user_center_url = 30; - string account_bind_url = 31; - string cdkey_url = 32; - string privacy_policy_url = 33; - string next_resource_url = 34; - ResVersionConfig next_res_version_config = 35; - string game_biz = 36; + string gateserver_ip = 1; + uint32 gateserver_port = 2; + string pay_callback_url = 3; + string area_type = 7; + string resource_url = 8; + string data_url = 9; + string feedback_url = 10; + string bulletin_url = 11; + string resource_url_bak = 12; + string data_url_bak = 13; + uint32 client_data_version = 14; + string handbook_url = 16; + uint32 client_silence_data_version = 18; + string client_data_md5 = 19; + string client_silence_data_md5 = 20; + ResVersionConfig res_version_config = 22; + bytes secret_key = 23; + string official_community_url = 24; + string client_version_suffix = 26; + string client_silence_version_suffix = 27; + bool use_gateserver_domain_name = 28; + string gateserver_domain_name = 29; + string user_center_url = 30; + string account_bind_url = 31; + string cdkey_url = 32; + string privacy_policy_url = 33; + string next_resource_url = 34; + ResVersionConfig next_res_version_config = 35; + string game_biz = 36; } - diff --git a/proto/RegionSimpleInfo.proto b/proto/RegionSimpleInfo.proto index 9b2c1d9e..b7679ce2 100644 --- a/proto/RegionSimpleInfo.proto +++ b/proto/RegionSimpleInfo.proto @@ -1,13 +1,28 @@ +// 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"; -// Name: PNCGEFDNHHF +// Obf: BODMEBNADPL message RegionSimpleInfo { - string name = 1; - string title = 2; - string type = 3; - string dispatch_url = 4; + string name = 1; + string title = 2; + string type = 3; + string dispatch_url = 4; } - diff --git a/proto/Reliquary.proto b/proto/Reliquary.proto index 9bfa343d..d92a3bb8 100644 --- a/proto/Reliquary.proto +++ b/proto/Reliquary.proto @@ -1,14 +1,29 @@ +// 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"; -// Name: BAADGLFOHPI +// Obf: IEFNJJOADGD message Reliquary { - uint32 level = 1; - uint32 exp = 2; - uint32 promote_level = 3; - uint32 main_prop_id = 4; - repeated uint32 append_prop_id_list = 5; + uint32 level = 1; + uint32 exp = 2; + uint32 promote_level = 3; + uint32 main_prop_id = 4; + repeated uint32 append_prop_id_list = 5; } - diff --git a/proto/ReliquaryDecomposeReq.proto b/proto/ReliquaryDecomposeReq.proto index 12e6f461..00c4071f 100644 --- a/proto/ReliquaryDecomposeReq.proto +++ b/proto/ReliquaryDecomposeReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 699 +// Obf: GEFNBINBKDE message ReliquaryDecomposeReq { uint32 target_count = 8; uint32 config_id = 10; diff --git a/proto/ReliquaryDecomposeRsp.proto b/proto/ReliquaryDecomposeRsp.proto index ab064db9..4683222b 100644 --- a/proto/ReliquaryDecomposeRsp.proto +++ b/proto/ReliquaryDecomposeRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 632 +// Obf: DLBMKMKGNKB message ReliquaryDecomposeRsp { int32 retcode = 6; repeated uint64 guid_list = 3; diff --git a/proto/ReliquaryFilterStateNotify.proto b/proto/ReliquaryFilterStateNotify.proto index 16710c49..dc4a85eb 100644 --- a/proto/ReliquaryFilterStateNotify.proto +++ b/proto/ReliquaryFilterStateNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 627 +// Obf: BDLPMNNPKLE message ReliquaryFilterStateNotify { map reliquary_filter_state_map = 15; } diff --git a/proto/ReliquaryFilterStateSaveNotify.proto b/proto/ReliquaryFilterStateSaveNotify.proto index d5a5384a..dc13d44e 100644 --- a/proto/ReliquaryFilterStateSaveNotify.proto +++ b/proto/ReliquaryFilterStateSaveNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 683 +// Obf: HJOECKDNGON message ReliquaryFilterStateSaveNotify { map reliquary_filter_state_map = 14; } diff --git a/proto/ReliquaryPromoteReq.proto b/proto/ReliquaryPromoteReq.proto index a8d87b50..9c346fe4 100644 --- a/proto/ReliquaryPromoteReq.proto +++ b/proto/ReliquaryPromoteReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 676 +// Obf: ODCHPBIBCJM message ReliquaryPromoteReq { uint64 item_guid = 12; uint64 target_guid = 5; diff --git a/proto/ReliquaryPromoteRsp.proto b/proto/ReliquaryPromoteRsp.proto index 55810a34..0f6e3437 100644 --- a/proto/ReliquaryPromoteRsp.proto +++ b/proto/ReliquaryPromoteRsp.proto @@ -20,11 +20,12 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 626 +// Obf: BLKJJIONAEC message ReliquaryPromoteRsp { - repeated uint32 IPMDFCFOIIK = 14; + repeated uint32 cur_append_prop_list = 14; uint64 target_reliquary_guid = 6; - repeated uint32 BCLIGLMONFC = 2; - uint32 KCLHNLFGFPB = 1; + repeated uint32 old_append_prop_list = 2; + uint32 cur_promote_level = 1; int32 retcode = 7; - uint32 CPOHCMOFHJP = 15; + uint32 old_promote_level = 15; } diff --git a/proto/ReliquaryRequest.proto b/proto/ReliquaryRequest.proto deleted file mode 100644 index 8c52d8b6..00000000 --- a/proto/ReliquaryRequest.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - - - -message ReliquaryRequest { - uint32 equipType = 7; -} diff --git a/proto/ReliquaryResponse.proto b/proto/ReliquaryResponse.proto deleted file mode 100644 index e7beb4a0..00000000 --- a/proto/ReliquaryResponse.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - - -import "GameplayRecommendationReliquaryMainPropData.proto"; - -message ReliquaryResponse { - repeated GameplayRecommendationReliquaryMainPropData nbbpegfkpac = 12; - uint32 equipType = 15; -} diff --git a/proto/ReliquaryUpgradeReq.proto b/proto/ReliquaryUpgradeReq.proto index 4483a84d..a8e28669 100644 --- a/proto/ReliquaryUpgradeReq.proto +++ b/proto/ReliquaryUpgradeReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; // CmdId: 624 +// Obf: MIDKMENDNAF message ReliquaryUpgradeReq { uint64 target_reliquary_guid = 7; repeated uint64 food_reliquary_guid_list = 11; diff --git a/proto/ReliquaryUpgradeRsp.proto b/proto/ReliquaryUpgradeRsp.proto index e7375480..ab294ce0 100644 --- a/proto/ReliquaryUpgradeRsp.proto +++ b/proto/ReliquaryUpgradeRsp.proto @@ -20,11 +20,12 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 631 +// Obf: JHMCANALDCP message ReliquaryUpgradeRsp { - uint32 power_up_rate = 4; + uint32 cur_level = 4; uint64 target_reliquary_guid = 10; int32 retcode = 6; - uint32 cur_level = 14; + uint32 power_up_rate = 14; uint32 old_level = 5; repeated uint32 cur_append_prop_list = 11; repeated uint32 old_append_prop_list = 13; diff --git a/proto/ResVersionConfig.proto b/proto/ResVersionConfig.proto index 748a791d..ff88bed5 100644 --- a/proto/ResVersionConfig.proto +++ b/proto/ResVersionConfig.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: FJIHAIMDBMB message ResVersionConfig { uint32 version = 1; bool relogin = 2; diff --git a/proto/ResinChangeNotify.proto b/proto/ResinChangeNotify.proto index d5615ac6..573da79b 100644 --- a/proto/ResinChangeNotify.proto +++ b/proto/ResinChangeNotify.proto @@ -20,8 +20,9 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 612 +// Obf: GNHJPFEHCEB message ResinChangeNotify { - uint32 cur_buy_count = 1; - uint32 next_add_timestamp = 11; + uint32 curBuyCount = 1; + uint32 nextAddTimestamp = 11; uint32 cur_value = 8; } diff --git a/proto/ResinCostType.proto b/proto/ResinCostType.proto index 86cba06a..2c804f99 100644 --- a/proto/ResinCostType.proto +++ b/proto/ResinCostType.proto @@ -1,15 +1,30 @@ +// 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"; -// Name: JCHKINKMPDK +// Obf: FGDIKNPBEMG enum ResinCostType { - RESIN_COST_TYPE_NONE = 0; - RESIN_COST_TYPE_NORMAL = 1; - RESIN_COST_TYPE_CONDENSE = 2; - RESIN_COST_TYPE_REUNION_PRIVILEGE = 3; - RESIN_COST_TYPE_OP_ACTIVITY = 4; - RESIN_COST_TYPE_MATERIAL = 5; + RESIN_COST_TYPE_NONE = 0; + RESIN_COST_TYPE_NORMAL = 1; + RESIN_COST_TYPE_CONDENSE = 2; + RESIN_COST_TYPE_REUNION_PRIVILEGE = 3; + RESIN_COST_TYPE_OP_ACTIVITY = 4; + RESIN_COST_TYPE_MATERIAL = 5; } - diff --git a/proto/Retcode.proto b/proto/Retcode.proto index e5586dd5..0b19b57c 100644 --- a/proto/Retcode.proto +++ b/proto/Retcode.proto @@ -1,1219 +1,1223 @@ -// Proto has been converted from Sorapointa to Grasscutter format -// Sorapointa - A server software re-implementation for a certain anime game, and avoid sorapointa. -// Copyright (C) 2022 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"; +// Name: PHBGJGPFAGF enum Retcode { - RET_SUCC = 0; - RET_FAIL = -1; - RET_SVR_ERROR = 1; - RET_UNKNOWN_ERROR = 2; - RET_FREQUENT = 3; - RET_NODE_FORWARD_ERROR = 4; - RET_NOT_FOUND_CONFIG = 5; - RET_SYSTEM_BUSY = 6; - RET_GM_UID_BIND = 7; - RET_FORBIDDEN = 8; - RET_STOP_REGISTER = 10; - RET_STOP_SERVER = 11; - RET_ACCOUNT_VEIRFY_ERROR = 12; - RET_ACCOUNT_FREEZE = 13; - RET_REPEAT_LOGIN = 14; - RET_CLIENT_VERSION_ERROR = 15; - RET_TOKEN_ERROR = 16; - RET_ACCOUNT_NOT_EXIST = 17; - RET_WAIT_OTHER_LOGIN = 18; - RET_ANOTHER_LOGIN = 19; - RET_CLIENT_FORCE_UPDATE = 20; - RET_BLACK_UID = 21; - RET_LOGIN_DB_FAIL = 22; - RET_LOGIN_INIT_FAIL = 23; - RET_MYSQL_DUPLICATE = 24; - RET_MAX_PLAYER = 25; - RET_ANTI_ADDICT = 26; - RET_PS_PLAYER_WITHOUT_ONLINE_ID = 27; - RET_ONLINE_ID_NOT_FOUND = 28; - RET_ONLNE_ID_NOT_MATCH = 29; - RET_REGISTER_IS_FULL = 30; - RET_CHECKSUM_INVALID = 31; - RET_BLACK_REGISTER_IP = 32; - RET_EXCEED_REGISTER_RATE = 33; - RET_UNKNOWN_PLATFORM = 34; - RET_TOKEN_PARAM_ERROR = 35; - RET_ANTI_OFFLINE_ERROR = 36; - RET_BLACK_LOGIN_IP = 37; - RET_GET_TOKEN_SESSION_HAS_UID = 38; - RET_ENVIRONMENT_ERROR = 39; - RET_CHECK_CLIENT_VERSION_HASH_FAIL = 40; - RET_MINOR_REGISTER_FOBIDDEN = 41; - RET_SECURITY_LIBRARY_ERROR = 42; - RET_AVATAR_IN_CD = 101; - RET_AVATAR_NOT_ALIVE = 102; - RET_AVATAR_NOT_ON_SCENE = 103; - RET_CAN_NOT_FIND_AVATAR = 104; - RET_CAN_NOT_DEL_CUR_AVATAR = 105; - RET_DUPLICATE_AVATAR = 106; - RET_AVATAR_IS_SAME_ONE = 107; - RET_AVATAR_LEVEL_LESS_THAN = 108; - RET_AVATAR_CAN_NOT_CHANGE_ELEMENT = 109; - RET_AVATAR_BREAK_LEVEL_LESS_THAN = 110; - RET_AVATAR_ON_MAX_BREAK_LEVEL = 111; - RET_AVATAR_ID_ALREADY_EXIST = 112; - RET_AVATAR_NOT_DEAD = 113; - RET_AVATAR_IS_REVIVING = 114; - RET_AVATAR_ID_ERROR = 115; - RET_REPEAT_SET_PLAYER_BORN_DATA = 116; - RET_PLAYER_LEVEL_LESS_THAN = 117; - RET_AVATAR_LIMIT_LEVEL_ERROR = 118; - RET_CUR_AVATAR_NOT_ALIVE = 119; - RET_CAN_NOT_FIND_TEAM = 120; - RET_CAN_NOT_FIND_CUR_TEAM = 121; - RET_AVATAR_NOT_EXIST_IN_TEAM = 122; - RET_CAN_NOT_REMOVE_CUR_AVATAR_FROM_TEAM = 123; - RET_CAN_NOT_USE_REVIVE_ITEM_FOR_CUR_AVATAR = 124; - RET_TEAM_COST_EXCEED_LIMIT = 125; - RET_TEAM_AVATAR_IN_EXPEDITION = 126; - RET_TEAM_CAN_NOT_CHOSE_REPLACE_USE = 127; - RET_AVATAR_IN_COMBAT = 128; - RET_NICKNAME_UTF8_ERROR = 130; - RET_NICKNAME_TOO_LONG = 131; - RET_NICKNAME_WORD_ILLEGAL = 132; - RET_NICKNAME_TOO_MANY_DIGITS = 133; - RET_NICKNAME_IS_EMPTY = 134; - RET_NICKNAME_MONTHLY_LIMIT = 135; - RET_NICKNAME_NOT_CHANGED = 136; - RET_PLAYER_NOT_ONLINE = 140; - RET_OPEN_STATE_NOT_OPEN = 141; - RET_FEATURE_CLOSED = 142; - RET_AVATAR_EXPEDITION_AVATAR_DIE = 152; - RET_AVATAR_EXPEDITION_COUNT_LIMIT = 153; - RET_AVATAR_EXPEDITION_MAIN_FORBID = 154; - RET_AVATAR_EXPEDITION_TRIAL_FORBID = 155; - RET_TEAM_NAME_ILLEGAL = 156; - RET_IS_NOT_IN_STANDBY = 157; - RET_IS_IN_DUNGEON = 158; - RET_IS_IN_LOCK_AVATAR_QUEST = 159; - RET_IS_USING_TRIAL_AVATAR = 160; - RET_IS_USING_TEMP_AVATAR = 161; - RET_NOT_HAS_FLYCLOAK = 162; - RET_FETTER_REWARD_ALREADY_GOT = 163; - RET_FETTER_REWARD_LEVEL_NOT_ENOUGH = 164; - RET_WORLD_LEVEL_ADJUST_MIN_LEVEL = 165; - RET_WORLD_LEVEL_ADJUST_CD = 166; - RET_NOT_HAS_COSTUME = 167; - RET_COSTUME_AVATAR_ERROR = 168; - RET_FLYCLOAK_PLATFORM_TYPE_ERR = 169; - RET_IN_TRANSFER = 170; - RET_IS_IN_LOCK_AVATAR = 171; - RET_FULL_BACKUP_TEAM = 172; - RET_BACKUP_TEAM_ID_NOT_VALID = 173; - RET_BACKUP_TEAM_IS_CUR_TEAM = 174; - RET_AVATAR_RENAME_IN_CD = 175; - RET_AVATAR_RENAME_IN_AUDIT = 176; - RET_AVATAR_RENAME_IN_IP_BLACK_LIST = 177; - RET_FLOAT_ERROR = 201; - RET_NPC_NOT_EXIST = 301; - RET_NPC_TOO_FAR = 302; - RET_NOT_CURRENT_TALK = 303; - RET_NPC_CREATE_FAIL = 304; - RET_NPC_MOVE_FAIL = 305; - RET_QUEST_NOT_EXIST = 401; - RET_QUEST_IS_FAIL = 402; - RET_QUEST_CONTENT_ERROR = 403; - RET_BARGAIN_NOT_ACTIVATED = 404; - RET_BARGAIN_FINISHED = 405; - RET_INFERENCE_ASSOCIATE_WORD_ERROR = 406; - RET_INFERENCE_SUBMIT_WORD_NO_CONCLUSION = 407; - RET_POINT_NOT_UNLOCKED = 501; - RET_POINT_TOO_FAR = 502; - RET_POINT_ALREAY_UNLOCKED = 503; - RET_ENTITY_NOT_EXIST = 504; - RET_ENTER_SCENE_FAIL = 505; - RET_PLAYER_IS_ENTER_SCENE = 506; - RET_CITY_MAX_LEVEL = 507; - RET_AREA_LOCKED = 508; - RET_JOIN_OTHER_WAIT = 509; - RET_WEATHER_AREA_NOT_FOUND = 510; - RET_WEATHER_IS_LOCKED = 511; - RET_NOT_IN_SELF_SCENE = 512; - RET_GROUP_NOT_EXIST = 513; - RET_MARK_NAME_ILLEGAL = 514; - RET_MARK_ALREADY_EXISTS = 515; - RET_MARK_OVERFLOW = 516; - RET_MARK_NOT_EXISTS = 517; - RET_MARK_UNKNOWN_TYPE = 518; - RET_MARK_NAME_TOO_LONG = 519; - RET_DISTANCE_LONG = 520; - RET_ENTER_SCENE_TOKEN_INVALID = 521; - RET_NOT_IN_WORLD_SCENE = 522; - RET_ANY_GALLERY_STARTED = 523; - RET_GALLERY_NOT_START = 524; - RET_GALLERY_INTERRUPT_ONLY_ON_SINGLE_MODE = 525; - RET_GALLERY_CANNOT_INTERRUPT = 526; - RET_GALLERY_WORLD_NOT_MEET = 527; - RET_GALLERY_SCENE_NOT_MEET = 528; - RET_CUR_PLAY_CANNOT_TRANSFER = 529; - RET_CANT_USE_WIDGET_IN_HOME_SCENE = 530; - RET_SCENE_GROUP_NOT_MATCH = 531; - RET_POS_ROT_INVALID = 551; - RET_MARK_INVALID_SCENE_ID = 552; - RET_INVALID_SCENE_TO_USE_ANCHOR_POINT = 553; - RET_ENTER_HOME_SCENE_FAIL = 554; - RET_CUR_SCENE_IS_NULL = 555; - RET_GROUP_ID_ERROR = 556; - RET_GALLERY_INTERRUPT_NOT_OWNER = 557; - RET_NO_SPRING_IN_AREA = 558; - RET_AREA_NOT_IN_SCENE = 559; - RET_INVALID_CITY_ID = 560; - RET_INVALID_SCENE_ID = 561; - RET_DEST_SCENE_IS_NOT_ALLOW = 562; - RET_LEVEL_TAG_SWITCH_IN_CD = 563; - RET_LEVEL_TAG_ALREADY_EXIST = 564; - RET_INVALID_AREA_ID = 565; - RET_ITEM_NOT_EXIST = 601; - RET_PACK_EXCEED_MAX_WEIGHT = 602; - RET_ITEM_NOT_DROPABLE = 603; - RET_ITEM_NOT_USABLE = 604; - RET_ITEM_INVALID_USE_COUNT = 605; - RET_ITEM_INVALID_DROP_COUNT = 606; - RET_ITEM_ALREADY_EXIST = 607; - RET_ITEM_IN_COOLDOWN = 608; - RET_ITEM_COUNT_NOT_ENOUGH = 609; - RET_ITEM_INVALID_TARGET = 610; - RET_RECIPE_NOT_EXIST = 611; - RET_RECIPE_LOCKED = 612; - RET_RECIPE_UNLOCKED = 613; - RET_COMPOUND_QUEUE_FULL = 614; - RET_COMPOUND_NOT_FINISH = 615; - RET_MAIL_ITEM_NOT_GET = 616; - RET_ITEM_EXCEED_LIMIT = 617; - RET_AVATAR_CAN_NOT_USE = 618; - RET_ITEM_NEED_PLAYER_LEVEL = 619; - RET_RECIPE_NOT_AUTO_QTE = 620; - RET_COMPOUND_BUSY_QUEUE = 621; - RET_NEED_MORE_SCOIN = 622; - RET_SKILL_DEPOT_NOT_FOUND = 623; - RET_HCOIN_NOT_ENOUGH = 624; - RET_SCOIN_NOT_ENOUGH = 625; - RET_HCOIN_EXCEED_LIMIT = 626; - RET_SCOIN_EXCEED_LIMIT = 627; - RET_MAIL_EXPIRED = 628; - RET_REWARD_HAS_TAKEN = 629; - RET_COMBINE_COUNT_TOO_LARGE = 630; - RET_GIVING_ITEM_WRONG = 631; - RET_GIVING_IS_FINISHED = 632; - RET_GIVING_NOT_ACTIVED = 633; - RET_FORGE_QUEUE_FULL = 634; - RET_FORGE_QUEUE_CAPACITY = 635; - RET_FORGE_QUEUE_NOT_FOUND = 636; - RET_FORGE_QUEUE_EMPTY = 637; - RET_NOT_SUPPORT_ITEM = 638; - RET_ITEM_EMPTY = 639; - RET_VIRTUAL_EXCEED_LIMIT = 640; - RET_MATERIAL_EXCEED_LIMIT = 641; - RET_EQUIP_EXCEED_LIMIT = 642; - RET_ITEM_SHOULD_HAVE_NO_LEVEL = 643; - RET_WEAPON_PROMOTE_LEVEL_EXCEED_LIMIT = 644; - RET_WEAPON_LEVEL_INVALID = 645; - RET_UNKNOW_ITEM_TYPE = 646; - RET_ITEM_COUNT_IS_ZERO = 647; - RET_ITEM_IS_EXPIRED = 648; - RET_ITEM_EXCEED_OUTPUT_LIMIT = 649; - RET_EQUIP_LEVEL_HIGHER = 650; - RET_EQUIP_CAN_NOT_WAKE_OFF_WEAPON = 651; - RET_EQUIP_HAS_BEEN_WEARED = 652; - RET_EQUIP_WEARED_CANNOT_DROP = 653; - RET_AWAKEN_LEVEL_MAX = 654; - RET_MCOIN_NOT_ENOUGH = 655; - RET_MCOIN_EXCEED_LIMIT = 656; - RET_RESIN_NOT_ENOUGH = 660; - RET_RESIN_EXCEED_LIMIT = 661; - RET_RESIN_OPENSTATE_OFF = 662; - RET_RESIN_BOUGHT_COUNT_EXCEEDED = 663; - RET_RESIN_CARD_DAILY_REWARD_HAS_TAKEN = 664; - RET_RESIN_CARD_EXPIRED = 665; - RET_AVATAR_CAN_NOT_COOK = 666; - RET_ATTACH_AVATAR_CD = 667; - RET_AUTO_RECOVER_OPENSTATE_OFF = 668; - RET_AUTO_RECOVER_BOUGHT_COUNT_EXCEEDED = 669; - RET_RESIN_GAIN_FAILED = 670; - RET_WIDGET_ORNAMENTS_TYPE_ERROR = 671; - RET_ALL_TARGET_SATIATION_FULL = 672; - RET_FORGE_WORLD_LEVEL_NOT_MATCH = 673; - RET_FORGE_POINT_NOT_ENOUGH = 674; - RET_WIDGET_ANCHOR_POINT_FULL = 675; - RET_WIDGET_ANCHOR_POINT_NOT_FOUND = 676; - RET_ALL_BONFIRE_EXCEED_MAX_COUNT = 677; - RET_BONFIRE_EXCEED_MAX_COUNT = 678; - RET_LUNCH_BOX_DATA_ERROR = 679; - RET_INVALID_QUICK_USE_WIDGET = 680; - RET_INVALID_REPLACE_RESIN_COUNT = 681; - RET_PREV_DETECTED_GATHER_NOT_FOUND = 682; - RET_GOT_ALL_ONEOFF_GAHTER = 683; - RET_INVALID_WIDGET_MATERIAL_ID = 684; - RET_WIDGET_DETECTOR_NO_HINT_TO_CLEAR = 685; - RET_WIDGET_ALREADY_WITHIN_NEARBY_RADIUS = 686; - RET_WIDGET_CLIENT_COLLECTOR_NEED_POINTS = 687; - RET_WIDGET_IN_COMBAT = 688; - RET_WIDGET_NOT_SET_QUICK_USE = 689; - RET_ALREADY_ATTACH_WIDGET = 690; - RET_EQUIP_IS_LOCKED = 691; - RET_FORGE_IS_LOCKED = 692; - RET_COMBINE_IS_LOCKED = 693; - RET_FORGE_OUTPUT_STACK_LIMIT = 694; - RET_ALREADY_DETTACH_WIDGET = 695; - RET_GADGET_BUILDER_EXCEED_MAX_COUNT = 696; - RET_REUNION_PRIVILEGE_RESIN_TYPE_IS_NORMAL = 697; - RET_BONUS_COUNT_EXCEED_DOUBLE_LIMIT = 698; - RET_RELIQUARY_DECOMPOSE_PARAM_ERROR = 699; - RET_ITEM_COMBINE_COUNT_NOT_ENOUGH = 700; - RET_GOODS_NOT_EXIST = 701; - RET_GOODS_MATERIAL_NOT_ENOUGH = 702; - RET_GOODS_NOT_IN_TIME = 703; - RET_GOODS_BUY_NUM_NOT_ENOUGH = 704; - RET_GOODS_BUY_NUM_ERROR = 705; - RET_SHOP_NOT_OPEN = 706; - RET_SHOP_CONTENT_NOT_MATCH = 707; - RET_SHOP_BATCH_BUY_SHOP_LIMIT = 708; - RET_SHOP_BATCH_BUY_COUNT_LIMIT = 709; - RET_CHAT_FORBIDDEN = 798; - RET_CHAT_CD = 799; - RET_CHAT_FREQUENTLY = 800; - RET_GADGET_NOT_EXIST = 801; - RET_GADGET_NOT_INTERACTIVE = 802; - RET_GADGET_NOT_GATHERABLE = 803; - RET_CHEST_IS_LOCKED = 804; - RET_GADGET_CREATE_FAIL = 805; - RET_WORKTOP_OPTION_NOT_EXIST = 806; - RET_GADGET_STATUE_NOT_ACTIVE = 807; - RET_GADGET_STATUE_OPENED = 808; - RET_BOSS_CHEST_NO_QUALIFICATION = 809; - RET_BOSS_CHEST_LIFE_TIME_OVER = 810; - RET_BOSS_CHEST_WEEK_NUM_LIMIT = 811; - RET_BOSS_CHEST_GUEST_WORLD_LEVEL = 812; - RET_BOSS_CHEST_HAS_TAKEN = 813; - RET_BLOSSOM_CHEST_NO_QUALIFICATION = 814; - RET_BLOSSOM_CHEST_LIFE_TIME_OVER = 815; - RET_BLOSSOM_CHEST_HAS_TAKEN = 816; - RET_BLOSSOM_CHEST_GUEST_WORLD_LEVEL = 817; - RET_MP_PLAY_REWARD_NO_QUALIFICATION = 818; - RET_MP_PLAY_REWARD_HAS_TAKEN = 819; - RET_GENERAL_REWARD_NO_QUALIFICATION = 820; - RET_GENERAL_REWARD_LIFE_TIME_OVER = 821; - RET_GENERAL_REWARD_HAS_TAKEN = 822; - RET_GADGET_NOT_VEHICLE = 823; - RET_VEHICLE_SLOT_OCCUPIED = 824; - RET_NOT_IN_VEHICLE = 825; - RET_CREATE_VEHICLE_IN_CD = 826; - RET_CREATE_VEHICLE_POS_INVALID = 827; - RET_VEHICLE_POINT_NOT_UNLOCK = 828; - RET_GADGET_INTERACT_COND_NOT_MEET = 829; - RET_GADGET_INTERACT_PARAM_ERROR = 830; - RET_GADGET_CUSTOM_COMBINATION_INVALID = 831; - RET_DESHRET_OBELISK_DUPLICATE_INTERACT = 832; - RET_DESHRET_OBELISK_NO_AVAIL_CHEST = 833; - RET_ACTIVITY_CLOSE = 860; - RET_ACTIVITY_ITEM_ERROR = 861; - RET_ACTIVITY_CONTRIBUTION_NOT_ENOUGH = 862; - RET_SEA_LAMP_PHASE_NOT_FINISH = 863; - RET_SEA_LAMP_FLY_NUM_LIMIT = 864; - RET_SEA_LAMP_FLY_LAMP_WORD_ILLEGAL = 865; - RET_ACTIVITY_WATCHER_REWARD_TAKEN = 866; - RET_ACTIVITY_WATCHER_REWARD_NOT_FINISHED = 867; - RET_SALESMAN_ALREADY_DELIVERED = 868; - RET_SALESMAN_REWARD_COUNT_NOT_ENOUGH = 869; - RET_SALESMAN_POSITION_INVALID = 870; - RET_DELIVER_NOT_FINISH_ALL_QUEST = 871; - RET_DELIVER_ALREADY_TAKE_DAILY_REWARD = 872; - RET_ASTER_PROGRESS_EXCEED_LIMIT = 873; - RET_ASTER_CREDIT_EXCEED_LIMIT = 874; - RET_ASTER_TOKEN_EXCEED_LIMIT = 875; - RET_ASTER_CREDIT_NOT_ENOUGH = 876; - RET_ASTER_TOKEN_NOT_ENOUGH = 877; - RET_ASTER_SPECIAL_REWARD_HAS_TAKEN = 878; - RET_FLIGHT_GROUP_ACTIVITY_NOT_STARTED = 879; - RET_ASTER_MID_PREVIOUS_BATTLE_NOT_FINISHED = 880; - RET_DRAGON_SPINE_SHIMMERING_ESSENCE_EXCEED_LIMIT = 881; - RET_DRAGON_SPINE_WARM_ESSENCE_EXCEED_LIMIT = 882; - RET_DRAGON_SPINE_WONDROUS_ESSENCE_EXCEED_LIMIT = 883; - RET_DRAGON_SPINE_SHIMMERING_ESSENCE_NOT_ENOUGH = 884; - RET_DRAGON_SPINE_WARM_ESSENCE_NOT_ENOUGH = 885; - RET_DRAGON_SPINE_WONDROUS_ESSENCE_NOT_ENOUGH = 886; - RET_EFFIGY_FIRST_PASS_REWARD_HAS_TAKEN = 891; - RET_EFFIGY_REWARD_HAS_TAKEN = 892; - RET_TREASURE_MAP_ADD_TOKEN_EXCEED_LIMIT = 893; - RET_TREASURE_MAP_TOKEN_NOT_ENOUGHT = 894; - RET_SEA_LAMP_COIN_EXCEED_LIMIT = 895; - RET_SEA_LAMP_COIN_NOT_ENOUGH = 896; - RET_SEA_LAMP_POPULARITY_EXCEED_LIMIT = 897; - RET_ACTIVITY_AVATAR_REWARD_NOT_OPEN = 898; - RET_ACTIVITY_AVATAR_REWARD_HAS_TAKEN = 899; - RET_ARENA_ACTIVITY_ALREADY_STARTED = 900; - RET_TALENT_ALREAY_UNLOCKED = 901; - RET_PREV_TALENT_NOT_UNLOCKED = 902; - RET_BIG_TALENT_POINT_NOT_ENOUGH = 903; - RET_SMALL_TALENT_POINT_NOT_ENOUGH = 904; - RET_PROUD_SKILL_ALREADY_GOT = 905; - RET_PREV_PROUD_SKILL_NOT_GET = 906; - RET_PROUD_SKILL_MAX_LEVEL = 907; - RET_CANDIDATE_SKILL_DEPOT_ID_NOT_FIND = 910; - RET_SKILL_DEPOT_IS_THE_SAME = 911; - RET_MONSTER_NOT_EXIST = 1001; - RET_MONSTER_CREATE_FAIL = 1002; - RET_DUNGEON_ENTER_FAIL = 1101; - RET_DUNGEON_QUIT_FAIL = 1102; - RET_DUNGEON_ENTER_EXCEED_DAY_COUNT = 1103; - RET_DUNGEON_REVIVE_EXCEED_MAX_COUNT = 1104; - RET_DUNGEON_REVIVE_FAIL = 1105; - RET_DUNGEON_NOT_SUCCEED = 1106; - RET_DUNGEON_CAN_NOT_CANCEL = 1107; - RET_DEST_DUNGEON_SETTLED = 1108; - RET_DUNGEON_CANDIDATE_TEAM_IS_FULL = 1109; - RET_DUNGEON_CANDIDATE_TEAM_IS_DISMISS = 1110; - RET_DUNGEON_CANDIDATE_TEAM_NOT_ALL_READY = 1111; - RET_DUNGEON_CANDIDATE_TEAM_HAS_REPEAT_AVATAR = 1112; - RET_DUNGEON_CANDIDATE_NOT_SINGEL_PASS = 1113; - RET_DUNGEON_REPLAY_NEED_ALL_PLAYER_DIE = 1114; - RET_DUNGEON_REPLAY_HAS_REVIVE_COUNT = 1115; - RET_DUNGEON_OTHERS_LEAVE = 1116; - RET_DUNGEON_ENTER_LEVEL_LIMIT = 1117; - RET_DUNGEON_CANNOT_ENTER_PLOT_IN_MP = 1118; - RET_DUNGEON_DROP_SUBFIELD_LIMIT = 1119; - RET_DUNGEON_BE_INVITE_PLAYER_AVATAR_ALL_DIE = 1120; - RET_DUNGEON_CANNOT_KICK = 1121; - RET_DUNGEON_CANDIDATE_TEAM_SOMEONE_LEVEL_LIMIT = 1122; - RET_DUNGEON_IN_FORCE_QUIT = 1123; - RET_DUNGEON_GUEST_QUIT_DUNGEON = 1124; - RET_DUNGEON_TICKET_FAIL = 1125; - RET_CUR_DUNGEON_SETTLED = 1126; - RET_MP_NOT_IN_MY_WORLD = 1201; - RET_MP_IN_MP_MODE = 1202; - RET_MP_SCENE_IS_FULL = 1203; - RET_MP_MODE_NOT_AVAILABLE = 1204; - RET_MP_PLAYER_NOT_ENTERABLE = 1205; - RET_MP_QUEST_BLOCK_MP = 1206; - RET_MP_IN_ROOM_SCENE = 1207; - RET_MP_WORLD_IS_FULL = 1208; - RET_MP_PLAYER_NOT_ALLOW_ENTER = 1209; - RET_MP_PLAYER_DISCONNECTED = 1210; - RET_MP_NOT_IN_MP_MODE = 1211; - RET_MP_OWNER_NOT_ENTER = 1212; - RET_MP_ALLOW_ENTER_PLAYER_FULL = 1213; - RET_MP_TARGET_PLAYER_IN_TRANSFER = 1214; - RET_MP_TARGET_ENTERING_OTHER = 1215; - RET_MP_OTHER_ENTERING = 1216; - RET_MP_ENTER_MAIN_PLAYER_IN_PLOT = 1217; - RET_MP_NOT_PS_PLAYER = 1218; - RET_MP_PLAY_NOT_ACTIVE = 1219; - RET_MP_PLAY_REMAIN_REWARDS = 1220; - RET_MP_PLAY_NO_REWARD = 1221; - RET_MP_OPEN_STATE_FAIL = 1223; - RET_MP_PLAYER_IN_BLACKLIST = 1224; - RET_MP_REPLY_TIMEOUT = 1225; - RET_MP_IS_BLOCK = 1226; - RET_MP_ENTER_MAIN_PLAYER_IN_MP_PLAY = 1227; - RET_MP_IN_MP_PLAY_BATTLE = 1228; - RET_MP_GUEST_HAS_REWARD_REMAINED = 1229; - RET_MP_QUIT_MP_INVALID = 1230; - RET_MP_OTHER_DATA_VERSION_NOT_LATEST = 1231; - RET_MP_DATA_VERSION_NOT_LATEST = 1232; - RET_MP_CUR_WORLD_NOT_ENTERABLE = 1233; - RET_MP_ANY_GALLERY_STARTED = 1234; - RET_MP_HAS_ACTIVE_DRAFT = 1235; - RET_MP_PLAYER_IN_DUNGEON = 1236; - RET_MP_MATCH_FULL = 1237; - RET_MP_MATCH_LIMIT = 1238; - RET_MP_MATCH_IN_PUNISH = 1239; - RET_MP_IS_IN_MULTISTAGE = 1240; - RET_MP_MATCH_PLAY_NOT_OPEN = 1241; - RET_MP_ONLY_MP_WITH_PS_PLAYER = 1242; - RET_MP_GUEST_LOADING_FIRST_ENTER = 1243; - RET_MP_SUMMER_TIME_SPRINT_BOAT_ONGOING = 1244; - RET_MP_BLITZ_RUSH_PARKOUR_CHALLENGE_ONGOING = 1245; - RET_MP_MUSIC_GAME_ONGOING = 1246; - RET_MP_IN_MPING_MODE = 1247; - RET_MP_OWNER_IN_SINGLE_SCENE = 1248; - RET_MP_IN_SINGLE_SCENE = 1249; - RET_MP_REPLY_NO_VALID_AVATAR = 1250; - RET_MP_IS_NOT_IN_TRANSFER_GUARD = 1251; - RET_MAIL_PARA_ERR = 1301; - RET_MAIL_MAX_NUM = 1302; - RET_MAIL_ITEM_NUM_EXCEED = 1303; - RET_MAIL_TITLE_LEN_EXCEED = 1304; - RET_MAIL_CONTENT_LEN_EXCEED = 1305; - RET_MAIL_SENDER_LEN_EXCEED = 1306; - RET_MAIL_PARSE_PACKET_FAIL = 1307; - RET_OFFLINE_MSG_MAX_NUM = 1308; - RET_OFFLINE_MSG_SAME_TICKET = 1309; - RET_MAIL_EXCEL_MAIL_TYPE_ERROR = 1310; - RET_MAIL_CANNOT_SEND_MCOIN = 1311; - RET_MAIL_HCOIN_EXCEED_LIMIT = 1312; - RET_MAIL_SCOIN_EXCEED_LIMIT = 1313; - RET_MAIL_MATERIAL_ID_INVALID = 1314; - RET_MAIL_AVATAR_EXCEED_LIMIT = 1315; - RET_MAIL_GACHA_TICKET_ETC_EXCEED_LIMIT = 1316; - RET_MAIL_ITEM_EXCEED_CEHUA_LIMIT = 1317; - RET_MAIL_SPACE_OR_REST_NUM_NOT_ENOUGH = 1318; - RET_MAIL_TICKET_IS_EMPTY = 1319; - RET_MAIL_TRANSACTION_IS_EMPTY = 1320; - RET_MAIL_DELETE_COLLECTED = 1321; - RET_DAILY_TASK_NOT_FINISH = 1330; - RET_DAILY_TAKS_HAS_TAKEN = 1331; - RET_SOCIAL_OFFLINE_MSG_NUM_EXCEED = 1332; - RET_DAILY_TASK_FILTER_CITY_NOT_OPEN = 1333; - RET_GACHA_INAVAILABLE = 1401; - RET_GACHA_RANDOM_NOT_MATCH = 1402; - RET_GACHA_SCHEDULE_NOT_MATCH = 1403; - RET_GACHA_INVALID_TIMES = 1404; - RET_GACHA_COST_ITEM_NOT_ENOUGH = 1405; - RET_GACHA_TIMES_LIMIT = 1406; - RET_GACHA_WISH_SAME_ITEM = 1407; - RET_GACHA_WISH_INVALID_ITEM = 1408; - RET_GACHA_MINORS_TIMES_LIMIT = 1409; - RET_GACHA_GENERAL_TIMES_LIMIT = 1410; - RET_INVESTIGAITON_NOT_IN_PROGRESS = 1501; - RET_INVESTIGAITON_UNCOMPLETE = 1502; - RET_INVESTIGAITON_REWARD_TAKEN = 1503; - RET_INVESTIGAITON_TARGET_STATE_ERROR = 1504; - RET_PUSH_TIPS_NOT_FOUND = 1505; - RET_SIGN_IN_RECORD_NOT_FOUND = 1506; - RET_ALREADY_HAVE_SIGNED_IN = 1507; - RET_SIGN_IN_COND_NOT_SATISFIED = 1508; - RET_BONUS_ACTIVITY_NOT_UNREWARDED = 1509; - RET_SIGN_IN_REWARDED = 1510; - RET_TOWER_NOT_OPEN = 1521; - RET_TOWER_HAVE_DAILY_RECORD = 1522; - RET_TOWER_NOT_RECORD = 1523; - RET_TOWER_HAVE_RECORD = 1524; - RET_TOWER_TEAM_NUM_ERROR = 1525; - RET_TOWER_FLOOR_NOT_OPEN = 1526; - RET_TOWER_NO_FLOOR_STAR_RECORD = 1527; - RET_ALREADY_HAS_TOWER_BUFF = 1528; - RET_DUPLICATE_ENTER_LEVEL = 1529; - RET_NOT_IN_TOWER_LEVEL = 1530; - RET_IN_TOWER_LEVEL = 1531; - RET_TOWER_PREV_FLOOR_NOT_FINISH = 1532; - RET_TOWER_STAR_NOT_ENOUGH = 1533; - RET_BATTLE_PASS_NO_SCHEDULE = 1541; - RET_BATTLE_PASS_HAS_BUYED = 1542; - RET_BATTLE_PASS_LEVEL_OVERFLOW = 1543; - RET_BATTLE_PASS_PRODUCT_EXPIRED = 1544; - RET_MATCH_HOST_QUIT = 1561; - RET_MATCH_ALREADY_IN_MATCH = 1562; - RET_MATCH_NOT_IN_MATCH = 1563; - RET_MATCH_APPLYING_ENTER_MP = 1564; - RET_MATCH_INCORRECT_SCENE = 1565; - RET_WIDGET_TREASURE_SPOT_NOT_FOUND = 1581; - RET_WIDGET_TREASURE_ENTITY_EXISTS = 1582; - RET_WIDGET_TREASURE_SPOT_FAR_AWAY = 1583; - RET_WIDGET_TREASURE_FINISHED_TODAY = 1584; - RET_WIDGET_QUICK_USE_REQ_PARAM_ERROR = 1585; - RET_WIDGET_CAMERA_SCAN_ID_ERROR = 1586; - RET_WIDGET_NOT_ACTIVE = 1587; - RET_WIDGET_FEATHER_NOT_ACTIVE = 1588; - RET_WIDGET_FEATHER_GADGET_TOO_FAR_AWAY = 1589; - RET_WIDGET_CAPTURE_ANIMAL_NOT_EXIST = 1590; - RET_WIDGET_CAPTURE_ANIMAL_DROP_BAG_LIMIT = 1591; - RET_WIDGET_CAPTURE_ANIMAL_CAN_NOT_CAPTURE = 1592; - RET_WIDGET_SKY_CRYSTAL_ALL_COLLECTED = 1593; - RET_WIDGET_SKY_CRYSTAL_HINT_ALREADY_EXIST = 1594; - RET_WIDGET_SKY_CRYSTAL_NOT_FOUND = 1595; - RET_WIDGET_SKY_CRYSTAL_NO_HINT_TO_CLEAR = 1596; - RET_WIDGET_LIGHT_STONE_ENERGY_NOT_ENOUGH = 1597; - RET_WIDGET_TOY_CRYSTAL_ENERGY_NOT_ENOUGH = 1598; - RET_WIDGET_LIGHT_STONE_LEVEL_NOT_ENOUGH = 1599; - RET_UID_NOT_EXIST = 2001; - RET_PARSE_BIN_ERROR = 2002; - RET_ACCOUNT_INFO_NOT_EXIST = 2003; - RET_ORDER_INFO_NOT_EXIST = 2004; - RET_SNAPSHOT_INDEX_ERROR = 2005; - RET_MAIL_HAS_BEEN_SENT = 2006; - RET_PRODUCT_NOT_EXIST = 2007; - RET_UNFINISH_ORDER = 2008; - RET_ID_NOT_EXIST = 2009; - RET_ORDER_TRADE_EARLY = 2010; - RET_ORDER_FINISHED = 2011; - RET_GAMESERVER_VERSION_WRONG = 2012; - RET_OFFLINE_OP_FULL_LENGTH = 2013; - RET_CONCERT_PRODUCT_OBTAIN_LIMIT = 2014; - RET_CONCERT_PRODUCT_TICKET_DUPLICATED = 2015; - RET_CONCERT_PRODUCT_TICKET_EMPTY = 2016; - RET_REDIS_MODIFIED = 5001; - RET_REDIS_UID_NOT_EXIST = 5002; - RET_PATHFINDING_DATA_NOT_EXIST = 6001; - RET_PATHFINDING_DESTINATION_NOT_EXIST = 6002; - RET_PATHFINDING_ERROR_SCENE = 6003; - RET_PATHFINDING_SCENE_DATA_LOADING = 6004; - RET_FRIEND_COUNT_EXCEEDED = 7001; - RET_PLAYER_NOT_EXIST = 7002; - RET_ALREADY_SENT_ADD_REQUEST = 7003; - RET_ASK_FRIEND_LIST_FULL = 7004; - RET_PLAYER_ALREADY_IS_FRIEND = 7005; - RET_PLAYER_NOT_ASK_FRIEND = 7006; - RET_TARGET_FRIEND_COUNT_EXCEED = 7007; - RET_NOT_FRIEND = 7008; - RET_BIRTHDAY_CANNOT_BE_SET_TWICE = 7009; - RET_CANNOT_ADD_SELF_FRIEND = 7010; - RET_SIGNATURE_ILLEGAL = 7011; - RET_PS_PLAYER_CANNOT_ADD_FRIENDS = 7012; - RET_PS_PLAYER_CANNOT_REMOVE_FRIENDS = 7013; - RET_NAME_CARD_NOT_UNLOCKED = 7014; - RET_ALREADY_IN_BLACKLIST = 7015; - RET_PS_PALEYRS_CANNOT_ADD_BLACKLIST = 7016; - RET_PLAYER_BLACKLIST_FULL = 7017; - RET_PLAYER_NOT_IN_BLACKLIST = 7018; - RET_BLACKLIST_PLAYER_CANNOT_ADD_FRIEND = 7019; - RET_IN_TARGET_BLACKLIST = 7020; - RET_CANNOT_ADD_TARGET_FRIEND = 7021; - RET_BIRTHDAY_FORMAT_ERROR = 7022; - RET_ONLINE_ID_NOT_EXISTS = 7023; - RET_FIRST_SHARE_REWARD_HAS_TAKEN = 7024; - RET_PS_PLAYER_CANNOT_REMOVE_BLACKLIST = 7025; - RET_REPORT_CD = 7026; - RET_REPORT_CONTENT_ILLEGAL = 7027; - RET_REMARK_WORD_ILLEGAL = 7028; - RET_REMARK_TOO_LONG = 7029; - RET_REMARK_UTF8_ERROR = 7030; - RET_REMARK_IS_EMPTY = 7031; - RET_ASK_ADD_FRIEND_CD = 7032; - RET_SHOW_AVATAR_INFO_NOT_EXIST = 7033; - RET_PLAYER_NOT_SHOW_AVATAR = 7034; - RET_SOCIAL_UPDATE_SHOW_LIST_REPEAT_ID = 7035; - RET_PSN_ID_NOT_FOUND = 7036; - RET_EMOJI_COLLECTION_NUM_EXCEED_LIMIT = 7037; - RET_REMARK_EMPTY = 7038; - RET_IN_TARGET_PSN_BLACKLIST = 7039; - RET_SIGNATURE_NOT_CHANGED = 7040; - RET_SIGNATURE_MONTHLY_LIMIT = 7041; - RET_REQ_FRIEND_AVATAR_FREQUENTLY = 7042; - RET_PSN_GET_PLAYER_SOCIAL_DETAIL_FAIL = 7043; - RET_OFFERING_NOT_OPEN = 7081; - RET_OFFERING_LEVEL_LIMIT = 7082; - RET_OFFERING_LEVEL_NOT_REACH = 7083; - RET_OFFERING_LEVEL_HAS_TAKEN = 7084; - RET_CITY_REPUTATION_NOT_OPEN = 7101; - RET_CITY_REPUTATION_LEVEL_TAKEN = 7102; - RET_CITY_REPUTATION_LEVEL_NOT_REACH = 7103; - RET_CITY_REPUTATION_PARENT_QUEST_TAKEN = 7104; - RET_CITY_REPUTATION_PARENT_QUEST_UNFINISH = 7105; - RET_CITY_REPUTATION_ACCEPT_REQUEST = 7106; - RET_CITY_REPUTATION_NOT_ACCEPT_REQUEST = 7107; - RET_CITY_REPUTATION_ACCEPT_REQUEST_LIMIT = 7108; - RET_CITY_REPUTATION_ENTRANCE_NOT_OPEN = 7109; - RET_CITY_REPUTATION_TAKEN_REQUEST_REWARD = 7110; - RET_CITY_REPUTATION_SWITCH_CLOSE = 7111; - RET_CITY_REPUTATION_ENTRACE_SWITCH_CLOSE = 7112; - RET_CITY_REPUTATION_TAKEN_EXPLORE_REWARD = 7113; - RET_CITY_REPUTATION_EXPLORE_NOT_REACH = 7114; - RET_MECHANICUS_NOT_OPEN = 7120; - RET_MECHANICUS_GEAR_UNLOCK = 7121; - RET_MECHANICUS_GEAR_LOCK = 7122; - RET_MECHANICUS_GEAR_LEVEL_LIMIT = 7123; - RET_MECHANICUS_COIN_NOT_ENOUGH = 7124; - RET_MECHANICUS_NO_SEQUENCE = 7125; - RET_MECHANICUS_SEQUENCE_LIMIT_LEVEL = 7126; - RET_MECHANICUS_SEQUENCE_LIMIT_OPEN = 7127; - RET_MECHANICUS_DIFFICULT_NOT_SUPPORT = 7128; - RET_MECHANICUS_TICKET_NOT_ENOUGH = 7129; - RET_MECHANICUS_TEACH_NOT_FINISH = 7130; - RET_MECHANICUS_TEACH_FINISHED = 7131; - RET_MECHANICUS_PREV_DIFFICULT_LEVEL_BLOCK = 7132; - RET_MECHANICUS_PLAYER_LIMIT = 7133; - RET_MECHANICUS_PUNISH_TIME = 7134; - RET_MECHANICUS_SWITCH_CLOSE = 7135; - RET_MECHANICUS_BATTLE_NOT_IN_DUNGEON = 7150; - RET_MECHANICUS_BATTLE_PLAY_NOT_FOUND = 7151; - RET_MECHANICUS_BATTLE_DUPLICATE_PICK_CARD = 7152; - RET_MECHANICUS_BATTLE_PLAYER_NOT_IN_PLAY = 7153; - RET_MECHANICUS_BATTLE_CARD_NOT_AVAILABLE = 7154; - RET_MECHANICUS_BATTLE_NOT_IN_CARD_STAGE = 7155; - RET_MECHANICUS_BATTLE_CARD_IS_WAITING = 7156; - RET_MECHANICUS_BATTLE_CARD_ALL_CONFIRMED = 7157; - RET_MECHANICUS_BATTLE_CARD_ALREADY_CONFIRMED = 7158; - RET_MECHANICUS_BATTLE_CARD_CONFIRMED_BY_OTHER = 7159; - RET_MECHANICUS_BATTLE_CARD_NOT_ENOUGH_POINTS = 7160; - RET_MECHANICUS_BATTLE_CARD_ALREADY_SKIPPED = 7161; - RET_LEGENDARY_KEY_NOT_ENOUGH = 8001; - RET_LEGENDARY_KEY_EXCEED_LIMIT = 8002; - RET_DAILY_TASK_NOT_ENOUGH_TO_REDEEM = 8003; - RET_PERSONAL_LINE_OPEN_STATE_OFF = 8004; - RET_PERSONAL_LINE_LEVEL_NOT_ENOUGH = 8005; - RET_PERSONAL_LINE_NOT_OPEN = 8006; - RET_PERSONAL_LINE_PRE_QUEST_NOT_FINISH = 8007; - RET_HUNTING_ALREADY_FINISH_OFFER_LIMIT = 8201; - RET_HUNTING_HAS_UNFINISHED_OFFER = 8202; - RET_HUNTING_FAILED_OFFER_NOT_CD_READY = 8203; - RET_HUNTING_NOT_TAKE_OFFER = 8204; - RET_HUNTING_CANNOT_TAKE_TWICE = 8205; - RET_RPIVATE_CHAT_INVALID_CONTENT_TYPE = 8901; - RET_PRIVATE_CHAT_TARGET_IS_NOT_FRIEND = 8902; - RET_PRIVATE_CHAT_CONTENT_NOT_SUPPORTED = 8903; - RET_PRIVATE_CHAT_CONTENT_TOO_LONG = 8904; - RET_PRIVATE_CHAT_PULL_TOO_FAST = 8905; - RET_PRIVATE_CHAT_REPEAT_READ = 8906; - RET_PRIVATE_CHAT_READ_NOT_FRIEND = 8907; - RET_REUNION_FINISHED = 9001; - RET_REUNION_NOT_ACTIVATED = 9002; - RET_REUNION_ALREADY_TAKE_FIRST_REWARD = 9003; - RET_REUNION_SIGN_IN_REWARDED = 9004; - RET_REUNION_WATCHER_REWARDED = 9005; - RET_REUNION_WATCHER_NOT_FINISH = 9006; - RET_REUNION_MISSION_REWARDED = 9007; - RET_REUNION_MISSION_NOT_FINISH = 9008; - RET_REUNION_WATCHER_REWARD_NOT_UNLOCKED = 9009; - RET_BLESSING_CONTENT_CLOSED = 9101; - RET_BLESSING_NOT_ACTIVE = 9102; - RET_BLESSING_NOT_TODAY_ENTITY = 9103; - RET_BLESSING_ENTITY_EXCEED_SCAN_NUM_LIMIT = 9104; - RET_BLESSING_DAILY_SCAN_NUM_EXCEED_LIMIT = 9105; - RET_BLESSING_REDEEM_REWARD_NUM_EXCEED_LIMIT = 9106; - RET_BLESSING_REDEEM_PIC_NUM_NOT_ENOUGH = 9107; - RET_BLESSING_PIC_NOT_ENOUGH = 9108; - RET_BLESSING_PIC_HAS_RECEIVED = 9109; - RET_BLESSING_TARGET_RECV_NUM_EXCEED = 9110; - RET_FLEUR_FAIR_CREDIT_EXCEED_LIMIT = 9111; - RET_FLEUR_FAIR_CREDIT_NOT_ENOUGH = 9112; - RET_FLEUR_FAIR_TOKEN_EXCEED_LIMIT = 9113; - RET_FLEUR_FAIR_TOKEN_NOT_ENOUGH = 9114; - RET_FLEUR_FAIR_MINIGAME_NOT_OPEN = 9115; - RET_FLEUR_FAIR_MUSIC_GAME_DIFFICULTY_NOT_UNLOCK = 9116; - RET_FLEUR_FAIR_DUNGEON_LOCKED = 9117; - RET_FLEUR_FAIR_DUNGEON_PUNISH_TIME = 9118; - RET_FLEUR_FAIR_ONLY_OWNER_CAN_RESTART_MINIGAM = 9119; - RET_WATER_SPIRIT_COIN_EXCEED_LIMIT = 9120; - RET_WATER_SPIRIT_COIN_NOT_ENOUGH = 9121; - RET_REGION_SEARCH_NO_SEARCH = 9122; - RET_REGION_SEARCH_STATE_ERROR = 9123; - RET_CHANNELLER_SLAB_LOOP_DUNGEON_STAGE_NOT_OPEN = 9130; - RET_CHANNELLER_SLAB_LOOP_DUNGEON_NOT_OPEN = 9131; - RET_CHANNELLER_SLAB_LOOP_DUNGEON_FIRST_PASS_REWARD_HAS_TAKEN = 9132; - RET_CHANNELLER_SLAB_LOOP_DUNGEON_SCORE_REWARD_HAS_TAKEN = 9133; - RET_CHANNELLER_SLAB_INVALID_ONE_OFF_DUNGEON = 9134; - RET_CHANNELLER_SLAB_ONE_OFF_DUNGEON_DONE = 9135; - RET_CHANNELLER_SLAB_ONE_OFF_DUNGEON_STAGE_NOT_OPEN = 9136; - RET_CHANNELLER_SLAB_TOKEN_EXCEED_LIMIT = 9137; - RET_CHANNELLER_SLAB_TOKEN_NOT_ENOUGH = 9138; - RET_CHANNELLER_SLAB_PLAYER_NOT_IN_ONE_OFF_DUNGEON = 9139; - RET_MIST_TRIAL_SELECT_CHARACTER_NUM_NOT_ENOUGH = 9150; - RET_MIST_TRIAL_ALREADY_USING_TRIAL_AVATAR = 9151; - RET_HIDE_AND_SEEK_PLAY_NOT_OPEN = 9160; - RET_HIDE_AND_SEEK_PLAY_MAP_NOT_OPEN = 9161; - RET_HIDE_AND_SEEK_PLAY_MAP_NOT_CHOSEN = 9162; - RET_SUMMER_TIME_DRAFT_WOORD_EXCEED_LIMIT = 9170; - RET_SUMMER_TIME_DRAFT_WOORD_NOT_ENOUGH = 9171; - RET_SUMMER_TIME_MINI_HARPASTUM_EXCEED_LIMIT = 9172; - RET_SUMMER_TIME_MINI_HARPASTUMNOT_ENOUGH = 9173; - RET_BOUNCE_CONJURING_COIN_EXCEED_LIMIT = 9180; - RET_BOUNCE_CONJURING_COIN_NOT_ENOUGH = 9181; - RET_CHESS_TEACH_MAP_FINISHED = 9183; - RET_CHESS_TEACH_MAP_UNFINISHED = 9184; - RET_CHESS_COIN_EXCEED_LIMIT = 9185; - RET_CHESS_COIN_NOT_ENOUGH = 9186; - RET_CHESS_IN_PUNISH_TIME = 9187; - RET_CHESS_PREV_MAP_UNFINISHED = 9188; - RET_CHESS_MAP_LOCKED = 9189; - RET_BLITZ_RUSH_NOT_OPEN = 9192; - RET_BLITZ_RUSH_DUNGEON_NOT_OPEN = 9193; - RET_BLITZ_RUSH_COIN_A_EXCEED_LIMIT = 9194; - RET_BLITZ_RUSH_COIN_B_EXCEED_LIMIT = 9195; - RET_BLITZ_RUSH_COIN_A_NOT_ENOUGH = 9196; - RET_BLITZ_RUSH_COIN_B_NOT_ENOUGH = 9197; - RET_MIRACLE_RING_VALUE_NOT_ENOUGH = 9201; - RET_MIRACLE_RING_CD = 9202; - RET_MIRACLE_RING_REWARD_NOT_TAKEN = 9203; - RET_MIRACLE_RING_NOT_DELIVER = 9204; - RET_MIRACLE_RING_DELIVER_EXCEED = 9205; - RET_MIRACLE_RING_HAS_CREATED = 9206; - RET_MIRACLE_RING_HAS_NOT_CREATED = 9207; - RET_MIRACLE_RING_NOT_YOURS = 9208; - RET_GADGET_FOUNDATION_UNAUTHORIZED = 9251; - RET_GADGET_FOUNDATION_SCENE_NOT_FOUND = 9252; - RET_GADGET_FOUNDATION_NOT_IN_INIT_STATE = 9253; - RET_GADGET_FOUNDATION_BILDING_POINT_NOT_ENOUGHT = 9254; - RET_GADGET_FOUNDATION_NOT_IN_BUILT_STATE = 9255; - RET_GADGET_FOUNDATION_OP_NOT_SUPPORTED = 9256; - RET_GADGET_FOUNDATION_REQ_PLAYER_NOT_IN_SCENE = 9257; - RET_GADGET_FOUNDATION_LOCKED_BY_ANOTHER_PLAYER = 9258; - RET_GADGET_FOUNDATION_NOT_LOCKED = 9259; - RET_GADGET_FOUNDATION_DUPLICATE_LOCK = 9260; - RET_GADGET_FOUNDATION_PLAYER_NOT_FOUND = 9261; - RET_GADGET_FOUNDATION_PLAYER_GEAR_NOT_FOUND = 9262; - RET_GADGET_FOUNDATION_ROTAION_DISABLED = 9263; - RET_GADGET_FOUNDATION_REACH_DUNGEON_GEAR_LIMIT = 9264; - RET_GADGET_FOUNDATION_REACH_SINGLE_GEAR_LIMIT = 9265; - RET_GADGET_FOUNDATION_ROTATION_ON_GOING = 9266; - RET_OP_ACTIVITY_BONUS_NOT_FOUND = 9301; - RET_OP_ACTIVITY_NOT_OPEN = 9302; - RET_MULTISTAGE_PLAY_PLAYER_NOT_IN_SCENE = 9501; - RET_MULTISTAGE_PLAY_NOT_FOUND = 9502; - RET_MULTISTAGE_PLAY_IN_OTHER_STAGE = 9503; - RET_COOP_CHAPTER_NOT_OPEN = 9601; - RET_COOP_COND_NOT_MEET = 9602; - RET_COOP_POINT_LOCKED = 9603; - RET_COOP_NOT_HAVE_PROGRESS = 9604; - RET_COOP_REWARD_HAS_TAKEN = 9605; - RET_DRAFT_HAS_ACTIVE_DRAFT = 9651; - RET_DRAFT_NOT_IN_MY_WORLD = 9652; - RET_DRAFT_NOT_SUPPORT_MP = 9653; - RET_DRAFT_PLAYER_NOT_ENOUGH = 9654; - RET_DRAFT_INCORRECT_SCENE = 9655; - RET_DRAFT_OTHER_PLAYER_ENTERING = 9656; - RET_DRAFT_GUEST_IS_TRANSFERRING = 9657; - RET_DRAFT_GUEST_NOT_IN_DRAFT_SCENE = 9658; - RET_DRAFT_INVITE_OVER_TIME = 9659; - RET_DRAFT_TWICE_CONFIRM_OVER_TIMER = 9660; - RET_DRAFT_GUEST_NOT_IN_WORLD_SCENE = 9661; - RET_HOME_UNKOWN = 9701; - RET_HOME_INVALID_CLIENT_PARAM = 9702; - RET_HOME_TARGE_PLAYER_HAS_NO_HOME = 9703; - RET_HOME_NOT_ONLINE = 9704; - RET_HOME_PLAYER_FULL = 9705; - RET_HOME_BLOCKED = 9706; - RET_HOME_ALREADY_IN_TARGET_HOME_WORLD = 9707; - RET_HOME_IN_EDIT_MODE = 9708; - RET_HOME_NOT_IN_EDIT_MODE = 9709; - RET_HOME_HAS_GUEST = 9710; - RET_HOME_CANT_ENTER_BY_IN_EDIT_MODE = 9711; - RET_HOME_CLIENT_PARAM_INVALID = 9712; - RET_HOME_PLAYER_NOT_IN_HOME_WORLD = 9713; - RET_HOME_PLAYER_NOT_IN_SELF_HOME_WORLD = 9714; - RET_HOME_NOT_FOUND_IN_MEM = 9715; - RET_HOME_PLAYER_IN_HOME_ROOM_SCENE = 9716; - RET_HOME_HOME_REFUSE_GUEST_ENTER = 9717; - RET_HOME_OWNER_REFUSE_TO_ENTER_HOME = 9718; - RET_HOME_OWNER_OFFLINE = 9719; - RET_HOME_FURNITURE_EXCEED_LIMIT = 9720; - RET_HOME_FURNITURE_COUNT_NOT_ENOUGH = 9721; - RET_HOME_IN_TRY_ENTER_PROCESS = 9722; - RET_HOME_ALREADY_IN_TARGET_SCENE = 9723; - RET_HOME_COIN_EXCEED_LIMIT = 9724; - RET_HOME_COIN_NOT_ENOUGH = 9725; - RET_HOME_MODULE_NOT_UNLOCKED = 9726; - RET_HOME_CUR_MODULE_CLOSED = 9727; - RET_HOME_FURNITURE_SUITE_NOT_UNLOCKED = 9728; - RET_HOME_IN_MATCH = 9729; - RET_HOME_IN_COMBAT = 9730; - RET_HOME_EDIT_MODE_CD = 9731; - RET_HOME_UPDATE_FURNITURE_CD = 9732; - RET_HOME_BLOCK_FURNITURE_LIMIT = 9733; - RET_HOME_NOT_SUPPORT = 9734; - RET_HOME_STATE_NOT_OPEN = 9735; - RET_HOME_TARGET_STATE_NOT_OPEN = 9736; - RET_HOME_APPLY_ENTER_OTHER_HOME_FAIL = 9737; - RET_HOME_SAVE_NO_MAIN_HOUSE = 9738; - RET_HOME_IN_DUNGEON = 9739; - RET_HOME_ANY_GALLERY_STARTED = 9740; - RET_HOME_QUEST_BLOCK_HOME = 9741; - RET_HOME_WAITING_PRIOR_CHECK = 9742; - RET_HOME_PERSISTENT_CHECK_FAIL = 9743; - RET_HOME_FIND_ONLINE_HOME_FAIL = 9744; - RET_HOME_JOIN_SCENE_FAIL = 9745; - RET_HOME_MAX_PLAYER = 9746; - RET_HOME_IN_TRANSFER = 9747; - RET_HOME_ANY_HOME_GALLERY_STARTED = 9748; - RET_HOME_CAN_NOT_ENTER_IN_AUDIT = 9749; - RET_FURNITURE_MAKE_INDEX_ERROR = 9750; - RET_FURNITURE_MAKE_LOCKED = 9751; - RET_FURNITURE_MAKE_CONFIG_ERROR = 9752; - RET_FURNITURE_MAKE_SLOT_FULL = 9753; - RET_FURNITURE_MAKE_ADD_FURNITURE_FAIL = 9754; - RET_FURNITURE_MAKE_UNFINISH = 9755; - RET_FURNITURE_MAKE_IS_FINISH = 9756; - RET_FURNITURE_MAKE_NOT_IN_CORRECT_HOME = 9757; - RET_FURNITURE_MAKE_NO_COUNT = 9758; - RET_FURNITURE_MAKE_ACCELERATE_LIMIT = 9759; - RET_FURNITURE_MAKE_NO_MAKE_DATA = 9760; - RET_HOME_LIMITED_SHOP_CLOSE = 9761; - RET_HOME_AVATAR_NOT_SHOW = 9762; - RET_HOME_EVENT_COND_NOT_SATISFIED = 9763; - RET_HOME_INVALID_ARRANGE_ANIMAL_PARAM = 9764; - RET_HOME_INVALID_ARRANGE_NPC_PARAM = 9765; - RET_HOME_INVALID_ARRANGE_SUITE_PARAM = 9766; - RET_HOME_INVALID_ARRANGE_MAIN_HOUSE_PARAM = 9767; - RET_HOME_AVATAR_STATE_NOT_OPEN = 9768; - RET_HOME_PLANT_FIELD_NOT_EMPTY = 9769; - RET_HOME_PLANT_FIELD_EMPTY = 9770; - RET_HOME_PLANT_FIELD_TYPE_ERROR = 9771; - RET_HOME_PLANT_TIME_NOT_ENOUGH = 9772; - RET_HOME_PLANT_SUB_FIELD_NUM_NOT_ENOUGH = 9773; - RET_HOME_PLANT_FIELD_PARAM_ERROR = 9774; - RET_HOME_FURNITURE_GUID_ERROR = 9775; - RET_HOME_FURNITURE_ARRANGE_LIMIT = 9776; - RET_HOME_FISH_FARMING_LIMIT = 9777; - RET_HOME_FISH_COUNT_NOT_ENOUGH = 9778; - RET_HOME_FURNITURE_COST_LIMIT = 9779; - RET_HOME_CUSTOM_FURNITURE_INVALID = 9780; - RET_HOME_INVALID_ARRANGE_GROUP_PARAM = 9781; - RET_HOME_FURNITURE_ARRANGE_GROUP_LIMIT = 9782; - RET_HOME_PICTURE_FRAME_COOP_CG_GENDER_ERROR = 9783; - RET_HOME_PICTURE_FRAME_COOP_CG_NOT_UNLOCK = 9784; - RET_HOME_FURNITURE_CANNOT_ARRANGE = 9785; - RET_HOME_FURNITURE_IN_DUPLICATE_SUITE = 9786; - RET_HOME_FURNITURE_CUSTOM_SUITE_TOO_SMALL = 9787; - RET_HOME_FURNITURE_CUSTOM_SUITE_TOO_BIG = 9788; - RET_HOME_FURNITURE_SUITE_EXCEED_LIMIT = 9789; - RET_HOME_FURNITURE_CUSTOM_SUITE_EXCEED_LIMIT = 9790; - RET_HOME_FURNITURE_CUSTOM_SUITE_INVALID_SURFACE_TYPE = 9791; - RET_HOME_BGM_ID_NOT_FOUND = 9792; - RET_HOME_BGM_NOT_UNLOCKED = 9793; - RET_HOME_BGM_FURNITURE_NOT_FOUND = 9794; - RET_HOME_BGM_NOT_SUPPORT_BY_CUR_SCENE = 9795; - RET_HOME_LIMITED_SHOP_GOODS_DISABLE = 9796; - RET_HOME_WORLD_WOOD_MATERIAL_EMPTY = 9797; - RET_HOME_WORLD_WOOD_MATERIAL_NOT_FOUND = 9798; - RET_HOME_WORLD_WOOD_MATERIAL_COUNT_INVALID = 9799; - RET_HOME_WORLD_WOOD_EXCHANGE_EXCEED_LIMIT = 9800; - RET_HOME_BLUEPRINT_SEARCH_SELF = 9801; - RET_HOME_BLUEPRINT_SHARE_CODE_INVALID = 9802; - RET_HOME_BLUEPRINT_NOT_EXIST = 9803; - RET_HOME_BLUEPRINT_SLOT_HAS_EXIST_SHARE_CODE = 9804; - RET_HOME_BLUEPRINT_SLOT_NOT_EXIST_SHARE_CODE = 9805; - RET_HOME_BLUEPRINT_CAN_NOT_CREATE_IN_AUDIT = 9806; - RET_HOME_BLOCK_NOT_UNLOCKED = 9807; - RET_HOME_BLUEPRINT_CREATE_CD = 9808; - RET_HOME_BLUEPRINT_SET_OPTION_CD = 9809; - RET_HOME_BLUEPRINT_NOT_ALLOW_FRIEND_COPY = 9810; - RET_HOME_FURNITURE_POS_UNDER_DIE_Y = 9811; - RET_HOME_BLUEPRINT_GEN_SHARE_CODE_FAIL = 9812; - RET_HOME_BLUEPRINT_SEARCH_CD = 9813; - RET_HOME_BLUEPRINT_PREVIEW_CD = 9814; - RET_HOME_BLUEPRINT_PREVIEW_SCENE_NOT_MATCH = 9815; - RET_SUMO_ACTIVITY_STAGE_NOT_OPEN = 10000; - RET_SUMO_ACTIVITY_SWITCH_TEAM_IN_CD = 10001; - RET_SUMO_ACTIVITY_TEAM_NUM_INCORRECT = 10002; - RET_LUNA_RITE_ACTIVITY_AREA_ID_ERROR = 10004; - RET_LUNA_RITE_ACTIVITY_BATTLE_NOT_FINISH = 10005; - RET_LUNA_RITE_ACTIVITY_ALREADY_SACRIFICE = 10006; - RET_LUNA_RITE_ACTIVITY_ALREADY_TAKE_REWARD = 10007; - RET_LUNA_RITE_ACTIVITY_SACRIFICE_NOT_ENOUGH = 10008; - RET_LUNA_RITE_ACTIVITY_SEARCHING_COND_NOT_MEET = 10009; - RET_DIG_GADGET_CONFIG_ID_NOT_MATCH = 10015; - RET_DIG_FIND_NEAREST_POS_FAIL = 10016; - RET_MUSIC_GAME_LEVEL_NOT_OPEN = 10021; - RET_MUSIC_GAME_LEVEL_NOT_UNLOCK = 10022; - RET_MUSIC_GAME_LEVEL_NOT_STARTED = 10023; - RET_MUSIC_GAME_LEVEL_CONFIG_NOT_FOUND = 10024; - RET_MUSIC_GAME_LEVEL_ID_NOT_MATCH = 10025; - RET_ROGUELIKE_COIN_A_NOT_ENOUGH = 10031; - RET_ROGUELIKE_COIN_B_NOT_ENOUGH = 10032; - RET_ROGUELIKE_COIN_C_NOT_ENOUGH = 10033; - RET_ROGUELIKE_COIN_A_EXCEED_LIMIT = 10034; - RET_ROGUELIKE_COIN_B_EXCEED_LIMIT = 10035; - RET_ROGUELIKE_COIN_C_EXCEED_LIMIT = 10036; - RET_ROGUELIKE_RUNE_COUNT_NOT_ENOUGH = 10037; - RET_ROGUELIKE_NOT_IN_ROGUE_DUNGEON = 10038; - RET_ROGUELIKE_CELL_NOT_FOUND = 10039; - RET_ROGUELIKE_CELL_TYPE_INCORRECT = 10040; - RET_ROGUELIKE_CELL_ALREADY_FINISHED = 10041; - RET_ROGUELIKE_DUNGEON_HAVE_UNFINISHED_PROGRESS = 10042; - RET_ROGUELIKE_STAGE_NOT_FINISHED = 10043; - RET_ROGUELIKE_STAGE_FIRST_PASS_REWARD_HAS_TAKEN = 10045; - RET_ROGUELIKE_ACTIVITY_CONTENT_CLOSED = 10046; - RET_ROGUELIKE_DUNGEON_PRE_QUEST_NOT_FINISHED = 10047; - RET_ROGUELIKE_DUNGEON_NOT_OPEN = 10048; - RET_ROGUELIKE_SPRINT_IS_BANNED = 10049; - RET_ROGUELIKE_DUNGEON_PRE_STAGE_NOT_FINISHED = 10050; - RET_ROGUELIKE_ALL_AVATAR_DIE_CANNOT_RESUME = 10051; - RET_PLANT_FLOWER_ALREADY_TAKE_SEED = 10056; - RET_PLANT_FLOWER_FRIEND_HAVE_FLOWER_LIMIT = 10057; - RET_PLANT_FLOWER_CAN_GIVE_FLOWER_NOT_ENOUGH = 10058; - RET_PLANT_FLOWER_WISH_FLOWER_KINDS_LIMIT = 10059; - RET_PLANT_FLOWER_HAVE_FLOWER_NOT_ENOUGH = 10060; - RET_PLANT_FLOWER_FLOWER_COMBINATION_INVALID = 10061; - RET_HACHI_DUNGEON_NOT_VALID = 10052; - RET_HACHI_DUNGEON_STAGE_NOT_OPEN = 10053; - RET_HACHI_DUNGEON_TEAMMATE_NOT_PASS = 10054; - RET_WINTER_CAMP_COIN_A_NOT_ENOUGH = 10071; - RET_WINTER_CAMP_COIN_B_NOT_ENOUGH = 10072; - RET_WINTER_CAMP_COIN_A_EXCEED_LIMIT = 10073; - RET_WINTER_CAMP_COIN_B_EXCEED_LIMIT = 10074; - RET_WINTER_CAMP_WISH_ID_INVALID = 10075; - RET_WINTER_CAMP_NOT_FOUND_RECV_ITEM_DATA = 10076; - RET_WINTER_CAMP_FRIEND_ITEM_COUNT_OVERFLOW = 10077; - RET_WINTER_CAMP_SELECT_ITEM_DATA_INVALID = 10078; - RET_WINTER_CAMP_ITEM_LIST_EMPTY = 10079; - RET_WINTER_CAMP_REWARD_ALREADY_TAKEN = 10080; - RET_WINTER_CAMP_STAGE_NOT_FINISH = 10081; - RET_WINTER_CAMP_GADGET_INVALID = 10082; - RET_LANTERN_RITE_COIN_A_NOT_ENOUGH = 10090; - RET_LANTERN_RITE_COIN_B_NOT_ENOUGH = 10091; - RET_LANTERN_RITE_COIN_C_NOT_ENOUGH = 10092; - RET_LANTERN_RITE_COIN_A_EXCEED_LIMIT = 10093; - RET_LANTERN_RITE_COIN_B_EXCEED_LIMIT = 10094; - RET_LANTERN_RITE_COIN_C_EXCEED_LIMIT = 10095; - RET_LANTERN_RITE_PROJECTION_CONTENT_CLOSED = 10096; - RET_LANTERN_RITE_PROJECTION_CAN_NOT_START = 10097; - RET_LANTERN_RITE_DUNGEON_NOT_OPEN = 10098; - RET_LANTERN_RITE_HAS_TAKEN_SKIN_REWARD = 10099; - RET_LANTERN_RITE_NOT_FINISHED_SKIN_WATCHERS = 10100; - RET_LANTERN_RITE_FIREWORKS_CONTENT_CLOSED = 10101; - RET_LANTERN_RITE_FIREWORKS_CHALLENGE_NOT_START = 10102; - RET_LANTERN_RITE_FIREWORKS_REFORM_PARAM_ERROR = 10103; - RET_LANTERN_RITE_FIREWORKS_REFORM_SKILL_LOCK = 10104; - RET_LANTERN_RITE_FIREWORKS_REFORM_STAMINA_NOT_ENOUGH = 10105; - RET_POTION_ACTIVITY_STAGE_NOT_OPEN = 10110; - RET_POTION_ACTIVITY_LEVEL_HAVE_PASS = 10111; - RET_POTION_ACTIVITY_TEAM_NUM_INCORRECT = 10112; - RET_POTION_ACTIVITY_AVATAR_IN_CD = 10113; - RET_POTION_ACTIVITY_BUFF_IN_CD = 10114; - RET_IRODORI_POETRY_INVALID_LINE_ID = 10120; - RET_IRODORI_POETRY_INVALID_THEME_ID = 10121; - RET_IRODORI_POETRY_NOT_GET_ALL_INSPIRATION = 10122; - RET_IRODORI_POETRY_INSPIRATION_REACH_LIMIE = 10123; - RET_IRODORI_POETRY_ENTITY_ALREADY_SCANNED = 10124; - RET_ACTIVITY_BANNER_ALREADY_CLEARED = 10300; - RET_IRODORI_CHESS_NOT_OPEN = 10301; - RET_IRODORI_CHESS_LEVEL_NOT_OPEN = 10302; - RET_IRODORI_CHESS_MAP_NOT_OPEN = 10303; - RET_IRODORI_CHESS_MAP_CARD_ALREADY_EQUIPED = 10304; - RET_IRODORI_CHESS_EQUIP_CARD_EXCEED_LIMIT = 10305; - RET_IRODORI_CHESS_MAP_CARD_NOT_EQUIPED = 10306; - RET_IRODORI_CHESS_ENTER_FAIL_CARD_EXCEED_LIMIT = 10307; - RET_ACTIVITY_FRIEND_HAVE_GIFT_LIMIT = 10310; - RET_GACHA_ACTIVITY_HAVE_REWARD_LIMIT = 10315; - RET_GACHA_ACTIVITY_HAVE_ROBOT_LIMIT = 10316; - RET_SUMMER_TIME_V2_COIN_EXCEED_LIMIT = 10317; - RET_SUMMER_TIME_V2_COIN_NOT_ENOUGH = 10318; - RET_SUMMER_TIME_V2_DUNGEON_STAGE_NOT_OPEN = 10319; - RET_SUMMER_TIME_V2_PREV_DUNGEON_NOT_COMPLETE = 10320; - RET_ROGUE_DIARY_AVATAR_DEATH = 10350; - RET_ROGUE_DIARY_AVATAR_TIRED = 10351; - RET_ROGUE_DIARY_AVATAR_DUPLICATED = 10352; - RET_ROGUE_DIARY_COIN_NOT_ENOUGH = 10353; - RET_ROGUE_DIARY_VIRTUAL_COIN_EXCEED_LIMIT = 10354; - RET_ROGUE_DIARY_VIRTUAL_COIN_NOT_ENOUGH = 10355; - RET_ROGUE_DIARY_CONTENT_CLOSED = 10366; - RET_GRAVEN_INNOCENCE_COIN_A_NOT_ENOUGH = 10380; - RET_GRAVEN_INNOCENCE_COIN_B_NOT_ENOUGH = 10381; - RET_GRAVEN_INNOCENCE_COIN_A_EXCEED_LIMIT = 10382; - RET_GRAVEN_INNOCENCE_COIN_B_EXCEED_LIMIT = 10383; - RET_ISLAND_PARTY_STAGE_NOT_OPEN = 10371; - RET_WIND_FIELD_STAGE_NOT_OPEN = 10390; - RET_VINTAGE_CONTENT_CLOSED = 10396; - RET_VINTAGE_STORE_CONTENT_FINISHED = 10397; - RET_VINTAGE_STORE_ATTR_TOO_SMALL = 10398; - RET_VINTAGE_STORE_ATTR_TOO_LARGE = 10399; - RET_VINTAGE_STORE_CONTENT_INTERRUPT = 10400; - RET_VINTAGE_VIRTUAL_COIN_NOT_ENOUGH = 10401; - RET_VINTAGE_STORE_ATTR_LESS_THAN_ZERO = 10402; - RET_FUNGUS_FIGHTER_CAPTURE_COIN_NOT_ENOUGH = 10406; - RET_FUNGUS_FIGHTER_TRAINING_COIN_NOT_ENOUGH = 10407; - RET_FUNGUS_FIGHTER_CAPTURE_COIN_EXCEED_LIMIT = 10408; - RET_FUNGUS_FIGHTER_TRAINING_COIN_EXCEED_LIMIT = 10409; - RET_FUNGUS_FIGHTER_CONTENT_CLOSED = 10410; - RET_FUNGUS_FIGHTER_PLOT_STAGE_NOT_OPEN = 10411; - RET_FUNGUS_FIGHTER_FUNGUS_ID_CONFIG_NOT_VALID = 10412; - RET_FUNGUS_FIGHTER_FUNGUS_NOT_CULTIVATED = 10413; - RET_FUNGUS_FIGHTER_TRAINING_DUNGEON_NOT_OPEN = 10414; - RET_EFFIGY_CHALLENGE_V2_COIN_NOT_ENOUGH = 10427; - RET_EFFIGY_CHALLENGE_V2_COIN_EXCEED_LIMIT = 10428; - RET_CHAR_AMUSEMENT_STAGE_NOT_OPEN = 10436; - RET_COIN_COLLECT_LEVEL_NOT_OPEN = 10446; - RET_COIN_COLLECT_NOT_EQUIP_WIDGET = 10447; - RET_COIN_COLLECT_SCENE_NOT_MATCH = 10448; - RET_COIN_COLLECT_CANT_ENTER_MP_MODE = 10449; - RET_COIN_COLLECT_PLAYER_NUM_FAIL = 10450; - RET_BRICK_BREAKER_PLAYER_NUM_FAIL = 10456; - RET_BRICK_BREAKER_STAGE_NOT_UNLOCK = 10457; - RET_BRICK_BREAKER_NORMAL_LEVEL_NOT_FINISH = 10458; - RET_BRICK_BREAKER_PRE_LEVEL_NOT_FINISH = 10459; - RET_BRICK_BREAKER_PRE_STAGE_NOT_FINISH = 10460; - RET_BRICK_BREAKER_WORLD_LEVEL_NOT_UNLOCK = 10461; - RET_BRICK_BREAKER_DUNGEON_LEVEL_NOT_UNLOCK = 10462; - RET_BRICK_BREAKER_COIN_NOT_ENOUGH = 10463; - RET_BRICK_BREAKER_COIN_EXCEED_LIMIT = 10464; - RET_ACTIVITY_CONTENT_CLOSED = 10901; - RET_NOT_IN_FISHING = 11001; - RET_FISH_STATE_ERROR = 11002; - RET_FISH_BAIT_LIMIT = 11003; - RET_FISHING_MAX_DISTANCE = 11004; - RET_FISHING_IN_COMBAT = 11005; - RET_FISHING_BATTLE_TOO_SHORT = 11006; - RET_FISH_GONE_AWAY = 11007; - RET_CAN_NOT_EDIT_OTHER_DUNGEON = 11051; - RET_CUSTOM_DUNGEON_DISMATCH = 11052; - RET_NO_CUSTOM_DUNGEON_DATA = 11053; - RET_BUILD_CUSTOM_DUNGEON_FAIL = 11054; - RET_CUSTOM_DUNGEON_ROOM_CHECK_FAIL = 11055; - RET_CUSTOM_DUNGEON_SAVE_MAY_FAIL = 11056; - RET_NOT_IN_CUSTOM_DUNGEON = 11057; - RET_CUSTOM_DUNGEON_INTERNAL_FAIL = 11058; - RET_CUSTOM_DUNGEON_CAN_NOT_TRY = 11059; - RET_CUSTOM_DUNGEON_NO_START_ROOM = 11060; - RET_CUSTOM_DUNGEON_NO_ROOM_DATA = 11061; - RET_CUSTOM_DUNGEON_SAVE_TOO_FREQUENT = 11062; - RET_CUSTOM_DUNGEON_NOT_SELF_PASS = 11063; - RET_CUSTOM_DUNGEON_LACK_COIN = 11064; - RET_CUSTOM_DUNGEON_NO_FINISH_BRICK = 11065; - RET_CUSTOM_DUNGEON_MULTI_FINISH = 11066; - RET_CUSTOM_DUNGEON_NOT_PUBLISHED = 11067; - RET_CUSTOM_DUNGEON_FULL_STORE = 11068; - RET_CUSTOM_DUNGEON_STORE_REPEAT = 11069; - RET_CUSTOM_DUNGEON_CAN_NOT_STORE_SELF = 11070; - RET_CUSTOM_DUNGEON_NOT_SAVE_SUCC = 11071; - RET_CUSTOM_DUNGEON_CAN_NOT_LIKE_SELF = 11072; - RET_CUSTOM_DUNGEON_NOT_FOUND = 11073; - RET_CUSTOM_DUNGEON_INVALID_SETTING = 11074; - RET_CUSTOM_DUNGEON_NO_FINISH_SETTING = 11075; - RET_CUSTOM_DUNGEON_SAVE_NOTHING = 11076; - RET_CUSTOM_DUNGEON_NOT_IN_GROUP = 11077; - RET_CUSTOM_DUNGEON_NOT_OFFICIAL = 11078; - RET_CUSTOM_DUNGEON_LIFE_NUM_ERROR = 11079; - RET_CUSTOM_DUNGEON_NO_OPEN_ROOM = 11080; - RET_CUSTOM_DUNGEON_BRICK_EXCEED_LIMIT = 11081; - RET_CUSTOM_DUNGEON_OFFICIAL_NOT_UNLOCK = 11082; - RET_CAN_NOT_EDIT_OFFICIAL_SETTING = 11083; - RET_CUSTOM_DUNGEON_BAN_PUBLISH = 11084; - RET_CUSTOM_DUNGEON_CAN_NOT_REPLAY = 11085; - RET_CUSTOM_DUNGEON_NOT_OPEN_GROUP = 11086; - RET_CUSTOM_DUNGEON_MAX_EDIT_NUM = 11087; - RET_CUSTOM_DUNGEON_CAN_NOT_OUT_STUCK = 11088; - RET_CUSTOM_DUNGEON_MAX_TAG = 11089; - RET_CUSTOM_DUNGEON_INVALID_TAG = 11090; - RET_CUSTOM_DUNGEON_MAX_COST = 11091; - RET_CUSTOM_DUNGEON_REQUEST_TOO_FREQUENT = 11092; - RET_CUSTOM_DUNGEON_NOT_OPEN = 11093; - RET_SHARE_CD_ID_ERROR = 11101; - RET_SHARE_CD_INDEX_ERROR = 11102; - RET_SHARE_CD_IN_CD = 11103; - RET_SHARE_CD_TOKEN_NOT_ENOUGH = 11104; - RET_UGC_DISMATCH = 11151; - RET_UGC_DATA_NOT_FOUND = 11152; - RET_UGC_BRIEF_NOT_FOUND = 11153; - RET_UGC_DISABLED = 11154; - RET_UGC_LIMITED = 11155; - RET_UGC_LOCKED = 11156; - RET_UGC_NOT_AUTH = 11157; - RET_UGC_NOT_OPEN = 11158; - RET_UGC_BAN_PUBLISH = 11159; - RET_COMPOUND_BOOST_ITEM_NOT_EXIST = 11201; - RET_COMPOUND_BOOST_TARGET_NOT_EXIST = 11202; - RET_QUICK_HIT_TREE_EMPTY_TREES = 11211; - RET_GCG_FIND_GAME_MODE_FAIL = 12000; - RET_GCG_OPERATION_PARAM_ERROR = 12001; - RET_GCG_GAME_NOT_RUNNING = 12002; - RET_GCG_OP_NOT_ALLOW = 12003; - RET_GCG_OP_NOT_MATCH_PHASE = 12004; - RET_GCG_SELECT_HAND_CARD_GUID_ERROR = 12005; - RET_GCG_DICE_INDEX_INVALID = 12006; - RET_GCG_CHARACTER_GUID_INVALID = 12007; - RET_GCG_CHARACTER_ALREADY_DIE = 12008; - RET_GCG_CHARACTER_ALREADY_ON_STAGE = 12009; - RET_GCG_CHARACTER_FORBIDDEN_ATTACK = 12010; - RET_GCG_SELECT_DICE_NOT_MATCH = 12011; - RET_GCG_FIND_SKILL_FAIL = 12012; - RET_GCG_SKILL_CAN_NOT_ACTIVE_USE = 12013; - RET_GCG_ENERGY_NOT_ENOUGH = 12014; - RET_GCG_PLAY_CARD_TARGET_NOT_MATCH = 12015; - RET_GCG_PLAY_CARD_ZONE_CANNOT_ADD = 12016; - RET_GCG_REBOOT_SELECT_DICE_INVALID = 12017; - RET_GCG_REBOOT_SELECT_CARD_INVALID = 12018; - RET_GCG_PLAY_CARD_CONDITION_CHECK_FAIL = 12019; - RET_GCG_PLAY_CARD_PARAM_INVALID = 12020; - RET_GCG_MAX_GAME = 12021; - RET_GCG_SEND_PACKET_FAIL = 12022; - RET_GCG_ALREADY_SETTLE = 12023; - RET_GCG_COIN_EXCEED_LIMIT = 12101; - RET_GCG_COIN_NOT_ENOUGH = 12102; - RET_GCG_NOT_IN_SELF_WORLD = 12103; - RET_GCG_ALREADY_IN_DUEL = 12104; - RET_GCG_NOT_IN_PLAYER_WORLD = 12105; - RET_GCG_GALLERY_STARTED = 12106; - RET_GCG_INVITE_TARGET_IS_SELF = 12107; - RET_GCG_INVITE_TARGET_NOT_IN_WORLD = 12108; - RET_GCG_APPLY_INVITE_NOT_ALLOW = 12109; - RET_GCG_APPLY_INVITE_TIMEOUT = 12110; - RET_GCG_CUR_DECK_INVALID = 12111; - RET_GCG_NEED_RESOURCE_COMPLETE = 12112; - RET_GCG_OPPONENT_PLAYER_IS_SELF = 12113; - RET_GCG_GAME_ID_INVALID = 12114; - RET_GCG_MATCH_IN_PUNISH = 12115; - RET_GCG_SETTLE_STILL_IN_DUEL = 12116; - RET_GCG_SETTLE_NOT_IN_DUNGEON = 12117; - RET_GCG_UNSUPPORT_SETTLE_OPTION = 12118; - RET_GCG_NOT_IN_GCG_DUNGEON = 12119; - RET_GCG_WORLD_LEVEL_LOCKED = 12120; - RET_GCG_BOSS_LEVEL_LOCKED = 12121; - RET_GCG_NOT_IN_TAVERN = 12122; - RET_GCG_WEEK_NPC_NOT_EXIST = 12123; - RET_GCG_ENTER_GAME_FREQUENT = 12124; - RET_GCG_BREAK_LEVEL_QUEST_NOT_UNFINISHED = 12125; - RET_GCG_GUIDE_LEVEL_ALREADY_FINISHED = 12126; - RET_GCG_LEVEL_CANNOT_RESTART = 12127; - RET_GCG_TARGET_CHECK_ENTER_FAIL = 12128; - RET_GCG_ALREADY_IN_DUNGEON = 12129; - RET_GCG_BACK_DUEL_NO_GAME = 12130; - RET_GCG_CONST_LEVEL_LOCKED = 12131; - RET_GCG_QUEST_ID_ERROR = 12132; - RET_GCG_QUEST_NEED_UNFINISHED = 12133; - RET_GCG_IN_MATCH = 12134; - RET_GCG_DATA_VERSION_NOT_LATEST = 12135; - RET_GCG_INVITE_TARGET_ENTER_GAME_FREQUENT = 12136; - RET_GCG_INVITE_TARGET_NEED_RESOURCE_COMPLETE = 12137; - RET_GCG_INVITE_TARGET_SCENE_IS_NULL = 12138; - RET_GCG_INVITE_TARGET_IN_TRANSFER = 12139; - RET_GCG_INVITE_TARGET_DATA_VERSION_NOT_LATEST = 12140; - RET_GCG_INVITE_TARGET_CUR_DECK_INVALID = 12141; - RET_GCG_CLIENT_DATA_VERSION_NOT_MATCH = 12142; - RET_GCG_CLIENT_DATA_VERSOIN_FORBID = 12143; - RET_GCG_MP_CANT_MATCH = 12144; - RET_GCG_INVITE_TARGET_STATE_NOT_OPEN = 12145; - RET_GCG_CREATE_TIME_OUT = 12146; - RET_GCG_BAN_MATCH = 12147; - RET_GCG_BAN_INVITE = 12148; - RET_GCG_TARGET_BAN_INVITE = 12149; - RET_GCG_INVITE_ALREADY_INVITE = 12150; - RET_GCG_BACK_DUEL_PS_TO_OTHER = 12153; - RET_GCG_BACK_DUEL_OTHER_TO_PS = 12154; - RET_GCG_DS_DECK_LOCKED = 12201; - RET_GCG_DS_DECK_NAME_INVALID = 12202; - RET_GCG_DS_DECK_CHAR_CARD_NUM_INVALID = 12204; - RET_GCG_DS_DECK_CARD_NUM_INVALID = 12205; - RET_GCG_DS_CARD_NUM_EXCEED_LIMIT = 12206; - RET_GCG_DS_DECK_INVALID = 12207; - RET_GCG_DS_CARD_ID_INVALID = 12208; - RET_GCG_DS_CARD_FACE_ALREADY_UNLOCK = 12209; - RET_GCG_DS_CARD_FACE_IS_LOCK = 12210; - RET_GCG_DS_FIELD_LOCK = 12211; - RET_GCG_DS_FIELD_ALREADY_UNLOCK = 12212; - RET_GCG_DS_FIELD_ID_INVALID = 12213; - RET_GCG_DS_CARD_BACK_LOCKED = 12214; - RET_GCG_DS_CARD_BACK_ALREADY_UNLOCK = 12215; - RET_GCG_DS_CARD_BACK_ID_INVALID = 12216; - RET_GCG_DS_CARD_FACE_ID_INVALID = 12217; - RET_GCG_DS_DECK_NAME_ILLEGAL = 12218; - RET_GCG_DS_DECK_SAVE_CD = 12219; - RET_GCG_DS_DECK_CHANGE_NAME_CD = 12220; - RET_GCG_MATCH_DECK_INVALID = 12221; - RET_GCG_DS_DECK_ALREADY_UNLOCKED = 12222; - RET_GCG_DS_AT_LEAST_ONE_DECK = 12223; - RET_GCG_TC_CHARACTERNOT_MATCH_LEVEL = 12251; - RET_GCG_TC_MUST_IN_SELF_WORLD = 12252; - RET_GCG_TC_MUST_IN_TAVERN = 12253; - RET_GCG_TC_ALREADY_IN_GAME = 12254; - RET_GCG_TC_ALREADY_IN_MATCH = 12255; - RET_GCG_TC_UNLOCK_CHARACTER_QUEST_NOT_FINISH = 12256; - RET_GCG_TC_LEVEL_LOCKED = 12257; - RET_GCG_TC_NO_INVITE_DATA = 12258; - RET_GCG_TC_CUR_DECK_INVALID = 12259; - RET_GCG_TC_COND_QUEST = 12260; - RET_GCG_LEVEL_REWARD_LEVEL_ERROR = 12301; - RET_GCG_LEVEL_REWARD_ALREADY_TAKEN = 12302; - RET_GCG_LEVEL_REWARD_NO_REWARD = 12303; -} + RET_SUCC = 0; + RET_FAIL = -1; + RET_SVR_ERROR = 1; + RET_UNKNOWN_ERROR = 2; + RET_FREQUENT = 3; + RET_NODE_FORWARD_ERROR = 4; + RET_NOT_FOUND_CONFIG = 5; + RET_SYSTEM_BUSY = 6; + RET_GM_UID_BIND = 7; + RET_FORBIDDEN = 8; + RET_STOP_REGISTER = 10; + RET_STOP_SERVER = 11; + RET_ACCOUNT_VEIRFY_ERROR = 12; + RET_ACCOUNT_FREEZE = 13; + RET_REPEAT_LOGIN = 14; + RET_CLIENT_VERSION_ERROR = 15; + RET_TOKEN_ERROR = 16; + RET_ACCOUNT_NOT_EXIST = 17; + RET_WAIT_OTHER_LOGIN = 18; + RET_ANOTHER_LOGIN = 19; + RET_CLIENT_FORCE_UPDATE = 20; + RET_BLACK_UID = 21; + RET_LOGIN_DB_FAIL = 22; + RET_LOGIN_INIT_FAIL = 23; + RET_MYSQL_DUPLICATE = 24; + RET_MAX_PLAYER = 25; + RET_ANTI_ADDICT = 26; + RET_PS_PLAYER_WITHOUT_ONLINE_ID = 27; + RET_ONLINE_ID_NOT_FOUND = 28; + RET_ONLNE_ID_NOT_MATCH = 29; + RET_REGISTER_IS_FULL = 30; + RET_CHECKSUM_INVALID = 31; + RET_BLACK_REGISTER_IP = 32; + RET_EXCEED_REGISTER_RATE = 33; + RET_UNKNOWN_PLATFORM = 34; + RET_TOKEN_PARAM_ERROR = 35; + RET_ANTI_OFFLINE_ERROR = 36; + RET_BLACK_LOGIN_IP = 37; + RET_GET_TOKEN_SESSION_HAS_UID = 38; + RET_ENVIRONMENT_ERROR = 39; + RET_CHECK_CLIENT_VERSION_HASH_FAIL = 40; + RET_MINOR_REGISTER_FOBIDDEN = 41; + RET_SECURITY_LIBRARY_ERROR = 42; + RET_GATE_TICKET_CHECK_ERROR = 43; + RET_AVATAR_IN_CD = 101; + RET_AVATAR_NOT_ALIVE = 102; + RET_AVATAR_NOT_ON_SCENE = 103; + RET_CAN_NOT_FIND_AVATAR = 104; + RET_CAN_NOT_DEL_CUR_AVATAR = 105; + RET_DUPLICATE_AVATAR = 106; + RET_AVATAR_IS_SAME_ONE = 107; + RET_AVATAR_LEVEL_LESS_THAN = 108; + RET_AVATAR_CAN_NOT_CHANGE_ELEMENT = 109; + RET_AVATAR_BREAK_LEVEL_LESS_THAN = 110; + RET_AVATAR_ON_MAX_BREAK_LEVEL = 111; + RET_AVATAR_ID_ALREADY_EXIST = 112; + RET_AVATAR_NOT_DEAD = 113; + RET_AVATAR_IS_REVIVING = 114; + RET_AVATAR_ID_ERROR = 115; + RET_REPEAT_SET_PLAYER_BORN_DATA = 116; + RET_PLAYER_LEVEL_LESS_THAN = 117; + RET_AVATAR_LIMIT_LEVEL_ERROR = 118; + RET_CUR_AVATAR_NOT_ALIVE = 119; + RET_CAN_NOT_FIND_TEAM = 120; + RET_CAN_NOT_FIND_CUR_TEAM = 121; + RET_AVATAR_NOT_EXIST_IN_TEAM = 122; + RET_CAN_NOT_REMOVE_CUR_AVATAR_FROM_TEAM = 123; + RET_CAN_NOT_USE_REVIVE_ITEM_FOR_CUR_AVATAR = 124; + RET_TEAM_COST_EXCEED_LIMIT = 125; + RET_TEAM_AVATAR_IN_EXPEDITION = 126; + RET_TEAM_CAN_NOT_CHOSE_REPLACE_USE = 127; + RET_AVATAR_IN_COMBAT = 128; + RET_NICKNAME_UTF_8_ERROR = 130; + RET_NICKNAME_TOO_LONG = 131; + RET_NICKNAME_WORD_ILLEGAL = 132; + RET_NICKNAME_TOO_MANY_DIGITS = 133; + RET_NICKNAME_IS_EMPTY = 134; + RET_NICKNAME_MONTHLY_LIMIT = 135; + RET_NICKNAME_NOT_CHANGED = 136; + RET_PLAYER_NOT_ONLINE = 140; + RET_OPEN_STATE_NOT_OPEN = 141; + RET_FEATURE_CLOSED = 142; + RET_AVATAR_EXPEDITION_AVATAR_DIE = 152; + RET_AVATAR_EXPEDITION_COUNT_LIMIT = 153; + RET_AVATAR_EXPEDITION_MAIN_FORBID = 154; + RET_AVATAR_EXPEDITION_TRIAL_FORBID = 155; + RET_TEAM_NAME_ILLEGAL = 156; + RET_IS_NOT_IN_STANDBY = 157; + RET_IS_IN_DUNGEON = 158; + RET_IS_IN_LOCK_AVATAR_QUEST = 159; + RET_IS_USING_TRIAL_AVATAR = 160; + RET_IS_USING_TEMP_AVATAR = 161; + RET_NOT_HAS_FLYCLOAK = 162; + RET_FETTER_REWARD_ALREADY_GOT = 163; + RET_FETTER_REWARD_LEVEL_NOT_ENOUGH = 164; + RET_WORLD_LEVEL_ADJUST_MIN_LEVEL = 165; + RET_WORLD_LEVEL_ADJUST_CD = 166; + RET_NOT_HAS_COSTUME = 167; + RET_COSTUME_AVATAR_ERROR = 168; + RET_FLYCLOAK_PLATFORM_TYPE_ERR = 169; + RET_IN_TRANSFER = 170; + RET_IS_IN_LOCK_AVATAR = 171; + RET_FULL_BACKUP_TEAM = 172; + RET_BACKUP_TEAM_ID_NOT_VALID = 173; + RET_BACKUP_TEAM_IS_CUR_TEAM = 174; + RET_AVATAR_RENAME_IN_CD = 175; + RET_AVATAR_RENAME_IN_AUDIT = 176; + RET_AVATAR_RENAME_IN_IP_BLACK_LIST = 177; + RET_FLOAT_ERROR = 201; + RET_NPC_NOT_EXIST = 301; + RET_NPC_TOO_FAR = 302; + RET_NOT_CURRENT_TALK = 303; + RET_NPC_CREATE_FAIL = 304; + RET_NPC_MOVE_FAIL = 305; + RET_QUEST_NOT_EXIST = 401; + RET_QUEST_IS_FAIL = 402; + RET_QUEST_CONTENT_ERROR = 403; + RET_BARGAIN_NOT_ACTIVATED = 404; + RET_BARGAIN_FINISHED = 405; + RET_INFERENCE_ASSOCIATE_WORD_ERROR = 406; + RET_INFERENCE_SUBMIT_WORD_NO_CONCLUSION = 407; + RET_POINT_NOT_UNLOCKED = 501; + RET_POINT_TOO_FAR = 502; + RET_POINT_ALREAY_UNLOCKED = 503; + RET_ENTITY_NOT_EXIST = 504; + RET_ENTER_SCENE_FAIL = 505; + RET_PLAYER_IS_ENTER_SCENE = 506; + RET_CITY_MAX_LEVEL = 507; + RET_AREA_LOCKED = 508; + RET_JOIN_OTHER_WAIT = 509; + RET_WEATHER_AREA_NOT_FOUND = 510; + RET_WEATHER_IS_LOCKED = 511; + RET_NOT_IN_SELF_SCENE = 512; + RET_GROUP_NOT_EXIST = 513; + RET_MARK_NAME_ILLEGAL = 514; + RET_MARK_ALREADY_EXISTS = 515; + RET_MARK_OVERFLOW = 516; + RET_MARK_NOT_EXISTS = 517; + RET_MARK_UNKNOWN_TYPE = 518; + RET_MARK_NAME_TOO_LONG = 519; + RET_DISTANCE_LONG = 520; + RET_ENTER_SCENE_TOKEN_INVALID = 521; + RET_NOT_IN_WORLD_SCENE = 522; + RET_ANY_GALLERY_STARTED = 523; + RET_GALLERY_NOT_START = 524; + RET_GALLERY_INTERRUPT_ONLY_ON_SINGLE_MODE = 525; + RET_GALLERY_CANNOT_INTERRUPT = 526; + RET_GALLERY_WORLD_NOT_MEET = 527; + RET_GALLERY_SCENE_NOT_MEET = 528; + RET_CUR_PLAY_CANNOT_TRANSFER = 529; + RET_CANT_USE_WIDGET_IN_HOME_SCENE = 530; + RET_SCENE_GROUP_NOT_MATCH = 531; + RET_POS_ROT_INVALID = 551; + RET_MARK_INVALID_SCENE_ID = 552; + RET_INVALID_SCENE_TO_USE_ANCHOR_POINT = 553; + RET_ENTER_HOME_SCENE_FAIL = 554; + RET_CUR_SCENE_IS_NULL = 555; + RET_GROUP_ID_ERROR = 556; + RET_GALLERY_INTERRUPT_NOT_OWNER = 557; + RET_NO_SPRING_IN_AREA = 558; + RET_AREA_NOT_IN_SCENE = 559; + RET_INVALID_CITY_ID = 560; + RET_INVALID_SCENE_ID = 561; + RET_DEST_SCENE_IS_NOT_ALLOW = 562; + RET_LEVEL_TAG_SWITCH_IN_CD = 563; + RET_LEVEL_TAG_ALREADY_EXIST = 564; + RET_INVALID_AREA_ID = 565; + RET_GALLERY_ONGOING_FORBID = 566; + RET_ITEM_NOT_EXIST = 601; + RET_PACK_EXCEED_MAX_WEIGHT = 602; + RET_ITEM_NOT_DROPABLE = 603; + RET_ITEM_NOT_USABLE = 604; + RET_ITEM_INVALID_USE_COUNT = 605; + RET_ITEM_INVALID_DROP_COUNT = 606; + RET_ITEM_ALREADY_EXIST = 607; + RET_ITEM_IN_COOLDOWN = 608; + RET_ITEM_COUNT_NOT_ENOUGH = 609; + RET_ITEM_INVALID_TARGET = 610; + RET_RECIPE_NOT_EXIST = 611; + RET_RECIPE_LOCKED = 612; + RET_RECIPE_UNLOCKED = 613; + RET_COMPOUND_QUEUE_FULL = 614; + RET_COMPOUND_NOT_FINISH = 615; + RET_MAIL_ITEM_NOT_GET = 616; + RET_ITEM_EXCEED_LIMIT = 617; + RET_AVATAR_CAN_NOT_USE = 618; + RET_ITEM_NEED_PLAYER_LEVEL = 619; + RET_RECIPE_NOT_AUTO_QTE = 620; + RET_COMPOUND_BUSY_QUEUE = 621; + RET_NEED_MORE_SCOIN = 622; + RET_SKILL_DEPOT_NOT_FOUND = 623; + RET_HCOIN_NOT_ENOUGH = 624; + RET_SCOIN_NOT_ENOUGH = 625; + RET_HCOIN_EXCEED_LIMIT = 626; + RET_SCOIN_EXCEED_LIMIT = 627; + RET_MAIL_EXPIRED = 628; + RET_REWARD_HAS_TAKEN = 629; + RET_COMBINE_COUNT_TOO_LARGE = 630; + RET_GIVING_ITEM_WRONG = 631; + RET_GIVING_IS_FINISHED = 632; + RET_GIVING_NOT_ACTIVED = 633; + RET_FORGE_QUEUE_FULL = 634; + RET_FORGE_QUEUE_CAPACITY = 635; + RET_FORGE_QUEUE_NOT_FOUND = 636; + RET_FORGE_QUEUE_EMPTY = 637; + RET_NOT_SUPPORT_ITEM = 638; + RET_ITEM_EMPTY = 639; + RET_VIRTUAL_EXCEED_LIMIT = 640; + RET_MATERIAL_EXCEED_LIMIT = 641; + RET_EQUIP_EXCEED_LIMIT = 642; + RET_ITEM_SHOULD_HAVE_NO_LEVEL = 643; + RET_WEAPON_PROMOTE_LEVEL_EXCEED_LIMIT = 644; + RET_WEAPON_LEVEL_INVALID = 645; + RET_UNKNOW_ITEM_TYPE = 646; + RET_ITEM_COUNT_IS_ZERO = 647; + RET_ITEM_IS_EXPIRED = 648; + RET_ITEM_EXCEED_OUTPUT_LIMIT = 649; + RET_EQUIP_LEVEL_HIGHER = 650; + RET_EQUIP_CAN_NOT_WAKE_OFF_WEAPON = 651; + RET_EQUIP_HAS_BEEN_WEARED = 652; + RET_EQUIP_WEARED_CANNOT_DROP = 653; + RET_AWAKEN_LEVEL_MAX = 654; + RET_MCOIN_NOT_ENOUGH = 655; + RET_MCOIN_EXCEED_LIMIT = 656; + RET_RESIN_NOT_ENOUGH = 660; + RET_RESIN_EXCEED_LIMIT = 661; + RET_RESIN_OPENSTATE_OFF = 662; + RET_RESIN_BOUGHT_COUNT_EXCEEDED = 663; + RET_RESIN_CARD_DAILY_REWARD_HAS_TAKEN = 664; + RET_RESIN_CARD_EXPIRED = 665; + RET_AVATAR_CAN_NOT_COOK = 666; + RET_ATTACH_AVATAR_CD = 667; + RET_AUTO_RECOVER_OPENSTATE_OFF = 668; + RET_AUTO_RECOVER_BOUGHT_COUNT_EXCEEDED = 669; + RET_RESIN_GAIN_FAILED = 670; + RET_WIDGET_ORNAMENTS_TYPE_ERROR = 671; + RET_ALL_TARGET_SATIATION_FULL = 672; + RET_FORGE_WORLD_LEVEL_NOT_MATCH = 673; + RET_FORGE_POINT_NOT_ENOUGH = 674; + RET_WIDGET_ANCHOR_POINT_FULL = 675; + RET_WIDGET_ANCHOR_POINT_NOT_FOUND = 676; + RET_ALL_BONFIRE_EXCEED_MAX_COUNT = 677; + RET_BONFIRE_EXCEED_MAX_COUNT = 678; + RET_LUNCH_BOX_DATA_ERROR = 679; + RET_INVALID_QUICK_USE_WIDGET = 680; + RET_INVALID_REPLACE_RESIN_COUNT = 681; + RET_PREV_DETECTED_GATHER_NOT_FOUND = 682; + RET_GOT_ALL_ONEOFF_GAHTER = 683; + RET_INVALID_WIDGET_MATERIAL_ID = 684; + RET_WIDGET_DETECTOR_NO_HINT_TO_CLEAR = 685; + RET_WIDGET_ALREADY_WITHIN_NEARBY_RADIUS = 686; + RET_WIDGET_CLIENT_COLLECTOR_NEED_POINTS = 687; + RET_WIDGET_IN_COMBAT = 688; + RET_WIDGET_NOT_SET_QUICK_USE = 689; + RET_ALREADY_ATTACH_WIDGET = 690; + RET_EQUIP_IS_LOCKED = 691; + RET_FORGE_IS_LOCKED = 692; + RET_COMBINE_IS_LOCKED = 693; + RET_FORGE_OUTPUT_STACK_LIMIT = 694; + RET_ALREADY_DETTACH_WIDGET = 695; + RET_GADGET_BUILDER_EXCEED_MAX_COUNT = 696; + RET_REUNION_PRIVILEGE_RESIN_TYPE_IS_NORMAL = 697; + RET_BONUS_COUNT_EXCEED_DOUBLE_LIMIT = 698; + RET_RELIQUARY_DECOMPOSE_PARAM_ERROR = 699; + RET_ITEM_COMBINE_COUNT_NOT_ENOUGH = 700; + RET_GOODS_NOT_EXIST = 701; + RET_GOODS_MATERIAL_NOT_ENOUGH = 702; + RET_GOODS_NOT_IN_TIME = 703; + RET_GOODS_BUY_NUM_NOT_ENOUGH = 704; + RET_GOODS_BUY_NUM_ERROR = 705; + RET_SHOP_NOT_OPEN = 706; + RET_SHOP_CONTENT_NOT_MATCH = 707; + RET_SHOP_BATCH_BUY_SHOP_LIMIT = 708; + RET_SHOP_BATCH_BUY_COUNT_LIMIT = 709; + RET_CHAT_FORBIDDEN = 798; + RET_CHAT_CD = 799; + RET_CHAT_FREQUENTLY = 800; + RET_GADGET_NOT_EXIST = 801; + RET_GADGET_NOT_INTERACTIVE = 802; + RET_GADGET_NOT_GATHERABLE = 803; + RET_CHEST_IS_LOCKED = 804; + RET_GADGET_CREATE_FAIL = 805; + RET_WORKTOP_OPTION_NOT_EXIST = 806; + RET_GADGET_STATUE_NOT_ACTIVE = 807; + RET_GADGET_STATUE_OPENED = 808; + RET_BOSS_CHEST_NO_QUALIFICATION = 809; + RET_BOSS_CHEST_LIFE_TIME_OVER = 810; + RET_BOSS_CHEST_WEEK_NUM_LIMIT = 811; + RET_BOSS_CHEST_GUEST_WORLD_LEVEL = 812; + RET_BOSS_CHEST_HAS_TAKEN = 813; + RET_BLOSSOM_CHEST_NO_QUALIFICATION = 814; + RET_BLOSSOM_CHEST_LIFE_TIME_OVER = 815; + RET_BLOSSOM_CHEST_HAS_TAKEN = 816; + RET_BLOSSOM_CHEST_GUEST_WORLD_LEVEL = 817; + RET_MP_PLAY_REWARD_NO_QUALIFICATION = 818; + RET_MP_PLAY_REWARD_HAS_TAKEN = 819; + RET_GENERAL_REWARD_NO_QUALIFICATION = 820; + RET_GENERAL_REWARD_LIFE_TIME_OVER = 821; + RET_GENERAL_REWARD_HAS_TAKEN = 822; + RET_GADGET_NOT_VEHICLE = 823; + RET_VEHICLE_SLOT_OCCUPIED = 824; + RET_NOT_IN_VEHICLE = 825; + RET_CREATE_VEHICLE_IN_CD = 826; + RET_CREATE_VEHICLE_POS_INVALID = 827; + RET_VEHICLE_POINT_NOT_UNLOCK = 828; + RET_GADGET_INTERACT_COND_NOT_MEET = 829; + RET_GADGET_INTERACT_PARAM_ERROR = 830; + RET_GADGET_CUSTOM_COMBINATION_INVALID = 831; + RET_DESHRET_OBELISK_DUPLICATE_INTERACT = 832; + RET_DESHRET_OBELISK_NO_AVAIL_CHEST = 833; + RET_ACTIVITY_CLOSE = 860; + RET_ACTIVITY_ITEM_ERROR = 861; + RET_ACTIVITY_CONTRIBUTION_NOT_ENOUGH = 862; + RET_SEA_LAMP_PHASE_NOT_FINISH = 863; + RET_SEA_LAMP_FLY_NUM_LIMIT = 864; + RET_SEA_LAMP_FLY_LAMP_WORD_ILLEGAL = 865; + RET_ACTIVITY_WATCHER_REWARD_TAKEN = 866; + RET_ACTIVITY_WATCHER_REWARD_NOT_FINISHED = 867; + RET_SALESMAN_ALREADY_DELIVERED = 868; + RET_SALESMAN_REWARD_COUNT_NOT_ENOUGH = 869; + RET_SALESMAN_POSITION_INVALID = 870; + RET_DELIVER_NOT_FINISH_ALL_QUEST = 871; + RET_DELIVER_ALREADY_TAKE_DAILY_REWARD = 872; + RET_ASTER_PROGRESS_EXCEED_LIMIT = 873; + RET_ASTER_CREDIT_EXCEED_LIMIT = 874; + RET_ASTER_TOKEN_EXCEED_LIMIT = 875; + RET_ASTER_CREDIT_NOT_ENOUGH = 876; + RET_ASTER_TOKEN_NOT_ENOUGH = 877; + RET_ASTER_SPECIAL_REWARD_HAS_TAKEN = 878; + RET_FLIGHT_GROUP_ACTIVITY_NOT_STARTED = 879; + RET_ASTER_MID_PREVIOUS_BATTLE_NOT_FINISHED = 880; + RET_DRAGON_SPINE_SHIMMERING_ESSENCE_EXCEED_LIMIT = 881; + RET_DRAGON_SPINE_WARM_ESSENCE_EXCEED_LIMIT = 882; + RET_DRAGON_SPINE_WONDROUS_ESSENCE_EXCEED_LIMIT = 883; + RET_DRAGON_SPINE_SHIMMERING_ESSENCE_NOT_ENOUGH = 884; + RET_DRAGON_SPINE_WARM_ESSENCE_NOT_ENOUGH = 885; + RET_DRAGON_SPINE_WONDROUS_ESSENCE_NOT_ENOUGH = 886; + RET_EFFIGY_FIRST_PASS_REWARD_HAS_TAKEN = 891; + RET_EFFIGY_REWARD_HAS_TAKEN = 892; + RET_TREASURE_MAP_ADD_TOKEN_EXCEED_LIMIT = 893; + RET_TREASURE_MAP_TOKEN_NOT_ENOUGHT = 894; + RET_SEA_LAMP_COIN_EXCEED_LIMIT = 895; + RET_SEA_LAMP_COIN_NOT_ENOUGH = 896; + RET_SEA_LAMP_POPULARITY_EXCEED_LIMIT = 897; + RET_ACTIVITY_AVATAR_REWARD_NOT_OPEN = 898; + RET_ACTIVITY_AVATAR_REWARD_HAS_TAKEN = 899; + RET_ARENA_ACTIVITY_ALREADY_STARTED = 900; + RET_TALENT_ALREAY_UNLOCKED = 901; + RET_PREV_TALENT_NOT_UNLOCKED = 902; + RET_BIG_TALENT_POINT_NOT_ENOUGH = 903; + RET_SMALL_TALENT_POINT_NOT_ENOUGH = 904; + RET_PROUD_SKILL_ALREADY_GOT = 905; + RET_PREV_PROUD_SKILL_NOT_GET = 906; + RET_PROUD_SKILL_MAX_LEVEL = 907; + RET_CANDIDATE_SKILL_DEPOT_ID_NOT_FIND = 910; + RET_SKILL_DEPOT_IS_THE_SAME = 911; + RET_MONSTER_NOT_EXIST = 1001; + RET_MONSTER_CREATE_FAIL = 1002; + RET_DUNGEON_ENTER_FAIL = 1101; + RET_DUNGEON_QUIT_FAIL = 1102; + RET_DUNGEON_ENTER_EXCEED_DAY_COUNT = 1103; + RET_DUNGEON_REVIVE_EXCEED_MAX_COUNT = 1104; + RET_DUNGEON_REVIVE_FAIL = 1105; + RET_DUNGEON_NOT_SUCCEED = 1106; + RET_DUNGEON_CAN_NOT_CANCEL = 1107; + RET_DEST_DUNGEON_SETTLED = 1108; + RET_DUNGEON_CANDIDATE_TEAM_IS_FULL = 1109; + RET_DUNGEON_CANDIDATE_TEAM_IS_DISMISS = 1110; + RET_DUNGEON_CANDIDATE_TEAM_NOT_ALL_READY = 1111; + RET_DUNGEON_CANDIDATE_TEAM_HAS_REPEAT_AVATAR = 1112; + RET_DUNGEON_CANDIDATE_NOT_SINGEL_PASS = 1113; + RET_DUNGEON_REPLAY_NEED_ALL_PLAYER_DIE = 1114; + RET_DUNGEON_REPLAY_HAS_REVIVE_COUNT = 1115; + RET_DUNGEON_OTHERS_LEAVE = 1116; + RET_DUNGEON_ENTER_LEVEL_LIMIT = 1117; + RET_DUNGEON_CANNOT_ENTER_PLOT_IN_MP = 1118; + RET_DUNGEON_DROP_SUBFIELD_LIMIT = 1119; + RET_DUNGEON_BE_INVITE_PLAYER_AVATAR_ALL_DIE = 1120; + RET_DUNGEON_CANNOT_KICK = 1121; + RET_DUNGEON_CANDIDATE_TEAM_SOMEONE_LEVEL_LIMIT = 1122; + RET_DUNGEON_IN_FORCE_QUIT = 1123; + RET_DUNGEON_GUEST_QUIT_DUNGEON = 1124; + RET_DUNGEON_TICKET_FAIL = 1125; + RET_CUR_DUNGEON_SETTLED = 1126; + RET_CUR_DUNGEON_NOT_PLOT = 1127; + RET_CUR_DUNGEON_NOT_ALLOW_SWITCH_TEAM = 1128; + RET_MP_NOT_IN_MY_WORLD = 1201; + RET_MP_IN_MP_MODE = 1202; + RET_MP_SCENE_IS_FULL = 1203; + RET_MP_MODE_NOT_AVAILABLE = 1204; + RET_MP_PLAYER_NOT_ENTERABLE = 1205; + RET_MP_QUEST_BLOCK_MP = 1206; + RET_MP_IN_ROOM_SCENE = 1207; + RET_MP_WORLD_IS_FULL = 1208; + RET_MP_PLAYER_NOT_ALLOW_ENTER = 1209; + RET_MP_PLAYER_DISCONNECTED = 1210; + RET_MP_NOT_IN_MP_MODE = 1211; + RET_MP_OWNER_NOT_ENTER = 1212; + RET_MP_ALLOW_ENTER_PLAYER_FULL = 1213; + RET_MP_TARGET_PLAYER_IN_TRANSFER = 1214; + RET_MP_TARGET_ENTERING_OTHER = 1215; + RET_MP_OTHER_ENTERING = 1216; + RET_MP_ENTER_MAIN_PLAYER_IN_PLOT = 1217; + RET_MP_NOT_PS_PLAYER = 1218; + RET_MP_PLAY_NOT_ACTIVE = 1219; + RET_MP_PLAY_REMAIN_REWARDS = 1220; + RET_MP_PLAY_NO_REWARD = 1221; + RET_MP_OPEN_STATE_FAIL = 1223; + RET_MP_PLAYER_IN_BLACKLIST = 1224; + RET_MP_REPLY_TIMEOUT = 1225; + RET_MP_IS_BLOCK = 1226; + RET_MP_ENTER_MAIN_PLAYER_IN_MP_PLAY = 1227; + RET_MP_IN_MP_PLAY_BATTLE = 1228; + RET_MP_GUEST_HAS_REWARD_REMAINED = 1229; + RET_MP_QUIT_MP_INVALID = 1230; + RET_MP_OTHER_DATA_VERSION_NOT_LATEST = 1231; + RET_MP_DATA_VERSION_NOT_LATEST = 1232; + RET_MP_CUR_WORLD_NOT_ENTERABLE = 1233; + RET_MP_ANY_GALLERY_STARTED = 1234; + RET_MP_HAS_ACTIVE_DRAFT = 1235; + RET_MP_PLAYER_IN_DUNGEON = 1236; + RET_MP_MATCH_FULL = 1237; + RET_MP_MATCH_LIMIT = 1238; + RET_MP_MATCH_IN_PUNISH = 1239; + RET_MP_IS_IN_MULTISTAGE = 1240; + RET_MP_MATCH_PLAY_NOT_OPEN = 1241; + RET_MP_ONLY_MP_WITH_PS_PLAYER = 1242; + RET_MP_GUEST_LOADING_FIRST_ENTER = 1243; + RET_MP_SUMMER_TIME_SPRINT_BOAT_ONGOING = 1244; + RET_MP_BLITZ_RUSH_PARKOUR_CHALLENGE_ONGOING = 1245; + RET_MP_MUSIC_GAME_ONGOING = 1246; + RET_MP_IN_MPING_MODE = 1247; + RET_MP_OWNER_IN_SINGLE_SCENE = 1248; + RET_MP_IN_SINGLE_SCENE = 1249; + RET_MP_REPLY_NO_VALID_AVATAR = 1250; + RET_MP_IS_NOT_IN_TRANSFER_GUARD = 1251; + RET_MAIL_PARA_ERR = 1301; + RET_MAIL_MAX_NUM = 1302; + RET_MAIL_ITEM_NUM_EXCEED = 1303; + RET_MAIL_TITLE_LEN_EXCEED = 1304; + RET_MAIL_CONTENT_LEN_EXCEED = 1305; + RET_MAIL_SENDER_LEN_EXCEED = 1306; + RET_MAIL_PARSE_PACKET_FAIL = 1307; + RET_OFFLINE_MSG_MAX_NUM = 1308; + RET_OFFLINE_MSG_SAME_TICKET = 1309; + RET_MAIL_EXCEL_MAIL_TYPE_ERROR = 1310; + RET_MAIL_CANNOT_SEND_MCOIN = 1311; + RET_MAIL_HCOIN_EXCEED_LIMIT = 1312; + RET_MAIL_SCOIN_EXCEED_LIMIT = 1313; + RET_MAIL_MATERIAL_ID_INVALID = 1314; + RET_MAIL_AVATAR_EXCEED_LIMIT = 1315; + RET_MAIL_GACHA_TICKET_ETC_EXCEED_LIMIT = 1316; + RET_MAIL_ITEM_EXCEED_CEHUA_LIMIT = 1317; + RET_MAIL_SPACE_OR_REST_NUM_NOT_ENOUGH = 1318; + RET_MAIL_TICKET_IS_EMPTY = 1319; + RET_MAIL_TRANSACTION_IS_EMPTY = 1320; + RET_MAIL_DELETE_COLLECTED = 1321; + RET_DAILY_TASK_NOT_FINISH = 1330; + RET_DAILY_TAKS_HAS_TAKEN = 1331; + RET_SOCIAL_OFFLINE_MSG_NUM_EXCEED = 1332; + RET_DAILY_TASK_FILTER_CITY_NOT_OPEN = 1333; + RET_GACHA_INAVAILABLE = 1401; + RET_GACHA_RANDOM_NOT_MATCH = 1402; + RET_GACHA_SCHEDULE_NOT_MATCH = 1403; + RET_GACHA_INVALID_TIMES = 1404; + RET_GACHA_COST_ITEM_NOT_ENOUGH = 1405; + RET_GACHA_TIMES_LIMIT = 1406; + RET_GACHA_WISH_SAME_ITEM = 1407; + RET_GACHA_WISH_INVALID_ITEM = 1408; + RET_GACHA_MINORS_TIMES_LIMIT = 1409; + RET_GACHA_GENERAL_TIMES_LIMIT = 1410; + RET_INVESTIGAITON_NOT_IN_PROGRESS = 1501; + RET_INVESTIGAITON_UNCOMPLETE = 1502; + RET_INVESTIGAITON_REWARD_TAKEN = 1503; + RET_INVESTIGAITON_TARGET_STATE_ERROR = 1504; + RET_PUSH_TIPS_NOT_FOUND = 1505; + RET_SIGN_IN_RECORD_NOT_FOUND = 1506; + RET_ALREADY_HAVE_SIGNED_IN = 1507; + RET_SIGN_IN_COND_NOT_SATISFIED = 1508; + RET_BONUS_ACTIVITY_NOT_UNREWARDED = 1509; + RET_SIGN_IN_REWARDED = 1510; + RET_TOWER_NOT_OPEN = 1521; + RET_TOWER_HAVE_DAILY_RECORD = 1522; + RET_TOWER_NOT_RECORD = 1523; + RET_TOWER_HAVE_RECORD = 1524; + RET_TOWER_TEAM_NUM_ERROR = 1525; + RET_TOWER_FLOOR_NOT_OPEN = 1526; + RET_TOWER_NO_FLOOR_STAR_RECORD = 1527; + RET_ALREADY_HAS_TOWER_BUFF = 1528; + RET_DUPLICATE_ENTER_LEVEL = 1529; + RET_NOT_IN_TOWER_LEVEL = 1530; + RET_IN_TOWER_LEVEL = 1531; + RET_TOWER_PREV_FLOOR_NOT_FINISH = 1532; + RET_TOWER_STAR_NOT_ENOUGH = 1533; + RET_BATTLE_PASS_NO_SCHEDULE = 1541; + RET_BATTLE_PASS_HAS_BUYED = 1542; + RET_BATTLE_PASS_LEVEL_OVERFLOW = 1543; + RET_BATTLE_PASS_PRODUCT_EXPIRED = 1544; + RET_MATCH_HOST_QUIT = 1561; + RET_MATCH_ALREADY_IN_MATCH = 1562; + RET_MATCH_NOT_IN_MATCH = 1563; + RET_MATCH_APPLYING_ENTER_MP = 1564; + RET_MATCH_INCORRECT_SCENE = 1565; + RET_WIDGET_TREASURE_SPOT_NOT_FOUND = 1581; + RET_WIDGET_TREASURE_ENTITY_EXISTS = 1582; + RET_WIDGET_TREASURE_SPOT_FAR_AWAY = 1583; + RET_WIDGET_TREASURE_FINISHED_TODAY = 1584; + RET_WIDGET_QUICK_USE_REQ_PARAM_ERROR = 1585; + RET_WIDGET_CAMERA_SCAN_ID_ERROR = 1586; + RET_WIDGET_NOT_ACTIVE = 1587; + RET_WIDGET_FEATHER_NOT_ACTIVE = 1588; + RET_WIDGET_FEATHER_GADGET_TOO_FAR_AWAY = 1589; + RET_WIDGET_CAPTURE_ANIMAL_NOT_EXIST = 1590; + RET_WIDGET_CAPTURE_ANIMAL_DROP_BAG_LIMIT = 1591; + RET_WIDGET_CAPTURE_ANIMAL_CAN_NOT_CAPTURE = 1592; + RET_WIDGET_SKY_CRYSTAL_ALL_COLLECTED = 1593; + RET_WIDGET_SKY_CRYSTAL_HINT_ALREADY_EXIST = 1594; + RET_WIDGET_SKY_CRYSTAL_NOT_FOUND = 1595; + RET_WIDGET_SKY_CRYSTAL_NO_HINT_TO_CLEAR = 1596; + RET_WIDGET_LIGHT_STONE_ENERGY_NOT_ENOUGH = 1597; + RET_WIDGET_TOY_CRYSTAL_ENERGY_NOT_ENOUGH = 1598; + RET_WIDGET_LIGHT_STONE_LEVEL_NOT_ENOUGH = 1599; + RET_UID_NOT_EXIST = 2001; + RET_PARSE_BIN_ERROR = 2002; + RET_ACCOUNT_INFO_NOT_EXIST = 2003; + RET_ORDER_INFO_NOT_EXIST = 2004; + RET_SNAPSHOT_INDEX_ERROR = 2005; + RET_MAIL_HAS_BEEN_SENT = 2006; + RET_PRODUCT_NOT_EXIST = 2007; + RET_UNFINISH_ORDER = 2008; + RET_ID_NOT_EXIST = 2009; + RET_ORDER_TRADE_EARLY = 2010; + RET_ORDER_FINISHED = 2011; + RET_GAMESERVER_VERSION_WRONG = 2012; + RET_OFFLINE_OP_FULL_LENGTH = 2013; + RET_CONCERT_PRODUCT_OBTAIN_LIMIT = 2014; + RET_CONCERT_PRODUCT_TICKET_DUPLICATED = 2015; + RET_CONCERT_PRODUCT_TICKET_EMPTY = 2016; + RET_REDIS_MODIFIED = 5001; + RET_REDIS_UID_NOT_EXIST = 5002; + RET_PATHFINDING_DATA_NOT_EXIST = 6001; + RET_PATHFINDING_DESTINATION_NOT_EXIST = 6002; + RET_PATHFINDING_ERROR_SCENE = 6003; + RET_PATHFINDING_SCENE_DATA_LOADING = 6004; + RET_FRIEND_COUNT_EXCEEDED = 7001; + RET_PLAYER_NOT_EXIST = 7002; + RET_ALREADY_SENT_ADD_REQUEST = 7003; + RET_ASK_FRIEND_LIST_FULL = 7004; + RET_PLAYER_ALREADY_IS_FRIEND = 7005; + RET_PLAYER_NOT_ASK_FRIEND = 7006; + RET_TARGET_FRIEND_COUNT_EXCEED = 7007; + RET_NOT_FRIEND = 7008; + RET_BIRTHDAY_CANNOT_BE_SET_TWICE = 7009; + RET_CANNOT_ADD_SELF_FRIEND = 7010; + RET_SIGNATURE_ILLEGAL = 7011; + RET_PS_PLAYER_CANNOT_ADD_FRIENDS = 7012; + RET_PS_PLAYER_CANNOT_REMOVE_FRIENDS = 7013; + RET_NAME_CARD_NOT_UNLOCKED = 7014; + RET_ALREADY_IN_BLACKLIST = 7015; + RET_PS_PALEYRS_CANNOT_ADD_BLACKLIST = 7016; + RET_PLAYER_BLACKLIST_FULL = 7017; + RET_PLAYER_NOT_IN_BLACKLIST = 7018; + RET_BLACKLIST_PLAYER_CANNOT_ADD_FRIEND = 7019; + RET_IN_TARGET_BLACKLIST = 7020; + RET_CANNOT_ADD_TARGET_FRIEND = 7021; + RET_BIRTHDAY_FORMAT_ERROR = 7022; + RET_ONLINE_ID_NOT_EXISTS = 7023; + RET_FIRST_SHARE_REWARD_HAS_TAKEN = 7024; + RET_PS_PLAYER_CANNOT_REMOVE_BLACKLIST = 7025; + RET_REPORT_CD = 7026; + RET_REPORT_CONTENT_ILLEGAL = 7027; + RET_REMARK_WORD_ILLEGAL = 7028; + RET_REMARK_TOO_LONG = 7029; + RET_REMARK_UTF_8_ERROR = 7030; + RET_REMARK_IS_EMPTY = 7031; + RET_ASK_ADD_FRIEND_CD = 7032; + RET_SHOW_AVATAR_INFO_NOT_EXIST = 7033; + RET_PLAYER_NOT_SHOW_AVATAR = 7034; + RET_SOCIAL_UPDATE_SHOW_LIST_REPEAT_ID = 7035; + RET_PSN_ID_NOT_FOUND = 7036; + RET_EMOJI_COLLECTION_NUM_EXCEED_LIMIT = 7037; + RET_REMARK_EMPTY = 7038; + RET_IN_TARGET_PSN_BLACKLIST = 7039; + RET_SIGNATURE_NOT_CHANGED = 7040; + RET_SIGNATURE_MONTHLY_LIMIT = 7041; + RET_REQ_FRIEND_AVATAR_FREQUENTLY = 7042; + RET_PSN_GET_PLAYER_SOCIAL_DETAIL_FAIL = 7043; + RET_OFFERING_NOT_OPEN = 7081; + RET_OFFERING_LEVEL_LIMIT = 7082; + RET_OFFERING_LEVEL_NOT_REACH = 7083; + RET_OFFERING_LEVEL_HAS_TAKEN = 7084; + RET_CITY_REPUTATION_NOT_OPEN = 7101; + RET_CITY_REPUTATION_LEVEL_TAKEN = 7102; + RET_CITY_REPUTATION_LEVEL_NOT_REACH = 7103; + RET_CITY_REPUTATION_PARENT_QUEST_TAKEN = 7104; + RET_CITY_REPUTATION_PARENT_QUEST_UNFINISH = 7105; + RET_CITY_REPUTATION_ACCEPT_REQUEST = 7106; + RET_CITY_REPUTATION_NOT_ACCEPT_REQUEST = 7107; + RET_CITY_REPUTATION_ACCEPT_REQUEST_LIMIT = 7108; + RET_CITY_REPUTATION_ENTRANCE_NOT_OPEN = 7109; + RET_CITY_REPUTATION_TAKEN_REQUEST_REWARD = 7110; + RET_CITY_REPUTATION_SWITCH_CLOSE = 7111; + RET_CITY_REPUTATION_ENTRACE_SWITCH_CLOSE = 7112; + RET_CITY_REPUTATION_TAKEN_EXPLORE_REWARD = 7113; + RET_CITY_REPUTATION_EXPLORE_NOT_REACH = 7114; + RET_MECHANICUS_NOT_OPEN = 7120; + RET_MECHANICUS_GEAR_UNLOCK = 7121; + RET_MECHANICUS_GEAR_LOCK = 7122; + RET_MECHANICUS_GEAR_LEVEL_LIMIT = 7123; + RET_MECHANICUS_COIN_NOT_ENOUGH = 7124; + RET_MECHANICUS_NO_SEQUENCE = 7125; + RET_MECHANICUS_SEQUENCE_LIMIT_LEVEL = 7126; + RET_MECHANICUS_SEQUENCE_LIMIT_OPEN = 7127; + RET_MECHANICUS_DIFFICULT_NOT_SUPPORT = 7128; + RET_MECHANICUS_TICKET_NOT_ENOUGH = 7129; + RET_MECHANICUS_TEACH_NOT_FINISH = 7130; + RET_MECHANICUS_TEACH_FINISHED = 7131; + RET_MECHANICUS_PREV_DIFFICULT_LEVEL_BLOCK = 7132; + RET_MECHANICUS_PLAYER_LIMIT = 7133; + RET_MECHANICUS_PUNISH_TIME = 7134; + RET_MECHANICUS_SWITCH_CLOSE = 7135; + RET_MECHANICUS_BATTLE_NOT_IN_DUNGEON = 7150; + RET_MECHANICUS_BATTLE_PLAY_NOT_FOUND = 7151; + RET_MECHANICUS_BATTLE_DUPLICATE_PICK_CARD = 7152; + RET_MECHANICUS_BATTLE_PLAYER_NOT_IN_PLAY = 7153; + RET_MECHANICUS_BATTLE_CARD_NOT_AVAILABLE = 7154; + RET_MECHANICUS_BATTLE_NOT_IN_CARD_STAGE = 7155; + RET_MECHANICUS_BATTLE_CARD_IS_WAITING = 7156; + RET_MECHANICUS_BATTLE_CARD_ALL_CONFIRMED = 7157; + RET_MECHANICUS_BATTLE_CARD_ALREADY_CONFIRMED = 7158; + RET_MECHANICUS_BATTLE_CARD_CONFIRMED_BY_OTHER = 7159; + RET_MECHANICUS_BATTLE_CARD_NOT_ENOUGH_POINTS = 7160; + RET_MECHANICUS_BATTLE_CARD_ALREADY_SKIPPED = 7161; + RET_LEGENDARY_KEY_NOT_ENOUGH = 8001; + RET_LEGENDARY_KEY_EXCEED_LIMIT = 8002; + RET_DAILY_TASK_NOT_ENOUGH_TO_REDEEM = 8003; + RET_PERSONAL_LINE_OPEN_STATE_OFF = 8004; + RET_PERSONAL_LINE_LEVEL_NOT_ENOUGH = 8005; + RET_PERSONAL_LINE_NOT_OPEN = 8006; + RET_PERSONAL_LINE_PRE_QUEST_NOT_FINISH = 8007; + RET_HUNTING_ALREADY_FINISH_OFFER_LIMIT = 8201; + RET_HUNTING_HAS_UNFINISHED_OFFER = 8202; + RET_HUNTING_FAILED_OFFER_NOT_CD_READY = 8203; + RET_HUNTING_NOT_TAKE_OFFER = 8204; + RET_HUNTING_CANNOT_TAKE_TWICE = 8205; + RET_RPIVATE_CHAT_INVALID_CONTENT_TYPE = 8901; + RET_PRIVATE_CHAT_TARGET_IS_NOT_FRIEND = 8902; + RET_PRIVATE_CHAT_CONTENT_NOT_SUPPORTED = 8903; + RET_PRIVATE_CHAT_CONTENT_TOO_LONG = 8904; + RET_PRIVATE_CHAT_PULL_TOO_FAST = 8905; + RET_PRIVATE_CHAT_REPEAT_READ = 8906; + RET_PRIVATE_CHAT_READ_NOT_FRIEND = 8907; + RET_REUNION_FINISHED = 9001; + RET_REUNION_NOT_ACTIVATED = 9002; + RET_REUNION_ALREADY_TAKE_FIRST_REWARD = 9003; + RET_REUNION_SIGN_IN_REWARDED = 9004; + RET_REUNION_WATCHER_REWARDED = 9005; + RET_REUNION_WATCHER_NOT_FINISH = 9006; + RET_REUNION_MISSION_REWARDED = 9007; + RET_REUNION_MISSION_NOT_FINISH = 9008; + RET_REUNION_WATCHER_REWARD_NOT_UNLOCKED = 9009; + RET_BLESSING_CONTENT_CLOSED = 9101; + RET_BLESSING_NOT_ACTIVE = 9102; + RET_BLESSING_NOT_TODAY_ENTITY = 9103; + RET_BLESSING_ENTITY_EXCEED_SCAN_NUM_LIMIT = 9104; + RET_BLESSING_DAILY_SCAN_NUM_EXCEED_LIMIT = 9105; + RET_BLESSING_REDEEM_REWARD_NUM_EXCEED_LIMIT = 9106; + RET_BLESSING_REDEEM_PIC_NUM_NOT_ENOUGH = 9107; + RET_BLESSING_PIC_NOT_ENOUGH = 9108; + RET_BLESSING_PIC_HAS_RECEIVED = 9109; + RET_BLESSING_TARGET_RECV_NUM_EXCEED = 9110; + RET_FLEUR_FAIR_CREDIT_EXCEED_LIMIT = 9111; + RET_FLEUR_FAIR_CREDIT_NOT_ENOUGH = 9112; + RET_FLEUR_FAIR_TOKEN_EXCEED_LIMIT = 9113; + RET_FLEUR_FAIR_TOKEN_NOT_ENOUGH = 9114; + RET_FLEUR_FAIR_MINIGAME_NOT_OPEN = 9115; + RET_FLEUR_FAIR_MUSIC_GAME_DIFFICULTY_NOT_UNLOCK = 9116; + RET_FLEUR_FAIR_DUNGEON_LOCKED = 9117; + RET_FLEUR_FAIR_DUNGEON_PUNISH_TIME = 9118; + RET_FLEUR_FAIR_ONLY_OWNER_CAN_RESTART_MINIGAM = 9119; + RET_WATER_SPIRIT_COIN_EXCEED_LIMIT = 9120; + RET_WATER_SPIRIT_COIN_NOT_ENOUGH = 9121; + RET_REGION_SEARCH_NO_SEARCH = 9122; + RET_REGION_SEARCH_STATE_ERROR = 9123; + RET_CHANNELLER_SLAB_LOOP_DUNGEON_STAGE_NOT_OPEN = 9130; + RET_CHANNELLER_SLAB_LOOP_DUNGEON_NOT_OPEN = 9131; + RET_CHANNELLER_SLAB_LOOP_DUNGEON_FIRST_PASS_REWARD_HAS_TAKEN = 9132; + RET_CHANNELLER_SLAB_LOOP_DUNGEON_SCORE_REWARD_HAS_TAKEN = 9133; + RET_CHANNELLER_SLAB_INVALID_ONE_OFF_DUNGEON = 9134; + RET_CHANNELLER_SLAB_ONE_OFF_DUNGEON_DONE = 9135; + RET_CHANNELLER_SLAB_ONE_OFF_DUNGEON_STAGE_NOT_OPEN = 9136; + RET_CHANNELLER_SLAB_TOKEN_EXCEED_LIMIT = 9137; + RET_CHANNELLER_SLAB_TOKEN_NOT_ENOUGH = 9138; + RET_CHANNELLER_SLAB_PLAYER_NOT_IN_ONE_OFF_DUNGEON = 9139; + RET_MIST_TRIAL_SELECT_CHARACTER_NUM_NOT_ENOUGH = 9150; + RET_MIST_TRIAL_ALREADY_USING_TRIAL_AVATAR = 9151; + RET_HIDE_AND_SEEK_PLAY_NOT_OPEN = 9160; + RET_HIDE_AND_SEEK_PLAY_MAP_NOT_OPEN = 9161; + RET_HIDE_AND_SEEK_PLAY_MAP_NOT_CHOSEN = 9162; + RET_SUMMER_TIME_DRAFT_WOORD_EXCEED_LIMIT = 9170; + RET_SUMMER_TIME_DRAFT_WOORD_NOT_ENOUGH = 9171; + RET_SUMMER_TIME_MINI_HARPASTUM_EXCEED_LIMIT = 9172; + RET_SUMMER_TIME_MINI_HARPASTUMNOT_ENOUGH = 9173; + RET_BOUNCE_CONJURING_COIN_EXCEED_LIMIT = 9180; + RET_BOUNCE_CONJURING_COIN_NOT_ENOUGH = 9181; + RET_CHESS_TEACH_MAP_FINISHED = 9183; + RET_CHESS_TEACH_MAP_UNFINISHED = 9184; + RET_CHESS_COIN_EXCEED_LIMIT = 9185; + RET_CHESS_COIN_NOT_ENOUGH = 9186; + RET_CHESS_IN_PUNISH_TIME = 9187; + RET_CHESS_PREV_MAP_UNFINISHED = 9188; + RET_CHESS_MAP_LOCKED = 9189; + RET_BLITZ_RUSH_NOT_OPEN = 9192; + RET_BLITZ_RUSH_DUNGEON_NOT_OPEN = 9193; + RET_BLITZ_RUSH_COIN_A_EXCEED_LIMIT = 9194; + RET_BLITZ_RUSH_COIN_B_EXCEED_LIMIT = 9195; + RET_BLITZ_RUSH_COIN_A_NOT_ENOUGH = 9196; + RET_BLITZ_RUSH_COIN_B_NOT_ENOUGH = 9197; + RET_MIRACLE_RING_VALUE_NOT_ENOUGH = 9201; + RET_MIRACLE_RING_CD = 9202; + RET_MIRACLE_RING_REWARD_NOT_TAKEN = 9203; + RET_MIRACLE_RING_NOT_DELIVER = 9204; + RET_MIRACLE_RING_DELIVER_EXCEED = 9205; + RET_MIRACLE_RING_HAS_CREATED = 9206; + RET_MIRACLE_RING_HAS_NOT_CREATED = 9207; + RET_MIRACLE_RING_NOT_YOURS = 9208; + RET_GADGET_FOUNDATION_UNAUTHORIZED = 9251; + RET_GADGET_FOUNDATION_SCENE_NOT_FOUND = 9252; + RET_GADGET_FOUNDATION_NOT_IN_INIT_STATE = 9253; + RET_GADGET_FOUNDATION_BILDING_POINT_NOT_ENOUGHT = 9254; + RET_GADGET_FOUNDATION_NOT_IN_BUILT_STATE = 9255; + RET_GADGET_FOUNDATION_OP_NOT_SUPPORTED = 9256; + RET_GADGET_FOUNDATION_REQ_PLAYER_NOT_IN_SCENE = 9257; + RET_GADGET_FOUNDATION_LOCKED_BY_ANOTHER_PLAYER = 9258; + RET_GADGET_FOUNDATION_NOT_LOCKED = 9259; + RET_GADGET_FOUNDATION_DUPLICATE_LOCK = 9260; + RET_GADGET_FOUNDATION_PLAYER_NOT_FOUND = 9261; + RET_GADGET_FOUNDATION_PLAYER_GEAR_NOT_FOUND = 9262; + RET_GADGET_FOUNDATION_ROTAION_DISABLED = 9263; + RET_GADGET_FOUNDATION_REACH_DUNGEON_GEAR_LIMIT = 9264; + RET_GADGET_FOUNDATION_REACH_SINGLE_GEAR_LIMIT = 9265; + RET_GADGET_FOUNDATION_ROTATION_ON_GOING = 9266; + RET_OP_ACTIVITY_BONUS_NOT_FOUND = 9301; + RET_OP_ACTIVITY_NOT_OPEN = 9302; + RET_MULTISTAGE_PLAY_PLAYER_NOT_IN_SCENE = 9501; + RET_MULTISTAGE_PLAY_NOT_FOUND = 9502; + RET_MULTISTAGE_PLAY_IN_OTHER_STAGE = 9503; + RET_COOP_CHAPTER_NOT_OPEN = 9601; + RET_COOP_COND_NOT_MEET = 9602; + RET_COOP_POINT_LOCKED = 9603; + RET_COOP_NOT_HAVE_PROGRESS = 9604; + RET_COOP_REWARD_HAS_TAKEN = 9605; + RET_DRAFT_HAS_ACTIVE_DRAFT = 9651; + RET_DRAFT_NOT_IN_MY_WORLD = 9652; + RET_DRAFT_NOT_SUPPORT_MP = 9653; + RET_DRAFT_PLAYER_NOT_ENOUGH = 9654; + RET_DRAFT_INCORRECT_SCENE = 9655; + RET_DRAFT_OTHER_PLAYER_ENTERING = 9656; + RET_DRAFT_GUEST_IS_TRANSFERRING = 9657; + RET_DRAFT_GUEST_NOT_IN_DRAFT_SCENE = 9658; + RET_DRAFT_INVITE_OVER_TIME = 9659; + RET_DRAFT_TWICE_CONFIRM_OVER_TIMER = 9660; + RET_DRAFT_GUEST_NOT_IN_WORLD_SCENE = 9661; + RET_HOME_UNKOWN = 9701; + RET_HOME_INVALID_CLIENT_PARAM = 9702; + RET_HOME_TARGE_PLAYER_HAS_NO_HOME = 9703; + RET_HOME_NOT_ONLINE = 9704; + RET_HOME_PLAYER_FULL = 9705; + RET_HOME_BLOCKED = 9706; + RET_HOME_ALREADY_IN_TARGET_HOME_WORLD = 9707; + RET_HOME_IN_EDIT_MODE = 9708; + RET_HOME_NOT_IN_EDIT_MODE = 9709; + RET_HOME_HAS_GUEST = 9710; + RET_HOME_CANT_ENTER_BY_IN_EDIT_MODE = 9711; + RET_HOME_CLIENT_PARAM_INVALID = 9712; + RET_HOME_PLAYER_NOT_IN_HOME_WORLD = 9713; + RET_HOME_PLAYER_NOT_IN_SELF_HOME_WORLD = 9714; + RET_HOME_NOT_FOUND_IN_MEM = 9715; + RET_HOME_PLAYER_IN_HOME_ROOM_SCENE = 9716; + RET_HOME_HOME_REFUSE_GUEST_ENTER = 9717; + RET_HOME_OWNER_REFUSE_TO_ENTER_HOME = 9718; + RET_HOME_OWNER_OFFLINE = 9719; + RET_HOME_FURNITURE_EXCEED_LIMIT = 9720; + RET_HOME_FURNITURE_COUNT_NOT_ENOUGH = 9721; + RET_HOME_IN_TRY_ENTER_PROCESS = 9722; + RET_HOME_ALREADY_IN_TARGET_SCENE = 9723; + RET_HOME_COIN_EXCEED_LIMIT = 9724; + RET_HOME_COIN_NOT_ENOUGH = 9725; + RET_HOME_MODULE_NOT_UNLOCKED = 9726; + RET_HOME_CUR_MODULE_CLOSED = 9727; + RET_HOME_FURNITURE_SUITE_NOT_UNLOCKED = 9728; + RET_HOME_IN_MATCH = 9729; + RET_HOME_IN_COMBAT = 9730; + RET_HOME_EDIT_MODE_CD = 9731; + RET_HOME_UPDATE_FURNITURE_CD = 9732; + RET_HOME_BLOCK_FURNITURE_LIMIT = 9733; + RET_HOME_NOT_SUPPORT = 9734; + RET_HOME_STATE_NOT_OPEN = 9735; + RET_HOME_TARGET_STATE_NOT_OPEN = 9736; + RET_HOME_APPLY_ENTER_OTHER_HOME_FAIL = 9737; + RET_HOME_SAVE_NO_MAIN_HOUSE = 9738; + RET_HOME_IN_DUNGEON = 9739; + RET_HOME_ANY_GALLERY_STARTED = 9740; + RET_HOME_QUEST_BLOCK_HOME = 9741; + RET_HOME_WAITING_PRIOR_CHECK = 9742; + RET_HOME_PERSISTENT_CHECK_FAIL = 9743; + RET_HOME_FIND_ONLINE_HOME_FAIL = 9744; + RET_HOME_JOIN_SCENE_FAIL = 9745; + RET_HOME_MAX_PLAYER = 9746; + RET_HOME_IN_TRANSFER = 9747; + RET_HOME_ANY_HOME_GALLERY_STARTED = 9748; + RET_HOME_CAN_NOT_ENTER_IN_AUDIT = 9749; + RET_FURNITURE_MAKE_INDEX_ERROR = 9750; + RET_FURNITURE_MAKE_LOCKED = 9751; + RET_FURNITURE_MAKE_CONFIG_ERROR = 9752; + RET_FURNITURE_MAKE_SLOT_FULL = 9753; + RET_FURNITURE_MAKE_ADD_FURNITURE_FAIL = 9754; + RET_FURNITURE_MAKE_UNFINISH = 9755; + RET_FURNITURE_MAKE_IS_FINISH = 9756; + RET_FURNITURE_MAKE_NOT_IN_CORRECT_HOME = 9757; + RET_FURNITURE_MAKE_NO_COUNT = 9758; + RET_FURNITURE_MAKE_ACCELERATE_LIMIT = 9759; + RET_FURNITURE_MAKE_NO_MAKE_DATA = 9760; + RET_HOME_LIMITED_SHOP_CLOSE = 9761; + RET_HOME_AVATAR_NOT_SHOW = 9762; + RET_HOME_EVENT_COND_NOT_SATISFIED = 9763; + RET_HOME_INVALID_ARRANGE_ANIMAL_PARAM = 9764; + RET_HOME_INVALID_ARRANGE_NPC_PARAM = 9765; + RET_HOME_INVALID_ARRANGE_SUITE_PARAM = 9766; + RET_HOME_INVALID_ARRANGE_MAIN_HOUSE_PARAM = 9767; + RET_HOME_AVATAR_STATE_NOT_OPEN = 9768; + RET_HOME_PLANT_FIELD_NOT_EMPTY = 9769; + RET_HOME_PLANT_FIELD_EMPTY = 9770; + RET_HOME_PLANT_FIELD_TYPE_ERROR = 9771; + RET_HOME_PLANT_TIME_NOT_ENOUGH = 9772; + RET_HOME_PLANT_SUB_FIELD_NUM_NOT_ENOUGH = 9773; + RET_HOME_PLANT_FIELD_PARAM_ERROR = 9774; + RET_HOME_FURNITURE_GUID_ERROR = 9775; + RET_HOME_FURNITURE_ARRANGE_LIMIT = 9776; + RET_HOME_FISH_FARMING_LIMIT = 9777; + RET_HOME_FISH_COUNT_NOT_ENOUGH = 9778; + RET_HOME_FURNITURE_COST_LIMIT = 9779; + RET_HOME_CUSTOM_FURNITURE_INVALID = 9780; + RET_HOME_INVALID_ARRANGE_GROUP_PARAM = 9781; + RET_HOME_FURNITURE_ARRANGE_GROUP_LIMIT = 9782; + RET_HOME_PICTURE_FRAME_COOP_CG_GENDER_ERROR = 9783; + RET_HOME_PICTURE_FRAME_COOP_CG_NOT_UNLOCK = 9784; + RET_HOME_FURNITURE_CANNOT_ARRANGE = 9785; + RET_HOME_FURNITURE_IN_DUPLICATE_SUITE = 9786; + RET_HOME_FURNITURE_CUSTOM_SUITE_TOO_SMALL = 9787; + RET_HOME_FURNITURE_CUSTOM_SUITE_TOO_BIG = 9788; + RET_HOME_FURNITURE_SUITE_EXCEED_LIMIT = 9789; + RET_HOME_FURNITURE_CUSTOM_SUITE_EXCEED_LIMIT = 9790; + RET_HOME_FURNITURE_CUSTOM_SUITE_INVALID_SURFACE_TYPE = 9791; + RET_HOME_BGM_ID_NOT_FOUND = 9792; + RET_HOME_BGM_NOT_UNLOCKED = 9793; + RET_HOME_BGM_FURNITURE_NOT_FOUND = 9794; + RET_HOME_BGM_NOT_SUPPORT_BY_CUR_SCENE = 9795; + RET_HOME_LIMITED_SHOP_GOODS_DISABLE = 9796; + RET_HOME_WORLD_WOOD_MATERIAL_EMPTY = 9797; + RET_HOME_WORLD_WOOD_MATERIAL_NOT_FOUND = 9798; + RET_HOME_WORLD_WOOD_MATERIAL_COUNT_INVALID = 9799; + RET_HOME_WORLD_WOOD_EXCHANGE_EXCEED_LIMIT = 9800; + RET_HOME_BLUEPRINT_SEARCH_SELF = 9801; + RET_HOME_BLUEPRINT_SHARE_CODE_INVALID = 9802; + RET_HOME_BLUEPRINT_NOT_EXIST = 9803; + RET_HOME_BLUEPRINT_SLOT_HAS_EXIST_SHARE_CODE = 9804; + RET_HOME_BLUEPRINT_SLOT_NOT_EXIST_SHARE_CODE = 9805; + RET_HOME_BLUEPRINT_CAN_NOT_CREATE_IN_AUDIT = 9806; + RET_HOME_BLOCK_NOT_UNLOCKED = 9807; + RET_HOME_BLUEPRINT_CREATE_CD = 9808; + RET_HOME_BLUEPRINT_SET_OPTION_CD = 9809; + RET_HOME_BLUEPRINT_NOT_ALLOW_FRIEND_COPY = 9810; + RET_HOME_FURNITURE_POS_UNDER_DIE_Y = 9811; + RET_HOME_BLUEPRINT_GEN_SHARE_CODE_FAIL = 9812; + RET_HOME_BLUEPRINT_SEARCH_CD = 9813; + RET_HOME_BLUEPRINT_PREVIEW_CD = 9814; + RET_HOME_BLUEPRINT_PREVIEW_SCENE_NOT_MATCH = 9815; + RET_SUMO_ACTIVITY_STAGE_NOT_OPEN = 10000; + RET_SUMO_ACTIVITY_SWITCH_TEAM_IN_CD = 10001; + RET_SUMO_ACTIVITY_TEAM_NUM_INCORRECT = 10002; + RET_LUNA_RITE_ACTIVITY_AREA_ID_ERROR = 10004; + RET_LUNA_RITE_ACTIVITY_BATTLE_NOT_FINISH = 10005; + RET_LUNA_RITE_ACTIVITY_ALREADY_SACRIFICE = 10006; + RET_LUNA_RITE_ACTIVITY_ALREADY_TAKE_REWARD = 10007; + RET_LUNA_RITE_ACTIVITY_SACRIFICE_NOT_ENOUGH = 10008; + RET_LUNA_RITE_ACTIVITY_SEARCHING_COND_NOT_MEET = 10009; + RET_DIG_GADGET_CONFIG_ID_NOT_MATCH = 10015; + RET_DIG_FIND_NEAREST_POS_FAIL = 10016; + RET_MUSIC_GAME_LEVEL_NOT_OPEN = 10021; + RET_MUSIC_GAME_LEVEL_NOT_UNLOCK = 10022; + RET_MUSIC_GAME_LEVEL_NOT_STARTED = 10023; + RET_MUSIC_GAME_LEVEL_CONFIG_NOT_FOUND = 10024; + RET_MUSIC_GAME_LEVEL_ID_NOT_MATCH = 10025; + RET_ROGUELIKE_COIN_A_NOT_ENOUGH = 10031; + RET_ROGUELIKE_COIN_B_NOT_ENOUGH = 10032; + RET_ROGUELIKE_COIN_C_NOT_ENOUGH = 10033; + RET_ROGUELIKE_COIN_A_EXCEED_LIMIT = 10034; + RET_ROGUELIKE_COIN_B_EXCEED_LIMIT = 10035; + RET_ROGUELIKE_COIN_C_EXCEED_LIMIT = 10036; + RET_ROGUELIKE_RUNE_COUNT_NOT_ENOUGH = 10037; + RET_ROGUELIKE_NOT_IN_ROGUE_DUNGEON = 10038; + RET_ROGUELIKE_CELL_NOT_FOUND = 10039; + RET_ROGUELIKE_CELL_TYPE_INCORRECT = 10040; + RET_ROGUELIKE_CELL_ALREADY_FINISHED = 10041; + RET_ROGUELIKE_DUNGEON_HAVE_UNFINISHED_PROGRESS = 10042; + RET_ROGUELIKE_STAGE_NOT_FINISHED = 10043; + RET_ROGUELIKE_STAGE_FIRST_PASS_REWARD_HAS_TAKEN = 10045; + RET_ROGUELIKE_ACTIVITY_CONTENT_CLOSED = 10046; + RET_ROGUELIKE_DUNGEON_PRE_QUEST_NOT_FINISHED = 10047; + RET_ROGUELIKE_DUNGEON_NOT_OPEN = 10048; + RET_ROGUELIKE_SPRINT_IS_BANNED = 10049; + RET_ROGUELIKE_DUNGEON_PRE_STAGE_NOT_FINISHED = 10050; + RET_ROGUELIKE_ALL_AVATAR_DIE_CANNOT_RESUME = 10051; + RET_PLANT_FLOWER_ALREADY_TAKE_SEED = 10056; + RET_PLANT_FLOWER_FRIEND_HAVE_FLOWER_LIMIT = 10057; + RET_PLANT_FLOWER_CAN_GIVE_FLOWER_NOT_ENOUGH = 10058; + RET_PLANT_FLOWER_WISH_FLOWER_KINDS_LIMIT = 10059; + RET_PLANT_FLOWER_HAVE_FLOWER_NOT_ENOUGH = 10060; + RET_PLANT_FLOWER_FLOWER_COMBINATION_INVALID = 10061; + RET_HACHI_DUNGEON_NOT_VALID = 10052; + RET_HACHI_DUNGEON_STAGE_NOT_OPEN = 10053; + RET_HACHI_DUNGEON_TEAMMATE_NOT_PASS = 10054; + RET_WINTER_CAMP_COIN_A_NOT_ENOUGH = 10071; + RET_WINTER_CAMP_COIN_B_NOT_ENOUGH = 10072; + RET_WINTER_CAMP_COIN_A_EXCEED_LIMIT = 10073; + RET_WINTER_CAMP_COIN_B_EXCEED_LIMIT = 10074; + RET_WINTER_CAMP_WISH_ID_INVALID = 10075; + RET_WINTER_CAMP_NOT_FOUND_RECV_ITEM_DATA = 10076; + RET_WINTER_CAMP_FRIEND_ITEM_COUNT_OVERFLOW = 10077; + RET_WINTER_CAMP_SELECT_ITEM_DATA_INVALID = 10078; + RET_WINTER_CAMP_ITEM_LIST_EMPTY = 10079; + RET_WINTER_CAMP_REWARD_ALREADY_TAKEN = 10080; + RET_WINTER_CAMP_STAGE_NOT_FINISH = 10081; + RET_WINTER_CAMP_GADGET_INVALID = 10082; + RET_LANTERN_RITE_COIN_A_NOT_ENOUGH = 10090; + RET_LANTERN_RITE_COIN_B_NOT_ENOUGH = 10091; + RET_LANTERN_RITE_COIN_C_NOT_ENOUGH = 10092; + RET_LANTERN_RITE_COIN_A_EXCEED_LIMIT = 10093; + RET_LANTERN_RITE_COIN_B_EXCEED_LIMIT = 10094; + RET_LANTERN_RITE_COIN_C_EXCEED_LIMIT = 10095; + RET_LANTERN_RITE_PROJECTION_CONTENT_CLOSED = 10096; + RET_LANTERN_RITE_PROJECTION_CAN_NOT_START = 10097; + RET_LANTERN_RITE_DUNGEON_NOT_OPEN = 10098; + RET_LANTERN_RITE_HAS_TAKEN_SKIN_REWARD = 10099; + RET_LANTERN_RITE_NOT_FINISHED_SKIN_WATCHERS = 10100; + RET_LANTERN_RITE_FIREWORKS_CONTENT_CLOSED = 10101; + RET_LANTERN_RITE_FIREWORKS_CHALLENGE_NOT_START = 10102; + RET_LANTERN_RITE_FIREWORKS_REFORM_PARAM_ERROR = 10103; + RET_LANTERN_RITE_FIREWORKS_REFORM_SKILL_LOCK = 10104; + RET_LANTERN_RITE_FIREWORKS_REFORM_STAMINA_NOT_ENOUGH = 10105; + RET_POTION_ACTIVITY_STAGE_NOT_OPEN = 10110; + RET_POTION_ACTIVITY_LEVEL_HAVE_PASS = 10111; + RET_POTION_ACTIVITY_TEAM_NUM_INCORRECT = 10112; + RET_POTION_ACTIVITY_AVATAR_IN_CD = 10113; + RET_POTION_ACTIVITY_BUFF_IN_CD = 10114; + RET_IRODORI_POETRY_INVALID_LINE_ID = 10120; + RET_IRODORI_POETRY_INVALID_THEME_ID = 10121; + RET_IRODORI_POETRY_NOT_GET_ALL_INSPIRATION = 10122; + RET_IRODORI_POETRY_INSPIRATION_REACH_LIMIE = 10123; + RET_IRODORI_POETRY_ENTITY_ALREADY_SCANNED = 10124; + RET_ACTIVITY_BANNER_ALREADY_CLEARED = 10300; + RET_IRODORI_CHESS_NOT_OPEN = 10301; + RET_IRODORI_CHESS_LEVEL_NOT_OPEN = 10302; + RET_IRODORI_CHESS_MAP_NOT_OPEN = 10303; + RET_IRODORI_CHESS_MAP_CARD_ALREADY_EQUIPED = 10304; + RET_IRODORI_CHESS_EQUIP_CARD_EXCEED_LIMIT = 10305; + RET_IRODORI_CHESS_MAP_CARD_NOT_EQUIPED = 10306; + RET_IRODORI_CHESS_ENTER_FAIL_CARD_EXCEED_LIMIT = 10307; + RET_ACTIVITY_FRIEND_HAVE_GIFT_LIMIT = 10310; + RET_GACHA_ACTIVITY_HAVE_REWARD_LIMIT = 10315; + RET_GACHA_ACTIVITY_HAVE_ROBOT_LIMIT = 10316; + RET_SUMMER_TIME_V_2_COIN_EXCEED_LIMIT = 10317; + RET_SUMMER_TIME_V_2_COIN_NOT_ENOUGH = 10318; + RET_SUMMER_TIME_V_2_DUNGEON_STAGE_NOT_OPEN = 10319; + RET_SUMMER_TIME_V_2_PREV_DUNGEON_NOT_COMPLETE = 10320; + RET_ROGUE_DIARY_AVATAR_DEATH = 10350; + RET_ROGUE_DIARY_AVATAR_TIRED = 10351; + RET_ROGUE_DIARY_AVATAR_DUPLICATED = 10352; + RET_ROGUE_DIARY_COIN_NOT_ENOUGH = 10353; + RET_ROGUE_DIARY_VIRTUAL_COIN_EXCEED_LIMIT = 10354; + RET_ROGUE_DIARY_VIRTUAL_COIN_NOT_ENOUGH = 10355; + RET_ROGUE_DIARY_CONTENT_CLOSED = 10366; + RET_GRAVEN_INNOCENCE_COIN_A_NOT_ENOUGH = 10380; + RET_GRAVEN_INNOCENCE_COIN_B_NOT_ENOUGH = 10381; + RET_GRAVEN_INNOCENCE_COIN_A_EXCEED_LIMIT = 10382; + RET_GRAVEN_INNOCENCE_COIN_B_EXCEED_LIMIT = 10383; + RET_ISLAND_PARTY_STAGE_NOT_OPEN = 10371; + RET_WIND_FIELD_STAGE_NOT_OPEN = 10390; + RET_VINTAGE_CONTENT_CLOSED = 10396; + RET_VINTAGE_STORE_CONTENT_FINISHED = 10397; + RET_VINTAGE_STORE_ATTR_TOO_SMALL = 10398; + RET_VINTAGE_STORE_ATTR_TOO_LARGE = 10399; + RET_VINTAGE_STORE_CONTENT_INTERRUPT = 10400; + RET_VINTAGE_VIRTUAL_COIN_NOT_ENOUGH = 10401; + RET_VINTAGE_STORE_ATTR_LESS_THAN_ZERO = 10402; + RET_FUNGUS_FIGHTER_CAPTURE_COIN_NOT_ENOUGH = 10406; + RET_FUNGUS_FIGHTER_TRAINING_COIN_NOT_ENOUGH = 10407; + RET_FUNGUS_FIGHTER_CAPTURE_COIN_EXCEED_LIMIT = 10408; + RET_FUNGUS_FIGHTER_TRAINING_COIN_EXCEED_LIMIT = 10409; + RET_FUNGUS_FIGHTER_CONTENT_CLOSED = 10410; + RET_FUNGUS_FIGHTER_PLOT_STAGE_NOT_OPEN = 10411; + RET_FUNGUS_FIGHTER_FUNGUS_ID_CONFIG_NOT_VALID = 10412; + RET_FUNGUS_FIGHTER_FUNGUS_NOT_CULTIVATED = 10413; + RET_FUNGUS_FIGHTER_TRAINING_DUNGEON_NOT_OPEN = 10414; + RET_EFFIGY_CHALLENGE_V_2_COIN_NOT_ENOUGH = 10427; + RET_EFFIGY_CHALLENGE_V_2_COIN_EXCEED_LIMIT = 10428; + RET_CHAR_AMUSEMENT_STAGE_NOT_OPEN = 10436; + RET_COIN_COLLECT_LEVEL_NOT_OPEN = 10446; + RET_COIN_COLLECT_NOT_EQUIP_WIDGET = 10447; + RET_COIN_COLLECT_SCENE_NOT_MATCH = 10448; + RET_COIN_COLLECT_CANT_ENTER_MP_MODE = 10449; + RET_COIN_COLLECT_PLAYER_NUM_FAIL = 10450; + RET_BRICK_BREAKER_PLAYER_NUM_FAIL = 10456; + RET_BRICK_BREAKER_STAGE_NOT_UNLOCK = 10457; + RET_BRICK_BREAKER_NORMAL_LEVEL_NOT_FINISH = 10458; + RET_BRICK_BREAKER_PRE_LEVEL_NOT_FINISH = 10459; + RET_BRICK_BREAKER_PRE_STAGE_NOT_FINISH = 10460; + RET_BRICK_BREAKER_WORLD_LEVEL_NOT_UNLOCK = 10461; + RET_BRICK_BREAKER_DUNGEON_LEVEL_NOT_UNLOCK = 10462; + RET_BRICK_BREAKER_COIN_NOT_ENOUGH = 10463; + RET_BRICK_BREAKER_COIN_EXCEED_LIMIT = 10464; + RET_TEAMCHAIN_WORLD_IN_MP_MODE = 10466; + RET_LAN_V_3_BOAT_PLAYER_NUM_NOT_VALID = 10481; + RET_LAN_V_3_BOAT_PLAY_NOT_OPEN = 10482; + RET_LAN_V_3_BOAT_NOT_IN_WORLD_SCENE = 10483; + RET_FLEUR_FAIR_V_2_PACMAN_PLAY_NOT_OPEN = 10500; + RET_FLEUR_FAIR_V_2_PACMAN_PLAYER_NUM_INCORRECT = 10501; + RET_FLEUR_FAIR_V_2_COIN_NOT_ENOUGH = 10502; + RET_FLEUR_FAIR_V_2_COIN_EXCEED_LIMIT = 10503; + RET_ACTIVITY_CONTENT_CLOSED = 10901; + RET_NOT_IN_FISHING = 11001; + RET_FISH_STATE_ERROR = 11002; + RET_FISH_BAIT_LIMIT = 11003; + RET_FISHING_MAX_DISTANCE = 11004; + RET_FISHING_IN_COMBAT = 11005; + RET_FISHING_BATTLE_TOO_SHORT = 11006; + RET_FISH_GONE_AWAY = 11007; + RET_CAN_NOT_EDIT_OTHER_DUNGEON = 11051; + RET_CUSTOM_DUNGEON_DISMATCH = 11052; + RET_NO_CUSTOM_DUNGEON_DATA = 11053; + RET_BUILD_CUSTOM_DUNGEON_FAIL = 11054; + RET_CUSTOM_DUNGEON_ROOM_CHECK_FAIL = 11055; + RET_CUSTOM_DUNGEON_SAVE_MAY_FAIL = 11056; + RET_NOT_IN_CUSTOM_DUNGEON = 11057; + RET_CUSTOM_DUNGEON_INTERNAL_FAIL = 11058; + RET_CUSTOM_DUNGEON_CAN_NOT_TRY = 11059; + RET_CUSTOM_DUNGEON_NO_START_ROOM = 11060; + RET_CUSTOM_DUNGEON_NO_ROOM_DATA = 11061; + RET_CUSTOM_DUNGEON_SAVE_TOO_FREQUENT = 11062; + RET_CUSTOM_DUNGEON_NOT_SELF_PASS = 11063; + RET_CUSTOM_DUNGEON_LACK_COIN = 11064; + RET_CUSTOM_DUNGEON_NO_FINISH_BRICK = 11065; + RET_CUSTOM_DUNGEON_MULTI_FINISH = 11066; + RET_CUSTOM_DUNGEON_NOT_PUBLISHED = 11067; + RET_CUSTOM_DUNGEON_FULL_STORE = 11068; + RET_CUSTOM_DUNGEON_STORE_REPEAT = 11069; + RET_CUSTOM_DUNGEON_CAN_NOT_STORE_SELF = 11070; + RET_CUSTOM_DUNGEON_NOT_SAVE_SUCC = 11071; + RET_CUSTOM_DUNGEON_CAN_NOT_LIKE_SELF = 11072; + RET_CUSTOM_DUNGEON_NOT_FOUND = 11073; + RET_CUSTOM_DUNGEON_INVALID_SETTING = 11074; + RET_CUSTOM_DUNGEON_NO_FINISH_SETTING = 11075; + RET_CUSTOM_DUNGEON_SAVE_NOTHING = 11076; + RET_CUSTOM_DUNGEON_NOT_IN_GROUP = 11077; + RET_CUSTOM_DUNGEON_NOT_OFFICIAL = 11078; + RET_CUSTOM_DUNGEON_LIFE_NUM_ERROR = 11079; + RET_CUSTOM_DUNGEON_NO_OPEN_ROOM = 11080; + RET_CUSTOM_DUNGEON_BRICK_EXCEED_LIMIT = 11081; + RET_CUSTOM_DUNGEON_OFFICIAL_NOT_UNLOCK = 11082; + RET_CAN_NOT_EDIT_OFFICIAL_SETTING = 11083; + RET_CUSTOM_DUNGEON_BAN_PUBLISH = 11084; + RET_CUSTOM_DUNGEON_CAN_NOT_REPLAY = 11085; + RET_CUSTOM_DUNGEON_NOT_OPEN_GROUP = 11086; + RET_CUSTOM_DUNGEON_MAX_EDIT_NUM = 11087; + RET_CUSTOM_DUNGEON_CAN_NOT_OUT_STUCK = 11088; + RET_CUSTOM_DUNGEON_MAX_TAG = 11089; + RET_CUSTOM_DUNGEON_INVALID_TAG = 11090; + RET_CUSTOM_DUNGEON_MAX_COST = 11091; + RET_CUSTOM_DUNGEON_REQUEST_TOO_FREQUENT = 11092; + RET_CUSTOM_DUNGEON_NOT_OPEN = 11093; + RET_SHARE_CD_ID_ERROR = 11101; + RET_SHARE_CD_INDEX_ERROR = 11102; + RET_SHARE_CD_IN_CD = 11103; + RET_SHARE_CD_TOKEN_NOT_ENOUGH = 11104; + RET_UGC_DISMATCH = 11151; + RET_UGC_DATA_NOT_FOUND = 11152; + RET_UGC_BRIEF_NOT_FOUND = 11153; + RET_UGC_DISABLED = 11154; + RET_UGC_LIMITED = 11155; + RET_UGC_LOCKED = 11156; + RET_UGC_NOT_AUTH = 11157; + RET_UGC_NOT_OPEN = 11158; + RET_UGC_BAN_PUBLISH = 11159; + RET_UGC_MUSIC_EXCEED_LIMIT = 11160; + RET_UGC_MUSIC_SAVE_TOO_FREQUENT = 11161; + RET_COMPOUND_BOOST_ITEM_NOT_EXIST = 11201; + RET_COMPOUND_BOOST_TARGET_NOT_EXIST = 11202; + RET_QUICK_HIT_TREE_EMPTY_TREES = 11211; + RET_GCG_FIND_GAME_MODE_FAIL = 12000; + RET_GCG_OPERATION_PARAM_ERROR = 12001; + RET_GCG_GAME_NOT_RUNNING = 12002; + RET_GCG_OP_NOT_ALLOW = 12003; + RET_GCG_OP_NOT_MATCH_PHASE = 12004; + RET_GCG_SELECT_HAND_CARD_GUID_ERROR = 12005; + RET_GCG_DICE_INDEX_INVALID = 12006; + RET_GCG_CHARACTER_GUID_INVALID = 12007; + RET_GCG_CHARACTER_ALREADY_DIE = 12008; + RET_GCG_CHARACTER_ALREADY_ON_STAGE = 12009; + RET_GCG_CHARACTER_FORBIDDEN_ATTACK = 12010; + RET_GCG_SELECT_DICE_NOT_MATCH = 12011; + RET_GCG_FIND_SKILL_FAIL = 12012; + RET_GCG_SKILL_CAN_NOT_ACTIVE_USE = 12013; + RET_GCG_ENERGY_NOT_ENOUGH = 12014; + RET_GCG_PLAY_CARD_TARGET_NOT_MATCH = 12015; + RET_GCG_PLAY_CARD_ZONE_CANNOT_ADD = 12016; + RET_GCG_REBOOT_SELECT_DICE_INVALID = 12017; + RET_GCG_REBOOT_SELECT_CARD_INVALID = 12018; + RET_GCG_PLAY_CARD_CONDITION_CHECK_FAIL = 12019; + RET_GCG_PLAY_CARD_PARAM_INVALID = 12020; + RET_GCG_MAX_GAME = 12021; + RET_GCG_SEND_PACKET_FAIL = 12022; + RET_GCG_ALREADY_SETTLE = 12023; + RET_GCG_COIN_EXCEED_LIMIT = 12101; + RET_GCG_COIN_NOT_ENOUGH = 12102; + RET_GCG_NOT_IN_SELF_WORLD = 12103; + RET_GCG_ALREADY_IN_DUEL = 12104; + RET_GCG_NOT_IN_PLAYER_WORLD = 12105; + RET_GCG_GALLERY_STARTED = 12106; + RET_GCG_INVITE_TARGET_IS_SELF = 12107; + RET_GCG_INVITE_TARGET_NOT_IN_WORLD = 12108; + RET_GCG_APPLY_INVITE_NOT_ALLOW = 12109; + RET_GCG_APPLY_INVITE_TIMEOUT = 12110; + RET_GCG_CUR_DECK_INVALID = 12111; + RET_GCG_NEED_RESOURCE_COMPLETE = 12112; + RET_GCG_OPPONENT_PLAYER_IS_SELF = 12113; + RET_GCG_GAME_ID_INVALID = 12114; + RET_GCG_MATCH_IN_PUNISH = 12115; + RET_GCG_SETTLE_STILL_IN_DUEL = 12116; + RET_GCG_SETTLE_NOT_IN_DUNGEON = 12117; + RET_GCG_UNSUPPORT_SETTLE_OPTION = 12118; + RET_GCG_NOT_IN_GCG_DUNGEON = 12119; + RET_GCG_WORLD_LEVEL_LOCKED = 12120; + RET_GCG_BOSS_LEVEL_LOCKED = 12121; + RET_GCG_NOT_IN_TAVERN = 12122; + RET_GCG_WEEK_NPC_NOT_EXIST = 12123; + RET_GCG_ENTER_GAME_FREQUENT = 12124; + RET_GCG_BREAK_LEVEL_QUEST_NOT_UNFINISHED = 12125; + RET_GCG_GUIDE_LEVEL_ALREADY_FINISHED = 12126; + RET_GCG_LEVEL_CANNOT_RESTART = 12127; + RET_GCG_TARGET_CHECK_ENTER_FAIL = 12128; + RET_GCG_ALREADY_IN_DUNGEON = 12129; + RET_GCG_BACK_DUEL_NO_GAME = 12130; + RET_GCG_CONST_LEVEL_LOCKED = 12131; + RET_GCG_QUEST_ID_ERROR = 12132; + RET_GCG_QUEST_NEED_UNFINISHED = 12133; + RET_GCG_IN_MATCH = 12134; + RET_GCG_DATA_VERSION_NOT_LATEST = 12135; + RET_GCG_INVITE_TARGET_ENTER_GAME_FREQUENT = 12136; + RET_GCG_INVITE_TARGET_NEED_RESOURCE_COMPLETE = 12137; + RET_GCG_INVITE_TARGET_SCENE_IS_NULL = 12138; + RET_GCG_INVITE_TARGET_IN_TRANSFER = 12139; + RET_GCG_INVITE_TARGET_DATA_VERSION_NOT_LATEST = 12140; + RET_GCG_INVITE_TARGET_CUR_DECK_INVALID = 12141; + RET_GCG_CLIENT_DATA_VERSION_NOT_MATCH = 12142; + RET_GCG_CLIENT_DATA_VERSOIN_FORBID = 12143; + RET_GCG_MP_CANT_MATCH = 12144; + RET_GCG_INVITE_TARGET_STATE_NOT_OPEN = 12145; + RET_GCG_CREATE_TIME_OUT = 12146; + RET_GCG_BAN_MATCH = 12147; + RET_GCG_BAN_INVITE = 12148; + RET_GCG_TARGET_BAN_INVITE = 12149; + RET_GCG_INVITE_ALREADY_INVITE = 12150; + RET_GCG_FESTIVAL_MODE_NOT_OPEN = 12151; + RET_GCG_TARGET_FESTIVAL_MODE_NOT_OPEN = 12152; + RET_GCG_BACK_DUEL_PS_TO_OTHER = 12153; + RET_GCG_BACK_DUEL_OTHER_TO_PS = 12154; + RET_GCG_DS_DECK_LOCKED = 12201; + RET_GCG_DS_DECK_NAME_INVALID = 12202; + RET_GCG_DS_DECK_CHAR_CARD_NUM_INVALID = 12204; + RET_GCG_DS_DECK_CARD_NUM_INVALID = 12205; + RET_GCG_DS_CARD_NUM_EXCEED_LIMIT = 12206; + RET_GCG_DS_DECK_INVALID = 12207; + RET_GCG_DS_CARD_ID_INVALID = 12208; + RET_GCG_DS_CARD_FACE_ALREADY_UNLOCK = 12209; + RET_GCG_DS_CARD_FACE_IS_LOCK = 12210; + RET_GCG_DS_FIELD_LOCK = 12211; + RET_GCG_DS_FIELD_ALREADY_UNLOCK = 12212; + RET_GCG_DS_FIELD_ID_INVALID = 12213; + RET_GCG_DS_CARD_BACK_LOCKED = 12214; + RET_GCG_DS_CARD_BACK_ALREADY_UNLOCK = 12215; + RET_GCG_DS_CARD_BACK_ID_INVALID = 12216; + RET_GCG_DS_CARD_FACE_ID_INVALID = 12217; + RET_GCG_DS_DECK_NAME_ILLEGALc = 12218; + RET_GCG_DS_DECK_SAVE_CD = 12219; + RET_GCG_DS_DECK_CHANGE_NAME_CD = 12220; + RET_GCG_MATCH_DECK_INVALID = 12221; + RET_GCG_DS_DECK_ALREADY_UNLOCKED = 12222; + RET_GCG_DS_AT_LEAST_ONE_DECK = 12223; + RET_GCG_TC_CHARACTERNOT_MATCH_LEVEL = 12251; + RET_GCG_TC_MUST_IN_SELF_WORLD = 12252; + RET_GCG_TC_MUST_IN_TAVERN = 12253; + RET_GCG_TC_ALREADY_IN_GAME = 12254; + RET_GCG_TC_ALREADY_IN_MATCH = 12255; + RET_GCG_TC_UNLOCK_CHARACTER_QUEST_NOT_FINISH = 12256; + RET_GCG_TC_LEVEL_LOCKED = 12257; + RET_GCG_TC_NO_INVITE_DATA = 12258; + RET_GCG_TC_CUR_DECK_INVALID = 12259; + RET_GCG_TC_COND_QUEST = 12260; + RET_GCG_LEVEL_REWARD_LEVEL_ERROR = 12301; + RET_GCG_LEVEL_REWARD_ALREADY_TAKEN = 12302; + RET_GCG_LEVEL_REWARD_NO_REWARD = 12303; + RET_GCG_NOT_IN_REPLAY_DUNGEON = 12311; + RET_GCG_INVALID_REPLAY = 12312; + RET_GCG_SET_FAVORITE_LIMIT_NUM = 12313; + RET_GCG_REPLAY_EXPIRE = 12314; +} \ No newline at end of file diff --git a/proto/RobotPushPlayerDataNotify.proto b/proto/RobotPushPlayerDataNotify.proto index 3ca03b64..7d8336b8 100644 --- a/proto/RobotPushPlayerDataNotify.proto +++ b/proto/RobotPushPlayerDataNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 34 +// Obf: NMAMMHHNPKN message RobotPushPlayerDataNotify { bytes bin = 8; } diff --git a/proto/RockBoardExploreDetailInfo.proto b/proto/RockBoardExploreDetailInfo.proto new file mode 100644 index 00000000..86eb238b --- /dev/null +++ b/proto/RockBoardExploreDetailInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "RockBoardExploreStageData.proto"; +// Obf: DMEICEBDNJD +message RockBoardExploreDetailInfo { + repeated RockBoardExploreStageData stage_data_list = 13; +} diff --git a/proto/RockBoardExploreStageData.proto b/proto/RockBoardExploreStageData.proto new file mode 100644 index 00000000..dd66008c --- /dev/null +++ b/proto/RockBoardExploreStageData.proto @@ -0,0 +1,28 @@ +// 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: JKELHAHIIKF +message RockBoardExploreStageData { + bool is_open = 11; + bool is_finish = 4; + uint32 open_time = 13; + uint32 stage_id = 15; +} diff --git a/proto/RogueAvatarInfo.proto b/proto/RogueAvatarInfo.proto index f69ef05e..48554043 100644 --- a/proto/RogueAvatarInfo.proto +++ b/proto/RogueAvatarInfo.proto @@ -1,12 +1,27 @@ +// 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"; -// Name: FNNCKHEEBGD +// Obf: JCEMADFLBNA message RogueAvatarInfo { - bool is_onstage = 7; - uint32 avatar_id = 15; - bool is_alive = 14; + uint32 avatar_id = 5; + bool is_alive = 6; + bool PLAKJHBAGJK = 15; } - diff --git a/proto/RogueDiaryActivityDetailInfo.proto b/proto/RogueDiaryActivityDetailInfo.proto new file mode 100644 index 00000000..ba049dc6 --- /dev/null +++ b/proto/RogueDiaryActivityDetailInfo.proto @@ -0,0 +1,30 @@ +// 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 "RogueDiaryStageInfo.proto"; +import "RogueDiaryProgress.proto"; +// Obf: FEKLEGPDNJI +message RogueDiaryActivityDetailInfo { + repeated RogueDiaryStageInfo stage_list = 11; + RogueDiaryProgress cur_progress = 6; + bool is_have_progress = 1; + bool is_content_closed = 8; +} diff --git a/proto/RogueDiaryAvatarDisableStatus.proto b/proto/RogueDiaryAvatarDisableStatus.proto index bf75348f..a5f60b69 100644 --- a/proto/RogueDiaryAvatarDisableStatus.proto +++ b/proto/RogueDiaryAvatarDisableStatus.proto @@ -19,9 +19,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: KGJFEPEIOKM enum RogueDiaryAvatarDisableStatus { - RogueDiaryAvatarDisableStatus_RogueDiaryAvatarDisableNone = 0; - RogueDiaryAvatarDisableStatus_RogueDiaryAvatarDisableDeath = 1; - RogueDiaryAvatarDisableStatus_RogueDiaryAvatarDisableTired = 2; - RogueDiaryAvatarDisableStatus_RogueDiaryAvatarDisableDuplicated = 3; + ROGUE_DIARY_AVATAR_DISABLE_NONE = 0; + ROGUE_DIARY_AVATAR_DISABLE_DEATH = 1; + ROGUE_DIARY_AVATAR_DISABLE_TIRED = 2; + ROGUE_DIARY_AVATAR_DISABLE_DUPLICATED = 3; } diff --git a/proto/RogueDiaryDungeonRecord.proto b/proto/RogueDiaryDungeonRecord.proto new file mode 100644 index 00000000..b3b7f410 --- /dev/null +++ b/proto/RogueDiaryDungeonRecord.proto @@ -0,0 +1,28 @@ +// 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: LHIJIPANODC +message RogueDiaryDungeonRecord { + uint32 difficulty = 3; + bool is_finish = 5; + uint32 max_round = 6; + uint32 finish_time = 15; +} diff --git a/proto/RogueDiaryDungeonSettleNotify.proto b/proto/RogueDiaryDungeonSettleNotify.proto index 47245e06..562d511f 100644 --- a/proto/RogueDiaryDungeonSettleNotify.proto +++ b/proto/RogueDiaryDungeonSettleNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 8771 +// Obf: ONDACBGBMBH message RogueDiaryDungeonSettleNotify { bool is_finish = 3; uint32 explore_time = 11; diff --git a/proto/RogueDiaryProgress.proto b/proto/RogueDiaryProgress.proto new file mode 100644 index 00000000..9f6139a8 --- /dev/null +++ b/proto/RogueDiaryProgress.proto @@ -0,0 +1,29 @@ +// 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: JADEFHANEBG +message RogueDiaryProgress { + uint32 cur_round = 3; + bool is_enter_dungeon = 9; + uint32 stage_id = 2; + uint32 difficulty = 1; + repeated uint32 optional_card_list = 15; +} diff --git a/proto/RogueDiaryStageInfo.proto b/proto/RogueDiaryStageInfo.proto new file mode 100644 index 00000000..825726f3 --- /dev/null +++ b/proto/RogueDiaryStageInfo.proto @@ -0,0 +1,28 @@ +// 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 "RogueDiaryDungeonRecord.proto"; +// Obf: NGNOANEIFJJ +message RogueDiaryStageInfo { + RogueDiaryDungeonRecord best_record = 15; + bool is_have_try = 1; + uint32 stage_id = 7; +} diff --git a/proto/RogueShowAvatarTeamInfo.proto b/proto/RogueShowAvatarTeamInfo.proto index 07ba4ba2..ece45dad 100644 --- a/proto/RogueShowAvatarTeamInfo.proto +++ b/proto/RogueShowAvatarTeamInfo.proto @@ -1,11 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "RogueAvatarInfo.proto"; - -// Name: EKLAJOBKPEA +// Obf: PAFAMIEEDHL message RogueShowAvatarTeamInfo { - repeated RogueAvatarInfo avatar_list = 12; + repeated RogueAvatarInfo avatar_list = 5; } - diff --git a/proto/RogueStageInfo.proto b/proto/RogueStageInfo.proto new file mode 100644 index 00000000..b30f9a56 --- /dev/null +++ b/proto/RogueStageInfo.proto @@ -0,0 +1,41 @@ +// 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 "RoguelikeRuneRecord.proto"; +import "RogueShowAvatarTeamInfo.proto"; +// Obf: GOCIFOENLJM +message RogueStageInfo { + repeated RoguelikeRuneRecord rune_record_list = 1; + uint32 OKPJEOCDDLF = 11; + uint32 BHHLPLLFOHM = 7; + bool EGLMDLPDKML = 5; + uint32 KOHOEIFNAOF = 10; + uint32 stage_id = 9; + bool is_taken_reward = 2; + RogueShowAvatarTeamInfo avatar_team = 6; + bool is_passed = 4; + uint32 OFFGNAKCEPJ = 1506; + bool is_open = 8; + uint32 ABCFLNEHFFD = 13; + bool AILOPFDABCG = 14; + uint32 cur_level = 15; + uint32 AMGELGFEMNL = 1612; +} diff --git a/proto/RoguelikeDungeonActivityDetailInfo.proto b/proto/RoguelikeDungeonActivityDetailInfo.proto new file mode 100644 index 00000000..11df535e --- /dev/null +++ b/proto/RoguelikeDungeonActivityDetailInfo.proto @@ -0,0 +1,32 @@ +// 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 "RoguelikeShikigamiRecord.proto"; +import "RogueStageInfo.proto"; +// Obf: BKHJOGDIKDP +message RoguelikeDungeonActivityDetailInfo { + repeated RoguelikeShikigamiRecord shikigami_list = 4; + repeated uint32 equipped_rune_list = 6; + uint32 content_close_time = 11; + repeated uint32 rune_list = 5; + repeated RogueStageInfo stage_list = 3; + bool is_content_closed = 1; +} diff --git a/proto/RoguelikeDungeonSettleInfo.proto b/proto/RoguelikeDungeonSettleInfo.proto new file mode 100644 index 00000000..2cb1b396 --- /dev/null +++ b/proto/RoguelikeDungeonSettleInfo.proto @@ -0,0 +1,32 @@ +// 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 "RoguelikeSettleCoinInfo.proto"; +// Obf: BJJHJCJGLAJ +message RoguelikeDungeonSettleInfo { + bool KHILPCPJILE = 5; + map finished_challenge_cell_num_map = 11; + uint32 NGBINNKKLGM = 8; + uint32 cur_level = 12; + bool CMIGJNOEDCL = 13; + uint32 EJLMFGAMCNE = 1; + uint32 stage_id = 6; +} diff --git a/proto/RoguelikeGadgetInfo.proto b/proto/RoguelikeGadgetInfo.proto index 72fe850f..d556599c 100644 --- a/proto/RoguelikeGadgetInfo.proto +++ b/proto/RoguelikeGadgetInfo.proto @@ -1,13 +1,28 @@ +// 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"; -// Name: AAFJPKBFECB +// Obf: JGFICLGKFFD message RoguelikeGadgetInfo { - uint32 cell_config_id = 1; - uint32 cell_type = 2; - uint32 cell_state = 3; - uint32 cell_id = 4; + uint32 cell_config_id = 1; + uint32 cell_type = 2; + uint32 cell_state = 3; + uint32 cell_id = 4; } - diff --git a/proto/RoguelikeRuneRecord.proto b/proto/RoguelikeRuneRecord.proto new file mode 100644 index 00000000..d75488ad --- /dev/null +++ b/proto/RoguelikeRuneRecord.proto @@ -0,0 +1,27 @@ +// 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: FJNMGCOBEDA +message RoguelikeRuneRecord { + uint32 AMDENNHDBNO = 7; + uint32 rune_id = 9; + uint32 FCDJENECOPL = 4; +} diff --git a/proto/RoguelikeSettleCoinInfo.proto b/proto/RoguelikeSettleCoinInfo.proto new file mode 100644 index 00000000..f4edccef --- /dev/null +++ b/proto/RoguelikeSettleCoinInfo.proto @@ -0,0 +1,27 @@ +// 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: KFPDFBOIMFC +message RoguelikeSettleCoinInfo { + uint32 OHCKIMGAALC = 11; + uint32 LJIOMIABKJC = 8; + uint32 LCGJJIKGFKK = 1; +} diff --git a/proto/RoguelikeShikigamiRecord.proto b/proto/RoguelikeShikigamiRecord.proto new file mode 100644 index 00000000..18f60995 --- /dev/null +++ b/proto/RoguelikeShikigamiRecord.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +// Obf: EAGEBKMEIPO +message RoguelikeShikigamiRecord { + uint32 level = 4; + uint32 id = 8; +} diff --git a/proto/Route.proto b/proto/Route.proto index 77d72a62..a0e80d68 100644 --- a/proto/Route.proto +++ b/proto/Route.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "RoutePoint.proto"; +// Obf: MCCCFBCLDJB message Route { repeated RoutePoint route_points = 1; uint32 route_type = 2; diff --git a/proto/RoutePoint.proto b/proto/RoutePoint.proto index ef53037d..a27698a7 100644 --- a/proto/RoutePoint.proto +++ b/proto/RoutePoint.proto @@ -1,23 +1,38 @@ +// 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 "MathQuaternion.proto"; + import "Vector.proto"; - -// Name: KMEPMNFPJFH +import "MathQuaternion.proto"; +// Obf: AJPPKICDBMJ message RoutePoint { - Vector position = 1; - float arrive_range = 2; - bool has_reach_event = 3; - oneof move_params { - float velocity = 11; - float time = 12; - } - oneof rotate_params { - Vector rotation = 21; - MathQuaternion rotation_speed = 22; - MathQuaternion axis_speed = 23; - } + Vector position = 1; + float arrive_range = 2; + bool has_reach_event = 3; + oneof move_params { + float velocity = 11; + float time = 12; + } + oneof rotate_params { + Vector rotation = 21; + MathQuaternion rotation_speed = 22; + MathQuaternion axis_speed = 23; + } } - diff --git a/proto/RoutePointChangeInfo.proto b/proto/RoutePointChangeInfo.proto index 85a40da3..7b2910fe 100644 --- a/proto/RoutePointChangeInfo.proto +++ b/proto/RoutePointChangeInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: KGNMKIIMAGA message RoutePointChangeInfo { float wait_time = 9; float target_velocity = 5; diff --git a/proto/SalesmanActivityDetailInfo.proto b/proto/SalesmanActivityDetailInfo.proto new file mode 100644 index 00000000..59dcd3e3 --- /dev/null +++ b/proto/SalesmanActivityDetailInfo.proto @@ -0,0 +1,35 @@ +// 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 "SalesmanStatusType.proto"; +// Obf: HHBPGNPOECK +message SalesmanActivityDetailInfo { + bool EMDKLOLLFIE = 11; + SalesmanStatusType status = 2; + uint32 EHHIEIBIFOH = 7; + map selected_reward_id_map = 9; + uint32 MCJPKPDEIOE = 13; + uint32 day_reward_id = 14; + uint32 day_index = 6; + uint32 KNGECCJOOKO = 3; + uint32 HMIKNKJJAIH = 1; + bool OAAPGPJLNDM = 15; +} diff --git a/proto/SalesmanDeliverItemReq.proto b/proto/SalesmanDeliverItemReq.proto index e54dcce6..18747f8d 100644 --- a/proto/SalesmanDeliverItemReq.proto +++ b/proto/SalesmanDeliverItemReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2172 +// Obf: MDNOMIGCOMD message SalesmanDeliverItemReq { uint32 schedule_id = 13; } diff --git a/proto/SalesmanDeliverItemRsp.proto b/proto/SalesmanDeliverItemRsp.proto index c5c3262c..d7ac6b1a 100644 --- a/proto/SalesmanDeliverItemRsp.proto +++ b/proto/SalesmanDeliverItemRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2140 +// Obf: HMHLLGLOKNM message SalesmanDeliverItemRsp { uint32 schedule_id = 1; int32 retcode = 2; diff --git a/proto/SalesmanStatusType.proto b/proto/SalesmanStatusType.proto index 65d458c3..28edda1c 100644 --- a/proto/SalesmanStatusType.proto +++ b/proto/SalesmanStatusType.proto @@ -1,13 +1,28 @@ +// 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"; -// Name: CNCIMIAOHLE +// Obf: AGHLKHJDEHO enum SalesmanStatusType { - SALESMAN_STATUS_NONE = 0; - SALESMAN_STATUS_UNSTARTED = 1; - SALESMAN_STATUS_STARTED = 2; - SALESMAN_STATUS_DELIVERED = 3; + SALESMAN_STATUS_NONE = 0; + SALESMAN_STATUS_UNSTARTED = 1; + SALESMAN_STATUS_STARTED = 2; + SALESMAN_STATUS_DELIVERED = 3; } - diff --git a/proto/SalvageBundleChallengeInfo.proto b/proto/SalvageBundleChallengeInfo.proto index bcdee427..229cf2eb 100644 --- a/proto/SalvageBundleChallengeInfo.proto +++ b/proto/SalvageBundleChallengeInfo.proto @@ -1,10 +1,25 @@ +// 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"; -// Name: JGPAGHCFBOP +// Obf: LBHNHAEEOCA message SalvageBundleChallengeInfo { - repeated uint32 finished_bundle_list = 10; + repeated uint32 finished_bundle_list = 15; } - diff --git a/proto/SalvageChallengeInfo.proto b/proto/SalvageChallengeInfo.proto index a47bdd67..dabd6c59 100644 --- a/proto/SalvageChallengeInfo.proto +++ b/proto/SalvageChallengeInfo.proto @@ -1,18 +1,33 @@ +// 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 "SalvageBundleChallengeInfo.proto"; import "SalvageScoreChallengeInfo.proto"; - -// Name: NINBHPBDBNP +// Obf: ADJAGBNPNIN message SalvageChallengeInfo { - uint32 challenge_type = 1; - bool is_unlock = 11; - oneof challenge_detail { - SalvageBundleChallengeInfo bundle_info = 4; - SalvageScoreChallengeInfo score_challenge_info = 5; - uint32 boss_challenge_id = 6; - } + uint32 challenge_type = 12; + bool is_unlock = 7; + oneof challenge_detail { + SalvageBundleChallengeInfo bundle_info = 8; + SalvageScoreChallengeInfo score_challenge_info = 14; + uint32 boss_challenge_id = 4; + } } - diff --git a/proto/SalvageScoreChallengeInfo.proto b/proto/SalvageScoreChallengeInfo.proto index 13ceb56c..84241d97 100644 --- a/proto/SalvageScoreChallengeInfo.proto +++ b/proto/SalvageScoreChallengeInfo.proto @@ -1,11 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Name: DJGOABOOOHI +// Obf: FOPDMMNKCLB message SalvageScoreChallengeInfo { - uint32 max_score = 4; - uint32 salvage_challenge_id = 10; + uint32 max_score = 3; + uint32 salvage_challenge_id = 12; } - diff --git a/proto/SalvageStageInfo.proto b/proto/SalvageStageInfo.proto index 628ac424..939ead2f 100644 --- a/proto/SalvageStageInfo.proto +++ b/proto/SalvageStageInfo.proto @@ -1,13 +1,28 @@ +// 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 "SalvageChallengeInfo.proto"; - -// Name: IFDDHGFMDGM +// Obf: KNOOPADKNLA message SalvageStageInfo { - uint32 stage_id = 4; - bool is_open = 15; - repeated SalvageChallengeInfo challenge_info_list = 10; + repeated SalvageChallengeInfo challenge_info_list = 5; + bool is_open = 12; + uint32 stage_id = 1; } - diff --git a/proto/SandwormCannonDetailInfo.proto b/proto/SandwormCannonDetailInfo.proto new file mode 100644 index 00000000..fb5b28e6 --- /dev/null +++ b/proto/SandwormCannonDetailInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "ACKNNJIEGEK.proto"; +// Obf: OEKOABENGBG +message SandwormCannonDetailInfo { + repeated ACKNNJIEGEK CEBANFGCAFM = 2; +} diff --git a/proto/SceneAreaUnlockNotify.proto b/proto/SceneAreaUnlockNotify.proto index 30f72094..04c7cdca 100644 --- a/proto/SceneAreaUnlockNotify.proto +++ b/proto/SceneAreaUnlockNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 231 +// Obf: IFBDHEFEFKN message SceneAreaUnlockNotify { repeated uint32 area_list = 8; uint32 scene_id = 7; diff --git a/proto/SceneAreaWeatherNotify.proto b/proto/SceneAreaWeatherNotify.proto index 662fe30e..aa8d99d4 100644 --- a/proto/SceneAreaWeatherNotify.proto +++ b/proto/SceneAreaWeatherNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 241 +// Obf: KMAJKMENKJC message SceneAreaWeatherNotify { uint32 climate_type = 10; float trans_duration = 9; diff --git a/proto/SceneAudioNotify.proto b/proto/SceneAudioNotify.proto index f76fcab2..16a75a9f 100644 --- a/proto/SceneAudioNotify.proto +++ b/proto/SceneAudioNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 3143 +// Obf: NCDFCHGNEHL message SceneAudioNotify { repeated string param3 = 15; uint32 source_uid = 10; diff --git a/proto/SceneAvatarInfo.proto b/proto/SceneAvatarInfo.proto index 89cf2044..0f7b6821 100644 --- a/proto/SceneAvatarInfo.proto +++ b/proto/SceneAvatarInfo.proto @@ -1,35 +1,50 @@ +// 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 "AvatarExcelInfo.proto"; -import "CurVehicleInfo.proto"; -import "SceneReliquaryInfo.proto"; + import "SceneWeaponInfo.proto"; +import "SceneReliquaryInfo.proto"; import "ServerBuff.proto"; - -// Name: LJEDENNPCCI +import "CurVehicleInfo.proto"; +import "AvatarExcelInfo.proto"; +// Obf: IPPGFCBJAGI message SceneAvatarInfo { - uint32 uid = 1; - uint32 avatar_id = 2; - uint64 guid = 3; - uint32 peer_id = 4; - repeated uint32 team_resonance_list = 5; - uint32 skill_depot_id = 6; - repeated uint32 talent_id_list = 7; - SceneWeaponInfo weapon = 8; - repeated SceneReliquaryInfo reliquary_list = 9; - uint32 core_proud_skill_level = 11; - repeated uint32 inherent_proud_skill_list = 12; - map skill_level_map = 13; - map proud_skill_extra_level_map = 14; - repeated ServerBuff server_buff_list = 15; - repeated uint32 equip_id_list = 16; - uint32 wearing_flycloak_id = 17; - uint32 born_time = 18; - uint32 costume_id = 19; - CurVehicleInfo cur_vehicle_info = 20; - AvatarExcelInfo excel_info = 21; - uint32 anim_hash = 22; + uint32 uid = 1; + uint32 avatar_id = 2; + uint64 guid = 3; + uint32 peer_id = 4; + repeated uint32 equip_id_list = 5; + uint32 skill_depot_id = 6; + repeated uint32 talent_id_list = 7; + SceneWeaponInfo weapon = 8; + repeated SceneReliquaryInfo reliquary_list = 9; + uint32 core_proud_skill_level = 11; + repeated uint32 inherent_proud_skill_list = 12; + map skill_level_map = 13; + map proud_skill_extra_level_map = 14; + repeated ServerBuff server_buff_list = 15; + repeated uint32 team_resonance_list = 16; + uint32 wearing_flycloak_id = 17; + uint32 born_time = 18; + uint32 costume_id = 19; + CurVehicleInfo cur_vehicle_info = 20; + AvatarExcelInfo excel_info = 21; + uint32 anim_hash = 22; } - diff --git a/proto/SceneAvatarStaminaStepReq.proto b/proto/SceneAvatarStaminaStepReq.proto index aa6fb282..bd853a49 100644 --- a/proto/SceneAvatarStaminaStepReq.proto +++ b/proto/SceneAvatarStaminaStepReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; // CmdId: 230 +// Obf: OEBOGEELNOL message SceneAvatarStaminaStepReq { bool use_client_rot = 4; Vector rot = 15; diff --git a/proto/SceneEntityAiInfo.proto b/proto/SceneEntityAiInfo.proto index c3b9e4ec..a8adf500 100644 --- a/proto/SceneEntityAiInfo.proto +++ b/proto/SceneEntityAiInfo.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; import "ServantInfo.proto"; +// Obf: DLDEGHAICPF message SceneEntityAiInfo { bool is_ai_open = 1; Vector born_pos = 2; @@ -29,5 +30,5 @@ message SceneEntityAiInfo { map ai_threat_map = 5; map skill_group_cd_map = 6; uint32 cur_tactic = 7; - bool FGFMDBFDLLO = 8; + bool LHPKKKJLJHK = 8; } diff --git a/proto/SceneEntityAppearNotify.proto b/proto/SceneEntityAppearNotify.proto index 6fc8854f..abecacae 100644 --- a/proto/SceneEntityAppearNotify.proto +++ b/proto/SceneEntityAppearNotify.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "SceneEntityInfo.proto"; import "VisionType.proto"; // CmdId: 248 +// Obf: EJEBGFEJNHH message SceneEntityAppearNotify { repeated SceneEntityInfo entity_list = 9; uint32 param = 1; diff --git a/proto/SceneEntityDisappearNotify.proto b/proto/SceneEntityDisappearNotify.proto index 2bc129dc..f108eda9 100644 --- a/proto/SceneEntityDisappearNotify.proto +++ b/proto/SceneEntityDisappearNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "VisionType.proto"; // CmdId: 258 +// Obf: KJKBDILCGDG message SceneEntityDisappearNotify { uint32 param = 12; repeated uint32 entity_list = 13; diff --git a/proto/SceneEntityDrownReq.proto b/proto/SceneEntityDrownReq.proto index babde538..207b056f 100644 --- a/proto/SceneEntityDrownReq.proto +++ b/proto/SceneEntityDrownReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 276 +// Obf: NDKJBLIDLCI message SceneEntityDrownReq { uint32 entity_id = 4; } diff --git a/proto/SceneEntityDrownRsp.proto b/proto/SceneEntityDrownRsp.proto index b4b9448e..27ff0648 100644 --- a/proto/SceneEntityDrownRsp.proto +++ b/proto/SceneEntityDrownRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 226 +// Obf: EEFFCNDKIIC message SceneEntityDrownRsp { uint32 entity_id = 9; int32 retcode = 3; diff --git a/proto/SceneEntityInfo.proto b/proto/SceneEntityInfo.proto index 8dc1ac99..1ca56ef6 100644 --- a/proto/SceneEntityInfo.proto +++ b/proto/SceneEntityInfo.proto @@ -1,43 +1,58 @@ +// 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 "AnimatorParameterValueInfoPair.proto"; -import "EntityAuthorityInfo.proto"; -import "EntityClientData.proto"; -import "EntityEnvironmentInfo.proto"; -import "FightPropPair.proto"; + +import "ProtEntityType.proto"; import "MotionInfo.proto"; import "PropPair.proto"; -import "ProtEntityType.proto"; +import "FightPropPair.proto"; +import "AnimatorParameterValueInfoPair.proto"; +import "EntityClientData.proto"; +import "EntityEnvironmentInfo.proto"; +import "EntityAuthorityInfo.proto"; +import "ServerBuff.proto"; import "SceneAvatarInfo.proto"; -import "SceneGadgetInfo.proto"; import "SceneMonsterInfo.proto"; import "SceneNpcInfo.proto"; -import "ServerBuff.proto"; - -// Name: HLAAMJAKIEJ +import "SceneGadgetInfo.proto"; +// Obf: LMOBCIGGDEA message SceneEntityInfo { - ProtEntityType entity_type = 1; - uint32 entity_id = 2; - string name = 3; - MotionInfo motion_info = 4; - repeated PropPair prop_list = 5; - repeated FightPropPair fight_prop_list = 6; - uint32 life_state = 7; - repeated AnimatorParameterValueInfoPair animator_para_list = 9; - uint32 last_move_scene_time_ms = 17; - uint32 last_move_reliable_seq = 18; - EntityClientData entity_client_data = 19; - repeated EntityEnvironmentInfo entity_environment_info_list = 20; - EntityAuthorityInfo entity_authority_info = 21; - repeated string tag_list = 22; - repeated ServerBuff server_buff_list = 23; - oneof entity { - SceneAvatarInfo avatar = 10; - SceneMonsterInfo monster = 11; - SceneNpcInfo npc = 12; - SceneGadgetInfo gadget = 13; - } + ProtEntityType entity_type = 1; + uint32 entity_id = 2; + string name = 3; + MotionInfo motion_info = 4; + repeated PropPair prop_list = 5; + repeated FightPropPair fight_prop_list = 6; + uint32 life_state = 7; + repeated AnimatorParameterValueInfoPair animator_para_list = 9; + uint32 last_move_scene_time_ms = 17; + uint32 last_move_reliable_seq = 18; + EntityClientData entity_client_data = 19; + repeated EntityEnvironmentInfo entity_environment_info_list = 20; + EntityAuthorityInfo entity_authority_info = 21; + repeated string tag_list = 22; + repeated ServerBuff server_buff_list = 23; + oneof entity { + SceneAvatarInfo avatar = 10; + SceneMonsterInfo monster = 11; + SceneNpcInfo npc = 12; + SceneGadgetInfo gadget = 13; + } } - diff --git a/proto/SceneEntityMoveNotify.proto b/proto/SceneEntityMoveNotify.proto index ff708930..a312d513 100644 --- a/proto/SceneEntityMoveNotify.proto +++ b/proto/SceneEntityMoveNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "MotionInfo.proto"; // CmdId: 264 +// Obf: MMCBFJJMMBN message SceneEntityMoveNotify { uint32 scene_time = 1; uint32 entity_id = 3; diff --git a/proto/SceneFishInfo.proto b/proto/SceneFishInfo.proto index 2625ff16..b1d340ee 100644 --- a/proto/SceneFishInfo.proto +++ b/proto/SceneFishInfo.proto @@ -1,15 +1,30 @@ +// 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"; - -// Name: CODPKPLDBDH +// Obf: EALFECBKMNC message SceneFishInfo { - uint32 fish_id = 1; - uint32 fish_pool_entity_id = 2; - Vector fish_pool_pos = 3; - uint32 fish_pool_gadget_id = 4; - uint32 last_shock_time = 5; + uint32 fish_id = 1; + uint32 fish_pool_entity_id = 2; + Vector fish_pool_pos = 3; + uint32 fish_pool_gadget_id = 4; + uint32 last_shock_time = 5; } - diff --git a/proto/SceneForceLockNotify.proto b/proto/SceneForceLockNotify.proto index 67aa63c8..7e0a7502 100644 --- a/proto/SceneForceLockNotify.proto +++ b/proto/SceneForceLockNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 203 +// Obf: ECEAOCGLDJA message SceneForceLockNotify { repeated uint32 force_id_list = 12; } diff --git a/proto/SceneForceUnlockNotify.proto b/proto/SceneForceUnlockNotify.proto index 38e0dae3..e765c7a4 100644 --- a/proto/SceneForceUnlockNotify.proto +++ b/proto/SceneForceUnlockNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 243 +// Obf: LNPMOKMCIOM message SceneForceUnlockNotify { repeated uint32 force_id_list = 4; bool is_add = 9; diff --git a/proto/SceneGadgetInfo.proto b/proto/SceneGadgetInfo.proto index fdfb700d..8d2a1a8b 100644 --- a/proto/SceneGadgetInfo.proto +++ b/proto/SceneGadgetInfo.proto @@ -1,76 +1,97 @@ +// 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 "AbilityGadgetInfo.proto"; -import "BlossomChestInfo.proto"; -import "BossChestInfo.proto"; -import "ClientGadgetInfo.proto"; -import "CoinCollectOperatorInfo.proto"; -import "CustomGadgetTreeInfo.proto"; -import "DeshretObeliskGadgetInfo.proto"; -import "EchoShellInfo.proto"; -import "FishPoolInfo.proto"; -import "FoundationInfo.proto"; + import "GadgetBornType.proto"; -import "GadgetGeneralRewardInfo.proto"; -import "GadgetPlayInfo.proto"; -import "GatherGadgetInfo.proto"; -import "Item.proto"; -import "MpPlayRewardInfo.proto"; -import "NightCrowGadgetInfo.proto"; -import "OfferingInfo.proto"; import "PlatformInfo.proto"; -import "RoguelikeGadgetInfo.proto"; -import "ScreenInfo.proto"; -import "StatueGadgetInfo.proto"; -import "VehicleInfo.proto"; -import "WeatherInfo.proto"; +import "GadgetPlayInfo.proto"; +import "LENNDLOGFIM.proto"; +import "OPEMEOGOHME.proto"; +import "HKILNLMDIGF.proto"; +import "Item.proto"; +import "GatherGadgetInfo.proto"; import "WorktopInfo.proto"; - -// Name: CAHMGNJLGHD +import "ClientGadgetInfo.proto"; +import "WeatherInfo.proto"; +import "AbilityGadgetInfo.proto"; +import "StatueGadgetInfo.proto"; +import "BossChestInfo.proto"; +import "BlossomChestInfo.proto"; +import "MpPlayRewardInfo.proto"; +import "GadgetGeneralRewardInfo.proto"; +import "OfferingInfo.proto"; +import "FoundationInfo.proto"; +import "VehicleInfo.proto"; +import "EchoShellInfo.proto"; +import "ScreenInfo.proto"; +import "FishPoolInfo.proto"; +import "CustomGadgetTreeInfo.proto"; +import "RoguelikeGadgetInfo.proto"; +import "NightCrowGadgetInfo.proto"; +import "DeshretObeliskGadgetInfo.proto"; +import "CoinCollectOperatorInfo.proto"; +// Obf: GBAFHJBNENJ message SceneGadgetInfo { - uint32 gadget_id = 1; - uint32 group_id = 2; - uint32 config_id = 3; - uint32 owner_entity_id = 4; - GadgetBornType born_type = 5; - uint32 gadget_state = 6; - uint32 gadget_type = 7; - bool is_show_cutscene = 8; - uint32 authority_peer_id = 9; - bool is_enable_interact = 10; - uint32 interact_id = 11; - uint32 mark_flag = 21; - uint32 prop_owner_entity_id = 22; - PlatformInfo platform = 23; - repeated uint32 interact_uid_list = 24; - uint32 draft_id = 25; - uint32 gadget_talk_state = 26; - GadgetPlayInfo play_info = 100; - oneof content { - Item trifle_item = 12; - GatherGadgetInfo gather_gadget = 13; - WorktopInfo worktop = 14; - ClientGadgetInfo client_gadget = 15; - WeatherInfo weather = 17; - AbilityGadgetInfo ability_gadget = 18; - StatueGadgetInfo statue_gadget = 19; - BossChestInfo boss_chest = 20; - BlossomChestInfo blossom_chest = 41; - MpPlayRewardInfo mp_play_reward = 42; - GadgetGeneralRewardInfo general_reward = 43; - OfferingInfo offering_info = 44; - FoundationInfo foundation_info = 45; - VehicleInfo vehicle_info = 46; - EchoShellInfo shell_info = 47; - ScreenInfo screen_info = 48; - FishPoolInfo fish_pool_info = 59; - CustomGadgetTreeInfo custom_gadget_tree_info = 60; - RoguelikeGadgetInfo roguelike_gadget_info = 61; - NightCrowGadgetInfo night_crow_gadget_info = 62; - DeshretObeliskGadgetInfo deshret_obelisk_gadget_info = 63; - CoinCollectOperatorInfo coin_collect_operator_info = 64; - } + uint32 gadget_id = 1; + uint32 group_id = 2; + uint32 config_id = 3; + uint32 owner_entity_id = 4; + GadgetBornType born_type = 5; + uint32 gadget_state = 6; + uint32 FMINBPFFNBJ = 7; + bool is_show_cutscene = 8; + uint32 authority_peer_id = 9; + bool is_enable_interact = 10; + uint32 AIKNPDNDMDA = 11; + uint32 mark_flag = 21; + uint32 prop_owner_entity_id = 22; + PlatformInfo platform = 23; + repeated uint32 interact_uid_list = 24; + uint32 draft_id = 25; + uint32 CKAMEJBIAMM = 26; + GadgetPlayInfo play_info = 100; + LENNDLOGFIM NAAPIJKGJNO = 101; + OPEMEOGOHME PDCKPMIIAMG = 102; + HKILNLMDIGF EIALEFBIJBO = 103; + oneof content { + Item trifle_item = 12; + GatherGadgetInfo gather_gadget = 13; + WorktopInfo worktop = 14; + ClientGadgetInfo client_gadget = 15; + WeatherInfo weather = 17; + AbilityGadgetInfo ability_gadget = 18; + StatueGadgetInfo statue_gadget = 19; + BossChestInfo boss_chest = 20; + BlossomChestInfo blossom_chest = 41; + MpPlayRewardInfo mp_play_reward = 42; + GadgetGeneralRewardInfo general_reward = 43; + OfferingInfo offering_info = 44; + FoundationInfo foundation_info = 45; + VehicleInfo vehicle_info = 46; + EchoShellInfo shell_info = 47; + ScreenInfo screen_info = 48; + FishPoolInfo fish_pool_info = 59; + CustomGadgetTreeInfo custom_gadget_tree_info = 60; + RoguelikeGadgetInfo roguelike_gadget_info = 61; + NightCrowGadgetInfo night_crow_gadget_info = 62; + DeshretObeliskGadgetInfo deshret_obelisk_gadget_info = 63; + CoinCollectOperatorInfo coin_collect_operator_info = 64; + } } - diff --git a/proto/SceneGalleryHomeSeekFurnitureInfo.proto b/proto/SceneGalleryHomeSeekFurnitureInfo.proto index 6f92a9a2..72ccde3c 100644 --- a/proto/SceneGalleryHomeSeekFurnitureInfo.proto +++ b/proto/SceneGalleryHomeSeekFurnitureInfo.proto @@ -1,13 +1,28 @@ +// 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"; -// Name: GFDMALDLDJM +// Obf: EBBPJONKNOI message SceneGalleryHomeSeekFurnitureInfo { - uint32 NJHPFPPGMHP = 4; - map player_score_map = 15; - uint32 FOLBDGFAJHK = 14; - uint32 GPJDOAEHFGN = 8; + map player_score_map = 12; + uint32 DMDKDGHPDJF = 13; + uint32 AOPDCFLABGK = 6; + uint32 KLNLKCAEJKM = 7; } - diff --git a/proto/SceneInitFinishRsp.proto b/proto/SceneInitFinishRsp.proto index a99c933b..ed8e4921 100644 --- a/proto/SceneInitFinishRsp.proto +++ b/proto/SceneInitFinishRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 255 +// Obf: NMAKCEKIKPC message SceneInitFinishRsp { uint32 enter_scene_token = 3; int32 retcode = 2; diff --git a/proto/SceneKickPlayerReq.proto b/proto/SceneKickPlayerReq.proto index 5230f845..12dffaf9 100644 --- a/proto/SceneKickPlayerReq.proto +++ b/proto/SceneKickPlayerReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 290 +// Obf: KIBICOLPELD message SceneKickPlayerReq { uint32 target_uid = 12; } diff --git a/proto/SceneKickPlayerRsp.proto b/proto/SceneKickPlayerRsp.proto index 0de31acf..147c8aeb 100644 --- a/proto/SceneKickPlayerRsp.proto +++ b/proto/SceneKickPlayerRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 299 +// Obf: IDPLILJFIAF message SceneKickPlayerRsp { int32 retcode = 14; uint32 target_uid = 13; diff --git a/proto/SceneMonsterInfo.proto b/proto/SceneMonsterInfo.proto index bd2bb764..6f57a1ad 100644 --- a/proto/SceneMonsterInfo.proto +++ b/proto/SceneMonsterInfo.proto @@ -1,41 +1,56 @@ +// 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 "FishtankFishInfo.proto"; + +import "SceneWeaponInfo.proto"; import "MonsterBornType.proto"; import "MonsterRoute.proto"; import "SceneFishInfo.proto"; -import "SceneWeaponInfo.proto"; - -// Name: CIBJHBFKKAN +import "FishtankFishInfo.proto"; +// Obf: PILOPKGAHBK message SceneMonsterInfo { - uint32 monster_id = 1; - uint32 group_id = 2; - uint32 config_id = 3; - repeated SceneWeaponInfo weapon_list = 4; - uint32 authority_peer_id = 5; - repeated uint32 affix_list = 6; - bool is_elite = 7; - uint32 owner_entity_id = 8; - uint32 summoned_tag = 9; - map summon_tag_map = 10; - uint32 pose_id = 11; - MonsterBornType born_type = 12; - uint32 block_id = 13; - uint32 mark_flag = 14; - uint32 title_id = 15; - uint32 special_name_id = 16; - uint32 attack_target_id = 17; - MonsterRoute monster_route = 18; - uint32 ai_config_id = 19; - uint32 level_route_id = 20; - uint32 init_pose_id = 21; - bool is_light = 22; - uint32 kill_num = 23; - oneof content { - SceneFishInfo fish_info = 50; - FishtankFishInfo fishtank_fish_info = 51; - } + uint32 monster_id = 1; + uint32 group_id = 2; + uint32 config_id = 3; + repeated SceneWeaponInfo weapon_list = 4; + uint32 authority_peer_id = 5; + repeated uint32 affix_list = 6; + bool is_elite = 7; + uint32 owner_entity_id = 8; + uint32 summoned_tag = 9; + map summon_tag_map = 10; + uint32 pose_id = 11; + MonsterBornType born_type = 12; + uint32 block_id = 13; + uint32 mark_flag = 14; + uint32 title_id = 15; + uint32 special_name_id = 16; + uint32 attack_target_id = 17; + MonsterRoute monster_route = 18; + uint32 ai_config_id = 19; + uint32 level_route_id = 20; + uint32 init_pose_id = 21; + bool is_light = 22; + uint32 kill_num = 23; + oneof content { + SceneFishInfo fish_info = 50; + FishtankFishInfo fishtank_fish_info = 51; + } } - diff --git a/proto/SceneNpcInfo.proto b/proto/SceneNpcInfo.proto index 35784d78..ab770e34 100644 --- a/proto/SceneNpcInfo.proto +++ b/proto/SceneNpcInfo.proto @@ -1,13 +1,28 @@ +// 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"; -// Name: KAMHNCPNIKM +// Obf: AIBIFKIHIGF message SceneNpcInfo { - uint32 npc_id = 1; - uint32 room_id = 2; - uint32 parent_quest_id = 3; - uint32 block_id = 4; + uint32 npc_id = 1; + uint32 room_id = 2; + uint32 parent_quest_id = 3; + uint32 block_id = 4; } - diff --git a/proto/ScenePlayerInfo.proto b/proto/ScenePlayerInfo.proto index f47e65a4..f4d2e843 100644 --- a/proto/ScenePlayerInfo.proto +++ b/proto/ScenePlayerInfo.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "OnlinePlayerInfo.proto"; +// Obf: NDFLFMOCGDH message ScenePlayerInfo { OnlinePlayerInfo online_player_info = 3; uint32 uid = 13; diff --git a/proto/ScenePlayerInfoNotify.proto b/proto/ScenePlayerInfoNotify.proto index 14763de8..b746fbd0 100644 --- a/proto/ScenePlayerInfoNotify.proto +++ b/proto/ScenePlayerInfoNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ScenePlayerInfo.proto"; // CmdId: 253 +// Obf: ADOEGJHHOPF message ScenePlayerInfoNotify { repeated ScenePlayerInfo player_info_list = 8; } diff --git a/proto/ScenePlayerLocationNotify.proto b/proto/ScenePlayerLocationNotify.proto index 4b692ff4..1706ba73 100644 --- a/proto/ScenePlayerLocationNotify.proto +++ b/proto/ScenePlayerLocationNotify.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "PlayerLocationInfo.proto"; import "VehicleLocationInfo.proto"; // CmdId: 221 +// Obf: BDEAGHFPELD message ScenePlayerLocationNotify { repeated PlayerLocationInfo player_loc_list = 6; repeated VehicleLocationInfo vehicle_loc_list = 9; diff --git a/proto/ScenePointUnlockNotify.proto b/proto/ScenePointUnlockNotify.proto index 1915a63b..e4afc095 100644 --- a/proto/ScenePointUnlockNotify.proto +++ b/proto/ScenePointUnlockNotify.proto @@ -20,10 +20,11 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 238 +// Obf: GPHGADDHCKH message ScenePointUnlockNotify { uint32 scene_id = 7; - repeated uint32 locked_point_list = 13; + repeated uint32 unhide_point_list = 13; repeated uint32 hide_point_list = 11; - repeated uint32 unhide_point_list = 1; + repeated uint32 locked_point_list = 1; repeated uint32 point_list = 3; } diff --git a/proto/SceneReliquaryInfo.proto b/proto/SceneReliquaryInfo.proto index bd18ab33..463b3cff 100644 --- a/proto/SceneReliquaryInfo.proto +++ b/proto/SceneReliquaryInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: FNNPFGFHKCK message SceneReliquaryInfo { uint32 item_id = 1; uint64 guid = 2; diff --git a/proto/SceneRouteChangeInfo.proto b/proto/SceneRouteChangeInfo.proto index 51dc75dd..dfa23b38 100644 --- a/proto/SceneRouteChangeInfo.proto +++ b/proto/SceneRouteChangeInfo.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "RoutePointChangeInfo.proto"; +// Obf: AGEBCJKFPJE message SceneRouteChangeInfo { bool is_forward = 12; uint32 type = 5; diff --git a/proto/SceneRouteChangeNotify.proto b/proto/SceneRouteChangeNotify.proto index e9317ee0..c430557b 100644 --- a/proto/SceneRouteChangeNotify.proto +++ b/proto/SceneRouteChangeNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "SceneRouteChangeInfo.proto"; // CmdId: 297 +// Obf: MCHDAMBCLPA message SceneRouteChangeNotify { uint32 scene_id = 8; repeated SceneRouteChangeInfo route_list = 9; diff --git a/proto/SceneTeamAvatar.proto b/proto/SceneTeamAvatar.proto index 86c9ae48..62436b26 100644 --- a/proto/SceneTeamAvatar.proto +++ b/proto/SceneTeamAvatar.proto @@ -25,6 +25,7 @@ import "SceneEntityInfo.proto"; import "SceneAvatarInfo.proto"; import "AbilityControlBlock.proto"; import "AvatarInfo.proto"; +// Obf: GHFNMPHGENH message SceneTeamAvatar { uint32 weapon_entity_id = 5; AbilitySyncStateInfo avatar_ability_info = 2; diff --git a/proto/SceneTeamUpdateNotify.proto b/proto/SceneTeamUpdateNotify.proto index c057395f..cb79b8a4 100644 --- a/proto/SceneTeamUpdateNotify.proto +++ b/proto/SceneTeamUpdateNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "SceneTeamAvatar.proto"; // CmdId: 1652 +// Obf: BNPIBIMJIEG message SceneTeamUpdateNotify { repeated SceneTeamAvatar scene_team_avatar_list = 8; bool is_in_mp = 13; diff --git a/proto/SceneTimeNotify.proto b/proto/SceneTimeNotify.proto index cf85400f..067695a3 100644 --- a/proto/SceneTimeNotify.proto +++ b/proto/SceneTimeNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 245 +// Obf: JJACCGBIANL message SceneTimeNotify { uint32 scene_id = 7; uint64 scene_time = 5; diff --git a/proto/SceneTransToPointReq.proto b/proto/SceneTransToPointReq.proto index c9a9817e..e7d5028d 100644 --- a/proto/SceneTransToPointReq.proto +++ b/proto/SceneTransToPointReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 288 +// Obf: PLFFHAGMEHO message SceneTransToPointReq { uint32 point_id = 1; uint32 scene_id = 12; diff --git a/proto/SceneTransToPointRsp.proto b/proto/SceneTransToPointRsp.proto index 16566b3e..1cbb45cd 100644 --- a/proto/SceneTransToPointRsp.proto +++ b/proto/SceneTransToPointRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 268 +// Obf: BCNGDFENAPI message SceneTransToPointRsp { uint32 point_id = 12; uint32 scene_id = 13; diff --git a/proto/SceneWeaponInfo.proto b/proto/SceneWeaponInfo.proto index 46ed8fdf..f3c409a4 100644 --- a/proto/SceneWeaponInfo.proto +++ b/proto/SceneWeaponInfo.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AbilitySyncStateInfo.proto"; import "EntityRendererChangedInfo.proto"; +// Obf: KOGLLGKJBFG message SceneWeaponInfo { uint32 entity_id = 1; uint32 gadget_id = 2; diff --git a/proto/ScreenInfo.proto b/proto/ScreenInfo.proto index e602e95e..afe1007e 100644 --- a/proto/ScreenInfo.proto +++ b/proto/ScreenInfo.proto @@ -1,11 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Name: CJACJEAEACK +// Obf: BPBJHFCAEEA message ScreenInfo { - uint32 live_id = 1; - uint32 projector_entity_id = 2; + uint32 live_id = 1; + uint32 projector_entity_id = 2; } - diff --git a/proto/SeaLampActivityDetailInfo.proto b/proto/SeaLampActivityDetailInfo.proto new file mode 100644 index 00000000..9dda0bec --- /dev/null +++ b/proto/SeaLampActivityDetailInfo.proto @@ -0,0 +1,31 @@ +// 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: GJIPMDIPMGO +message SeaLampActivityDetailInfo { + uint32 phase_id = 15; + repeated uint32 JLAFALJAHBL = 13; + repeated uint32 GFHLEOBJAIL = 5; + uint32 days = 1; + uint32 DNLDBIOFPCD = 9; + uint32 NIOMOKCABBI = 3; + uint32 progress = 2; +} diff --git a/proto/SeaLampActivityInfo.proto b/proto/SeaLampActivityInfo.proto index 53b5bdfb..9cd0405c 100644 --- a/proto/SeaLampActivityInfo.proto +++ b/proto/SeaLampActivityInfo.proto @@ -1,19 +1,34 @@ +// 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 "SeaLampSectionInfo.proto"; - -// Name: JALGJKCFCMP +// Obf: BAKHKCAKDEI message SeaLampActivityInfo { - uint32 sea_lamp_coin = 10; - uint32 day_index = 4; - uint32 first_day_start_time = 12; - repeated SeaLampSectionInfo section_info_list = 8; - bool CFABGECNHGK = 2; - uint32 mechanicus_id = 7; - bool is_content_closed = 15; - uint32 popularity = 14; - bool IAAOFEIDABB = 1; + uint32 day_index = 8; + bool is_content_closed = 6; + repeated SeaLampSectionInfo section_info_list = 15; + bool JOCKLIEKCHP = 7; + uint32 first_day_start_time = 10; + uint32 mechanicus_id = 3; + bool CKANAPMJECL = 4; + uint32 sea_lamp_coin = 11; + uint32 popularity = 14; } - diff --git a/proto/SeaLampContributeItemReq.proto b/proto/SeaLampContributeItemReq.proto index c1638252..13e43670 100644 --- a/proto/SeaLampContributeItemReq.proto +++ b/proto/SeaLampContributeItemReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; // CmdId: 2004 +// Obf: FKLLBGKIHFB message SeaLampContributeItemReq { uint32 activity_id = 12; repeated ItemParam item_list = 9; diff --git a/proto/SeaLampContributeItemRsp.proto b/proto/SeaLampContributeItemRsp.proto index 960ff1db..351dc11f 100644 --- a/proto/SeaLampContributeItemRsp.proto +++ b/proto/SeaLampContributeItemRsp.proto @@ -20,9 +20,10 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2154 +// Obf: MBKMPAKHNKB message SeaLampContributeItemRsp { int32 retcode = 5; - uint32 PALEBIMELHA = 6; - uint32 JJDPHHMPCAN = 12; + uint32 BIMKNDECJAI = 6; + uint32 AHINNHBBILH = 12; uint32 add_progress = 10; } diff --git a/proto/SeaLampSectionInfo.proto b/proto/SeaLampSectionInfo.proto index 3e5346cf..4493c241 100644 --- a/proto/SeaLampSectionInfo.proto +++ b/proto/SeaLampSectionInfo.proto @@ -1,10 +1,25 @@ +// 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"; -// Name: FJMAOPGLLOM +// Obf: KKNGABPHNLP message SeaLampSectionInfo { - uint32 section_id = 12; + uint32 section_id = 13; } - diff --git a/proto/SeaLampV3CampInfo.proto b/proto/SeaLampV3CampInfo.proto new file mode 100644 index 00000000..d0f6c48f --- /dev/null +++ b/proto/SeaLampV3CampInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "SeaLampV3CampStageInfo.proto"; +// Obf: NAFCFFFCKIL +message SeaLampV3CampInfo { + repeated SeaLampV3CampStageInfo stage_info_list = 6; +} diff --git a/proto/SeaLampV3CampStageInfo.proto b/proto/SeaLampV3CampStageInfo.proto new file mode 100644 index 00000000..28406519 --- /dev/null +++ b/proto/SeaLampV3CampStageInfo.proto @@ -0,0 +1,28 @@ +// 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: CMCFPKPHHLE +message SeaLampV3CampStageInfo { + bool is_finished = 10; + uint32 stage_id = 2; + uint32 level_id = 15; + bool is_open = 6; +} diff --git a/proto/SeaLampV3DetailInfo.proto b/proto/SeaLampV3DetailInfo.proto new file mode 100644 index 00000000..d6f1666f --- /dev/null +++ b/proto/SeaLampV3DetailInfo.proto @@ -0,0 +1,30 @@ +// 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 "SeaLampV3CampInfo.proto"; +import "SeaLampV3ShadowInfo.proto"; +import "SeaLampV3RaceInfo.proto"; +// Obf: GNIMFGCJKMP +message SeaLampV3DetailInfo { + SeaLampV3CampInfo camp_info = 13; + SeaLampV3ShadowInfo shadow_info = 1; + SeaLampV3RaceInfo race_info = 5; +} diff --git a/proto/SeaLampV3RaceInfo.proto b/proto/SeaLampV3RaceInfo.proto new file mode 100644 index 00000000..d69b3b6d --- /dev/null +++ b/proto/SeaLampV3RaceInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "SeaLampV3RaceLevelInfo.proto"; +// Obf: MBDDHEHCMGF +message SeaLampV3RaceInfo { + repeated SeaLampV3RaceLevelInfo level_info_list = 9; +} diff --git a/proto/SeaLampV3RaceLevelInfo.proto b/proto/SeaLampV3RaceLevelInfo.proto new file mode 100644 index 00000000..63b5342c --- /dev/null +++ b/proto/SeaLampV3RaceLevelInfo.proto @@ -0,0 +1,27 @@ +// 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: OADPHHELDFB +message SeaLampV3RaceLevelInfo { + uint32 max_score = 3; + bool is_open = 5; + uint32 level_id = 2; +} diff --git a/proto/SeaLampV3ShadowInfo.proto b/proto/SeaLampV3ShadowInfo.proto new file mode 100644 index 00000000..358d21b3 --- /dev/null +++ b/proto/SeaLampV3ShadowInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "SeaLampV3ShadowStageInfo.proto"; +// Obf: KHGILCEDNKL +message SeaLampV3ShadowInfo { + repeated SeaLampV3ShadowStageInfo stage_info_list = 2; +} diff --git a/proto/SeaLampV3ShadowLevelInfo.proto b/proto/SeaLampV3ShadowLevelInfo.proto new file mode 100644 index 00000000..6fe06e81 --- /dev/null +++ b/proto/SeaLampV3ShadowLevelInfo.proto @@ -0,0 +1,27 @@ +// 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: PGFAIDKGFLI +message SeaLampV3ShadowLevelInfo { + uint32 min_finish_time = 11; + bool is_open = 3; + uint32 level_id = 1; +} diff --git a/proto/SeaLampV3ShadowStageInfo.proto b/proto/SeaLampV3ShadowStageInfo.proto new file mode 100644 index 00000000..aa3385fb --- /dev/null +++ b/proto/SeaLampV3ShadowStageInfo.proto @@ -0,0 +1,28 @@ +// 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 "SeaLampV3ShadowLevelInfo.proto"; +// Obf: BLJNOEIPFOA +message SeaLampV3ShadowStageInfo { + repeated SeaLampV3ShadowLevelInfo level_info_list = 14; + bool is_open = 9; + uint32 stage_id = 12; +} diff --git a/proto/SeeMonsterReq.proto b/proto/SeeMonsterReq.proto index 24ca084b..4916b28d 100644 --- a/proto/SeeMonsterReq.proto +++ b/proto/SeeMonsterReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 267 +// Obf: AMEEDFKFMLC message SeeMonsterReq { uint32 monster_id = 1; } diff --git a/proto/SeekFurnitureGalleryInfo.proto b/proto/SeekFurnitureGalleryInfo.proto deleted file mode 100644 index 70a99c13..00000000 --- a/proto/SeekFurnitureGalleryInfo.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "HomeSeekFurnitureOneRecord.proto"; - -message SeekFurnitureGalleryInfo { - repeated HomeSeekFurnitureOneRecord recordList = 5; -} diff --git a/proto/SelectWorktopOptionReq.proto b/proto/SelectWorktopOptionReq.proto index 6934783d..193d86ce 100644 --- a/proto/SelectWorktopOptionReq.proto +++ b/proto/SelectWorktopOptionReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 855 +// Obf: MDNJNLAPAFA message SelectWorktopOptionReq { uint32 gadget_entity_id = 3; uint32 option_id = 2; diff --git a/proto/SelectWorktopOptionRsp.proto b/proto/SelectWorktopOptionRsp.proto index 76b32cea..8bca2c83 100644 --- a/proto/SelectWorktopOptionRsp.proto +++ b/proto/SelectWorktopOptionRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 848 +// Obf: KLCNPHMJEMD message SelectWorktopOptionRsp { uint32 option_id = 13; int32 retcode = 6; diff --git a/proto/ServantInfo.proto b/proto/ServantInfo.proto index f0067841..4bacc695 100644 --- a/proto/ServantInfo.proto +++ b/proto/ServantInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: KJENNHPPHLL message ServantInfo { uint32 master_entity_id = 1; uint32 born_slot_index = 2; diff --git a/proto/ServerAnnounceNotify.proto b/proto/ServerAnnounceNotify.proto index d8478454..b81787f1 100644 --- a/proto/ServerAnnounceNotify.proto +++ b/proto/ServerAnnounceNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AnnounceData.proto"; // CmdId: 2050 +// Obf: HDJBPCNBOFB message ServerAnnounceNotify { repeated AnnounceData announce_data_list = 1; } diff --git a/proto/ServerAnnounceRevokeNotify.proto b/proto/ServerAnnounceRevokeNotify.proto index 60f4a85c..f85395e2 100644 --- a/proto/ServerAnnounceRevokeNotify.proto +++ b/proto/ServerAnnounceRevokeNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2142 +// Obf: MMGOIGJLOFK message ServerAnnounceRevokeNotify { repeated uint32 config_id_list = 5; } diff --git a/proto/ServerBuff.proto b/proto/ServerBuff.proto index d2487c99..112f5b9c 100644 --- a/proto/ServerBuff.proto +++ b/proto/ServerBuff.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: IKGPNFFPDOG message ServerBuff { uint32 server_buff_uid = 1; uint32 server_buff_id = 2; diff --git a/proto/ServerBuffChangeNotify.proto b/proto/ServerBuffChangeNotify.proto index 18ee860e..14c17819 100644 --- a/proto/ServerBuffChangeNotify.proto +++ b/proto/ServerBuffChangeNotify.proto @@ -21,11 +21,13 @@ option java_package = "emu.grasscutter.net.proto"; import "ServerBuff.proto"; // CmdId: 323 +// Obf: LACOIJCBPHJ message ServerBuffChangeNotify { + // Obf: OKJGNGFMJGH enum ServerBuffChangeType { - SERVER_BUFF_CHANGE_TYPE_ADD_SERVER_BUFF = 0; - SERVER_BUFF_CHANGE_TYPE_DEL_SERVER_BUFF = 1; - } + SERVER_BUFF_CHANGE_TYPE_ADD_SERVER_BUFF = 0; + SERVER_BUFF_CHANGE_TYPE_DEL_SERVER_BUFF = 1; + } repeated ServerBuff server_buff_list = 5; repeated uint64 avatar_guid_list = 12; diff --git a/proto/ServerBuffChangeType.proto b/proto/ServerBuffChangeType.proto deleted file mode 100644 index 57f7b7a2..00000000 --- a/proto/ServerBuffChangeType.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - - -enum ServerBuffChangeType { - SERVER_BUFF_CHANGE_TYPE_ADD_SERVER_BUFF = 0; - SERVER_BUFF_CHANGE_TYPE_DEL_SERVER_BUFF = 1; -} diff --git a/proto/ServerCondMeetQuestListUpdateNotify.proto b/proto/ServerCondMeetQuestListUpdateNotify.proto index 7f4f5ef1..5c6adcbb 100644 --- a/proto/ServerCondMeetQuestListUpdateNotify.proto +++ b/proto/ServerCondMeetQuestListUpdateNotify.proto @@ -20,7 +20,8 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 443 +// Obf: KCDEBHKFPJI message ServerCondMeetQuestListUpdateNotify { - repeated uint32 del_quest_id_list = 12; - repeated uint32 add_quest_id_list = 2; + repeated uint32 add_quest_id_list = 12; + repeated uint32 del_quest_id_list = 2; } diff --git a/proto/ServerGlobalValueChangeNotify.proto b/proto/ServerGlobalValueChangeNotify.proto index c4135348..123c294b 100644 --- a/proto/ServerGlobalValueChangeNotify.proto +++ b/proto/ServerGlobalValueChangeNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1134 +// Obf: IDCHIBLPNFI message ServerGlobalValueChangeNotify { uint32 entity_id = 6; uint32 key_hash = 3; diff --git a/proto/ServerTimeNotify.proto b/proto/ServerTimeNotify.proto index 1c300a5c..f84a126e 100644 --- a/proto/ServerTimeNotify.proto +++ b/proto/ServerTimeNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 30 +// Obf: CCOFLLBAAAP message ServerTimeNotify { uint64 server_time = 3; } diff --git a/proto/SetBattlePassViewedReq.proto b/proto/SetBattlePassViewedReq.proto index e053534b..26f31e3d 100644 --- a/proto/SetBattlePassViewedReq.proto +++ b/proto/SetBattlePassViewedReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2601 +// Obf: IOCOEGFGKKH message SetBattlePassViewedReq { uint32 schedule_id = 13; } diff --git a/proto/SetBattlePassViewedRsp.proto b/proto/SetBattlePassViewedRsp.proto index 0ea493a6..2384f6f0 100644 --- a/proto/SetBattlePassViewedRsp.proto +++ b/proto/SetBattlePassViewedRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2642 +// Obf: BCMGHCKOMIP message SetBattlePassViewedRsp { uint32 schedule_id = 11; int32 retcode = 1; diff --git a/proto/SetChatEmojiCollectionReq.proto b/proto/SetChatEmojiCollectionReq.proto index 148a1175..3a18fac6 100644 --- a/proto/SetChatEmojiCollectionReq.proto +++ b/proto/SetChatEmojiCollectionReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ChatEmojiCollectionData.proto"; // CmdId: 4019 +// Obf: IOLHCMEELHO message SetChatEmojiCollectionReq { ChatEmojiCollectionData chat_emoji_collection_data = 14; } diff --git a/proto/SetChatEmojiCollectionRsp.proto b/proto/SetChatEmojiCollectionRsp.proto index fd4554cd..517c6baa 100644 --- a/proto/SetChatEmojiCollectionRsp.proto +++ b/proto/SetChatEmojiCollectionRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4089 +// Obf: MMBMFFADHEM message SetChatEmojiCollectionRsp { int32 retcode = 11; } diff --git a/proto/SetEntityClientDataNotify.proto b/proto/SetEntityClientDataNotify.proto index bf8448d1..4bd1cf03 100644 --- a/proto/SetEntityClientDataNotify.proto +++ b/proto/SetEntityClientDataNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "EntityClientData.proto"; // CmdId: 3172 +// Obf: IADECFHIJAH message SetEntityClientDataNotify { uint32 entity_id = 11; EntityClientData entity_client_data = 6; diff --git a/proto/SetEquipLockStateReq.proto b/proto/SetEquipLockStateReq.proto index 9553b18e..aa8815fd 100644 --- a/proto/SetEquipLockStateReq.proto +++ b/proto/SetEquipLockStateReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 661 +// Obf: EEKKEIGCNPK message SetEquipLockStateReq { uint64 target_equip_guid = 4; bool is_locked = 12; diff --git a/proto/SetEquipLockStateRsp.proto b/proto/SetEquipLockStateRsp.proto index bd362e12..c14b568f 100644 --- a/proto/SetEquipLockStateRsp.proto +++ b/proto/SetEquipLockStateRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 601 +// Obf: DOABHLJKEJE message SetEquipLockStateRsp { uint64 target_equip_guid = 4; int32 retcode = 2; diff --git a/proto/SetFriendEnterHomeOptionReq.proto b/proto/SetFriendEnterHomeOptionReq.proto index 9314fb40..c4dc0e53 100644 --- a/proto/SetFriendEnterHomeOptionReq.proto +++ b/proto/SetFriendEnterHomeOptionReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "FriendEnterHomeOption.proto"; // CmdId: 4847 +// Obf: IIOGPMHNJOB message SetFriendEnterHomeOptionReq { FriendEnterHomeOption option = 7; } diff --git a/proto/SetFriendEnterHomeOptionRsp.proto b/proto/SetFriendEnterHomeOptionRsp.proto index 740c61a6..c831ddc9 100644 --- a/proto/SetFriendEnterHomeOptionRsp.proto +++ b/proto/SetFriendEnterHomeOptionRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4516 +// Obf: LBEGABLDMMD message SetFriendEnterHomeOptionRsp { int32 retcode = 9; } diff --git a/proto/SetIsAutoUnlockSpecificEquipReq.proto b/proto/SetIsAutoUnlockSpecificEquipReq.proto index bc843616..03b091dd 100644 --- a/proto/SetIsAutoUnlockSpecificEquipReq.proto +++ b/proto/SetIsAutoUnlockSpecificEquipReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 679 +// Obf: JKJNKFEBOEE message SetIsAutoUnlockSpecificEquipReq { bool is_auto_unlock_specific_equip = 2; } diff --git a/proto/SetIsAutoUnlockSpecificEquipRsp.proto b/proto/SetIsAutoUnlockSpecificEquipRsp.proto index 3aab45d3..3f3b4242 100644 --- a/proto/SetIsAutoUnlockSpecificEquipRsp.proto +++ b/proto/SetIsAutoUnlockSpecificEquipRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 690 +// Obf: EEAPJGDCCKD message SetIsAutoUnlockSpecificEquipRsp { int32 retcode = 6; } diff --git a/proto/SetNameCardReq.proto b/proto/SetNameCardReq.proto index 4fe2754c..2f7a8473 100644 --- a/proto/SetNameCardReq.proto +++ b/proto/SetNameCardReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4024 +// Obf: NCJBONDLOML message SetNameCardReq { uint32 name_card_id = 7; } diff --git a/proto/SetNameCardRsp.proto b/proto/SetNameCardRsp.proto index bd193507..94a1eb7e 100644 --- a/proto/SetNameCardRsp.proto +++ b/proto/SetNameCardRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4031 +// Obf: ECODBMBONCO message SetNameCardRsp { int32 retcode = 2; uint32 name_card_id = 12; diff --git a/proto/SetOpenStateReq.proto b/proto/SetOpenStateReq.proto index a92af0a1..0b4a9c17 100644 --- a/proto/SetOpenStateReq.proto +++ b/proto/SetOpenStateReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 133 +// Obf: MNNNDMABDMJ message SetOpenStateReq { uint32 value = 12; uint32 key = 5; diff --git a/proto/SetOpenStateRsp.proto b/proto/SetOpenStateRsp.proto index a71a1014..9836d343 100644 --- a/proto/SetOpenStateRsp.proto +++ b/proto/SetOpenStateRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 124 +// Obf: FKLLEOBOFLB message SetOpenStateRsp { uint32 value = 8; uint32 key = 10; diff --git a/proto/SetPlayerBirthdayReq.proto b/proto/SetPlayerBirthdayReq.proto index 6090d056..f2449e67 100644 --- a/proto/SetPlayerBirthdayReq.proto +++ b/proto/SetPlayerBirthdayReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Birthday.proto"; // CmdId: 4021 +// Obf: HFNNKNIKDGD message SetPlayerBirthdayReq { Birthday birthday = 8; } diff --git a/proto/SetPlayerBirthdayRsp.proto b/proto/SetPlayerBirthdayRsp.proto index 8a9d8f66..91f6be70 100644 --- a/proto/SetPlayerBirthdayRsp.proto +++ b/proto/SetPlayerBirthdayRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Birthday.proto"; // CmdId: 4034 +// Obf: HEHJNLHHOJN message SetPlayerBirthdayRsp { int32 retcode = 4; Birthday birthday = 13; diff --git a/proto/SetPlayerBornDataReq.proto b/proto/SetPlayerBornDataReq.proto index 4f40d8c7..84c56500 100644 --- a/proto/SetPlayerBornDataReq.proto +++ b/proto/SetPlayerBornDataReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 116 +// Obf: PNBDELBENPO message SetPlayerBornDataReq { string nick_name = 7; uint32 avatar_id = 10; diff --git a/proto/SetPlayerBornDataRsp.proto b/proto/SetPlayerBornDataRsp.proto index 8e239d5a..8d64cefc 100644 --- a/proto/SetPlayerBornDataRsp.proto +++ b/proto/SetPlayerBornDataRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 128 +// Obf: GFAMJEPFNNJ message SetPlayerBornDataRsp { int32 retcode = 5; } diff --git a/proto/SetPlayerHeadImageReq.proto b/proto/SetPlayerHeadImageReq.proto index dba64307..ae82eb5b 100644 --- a/proto/SetPlayerHeadImageReq.proto +++ b/proto/SetPlayerHeadImageReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4028 +// Obf: BFCLIPDJCHJ message SetPlayerHeadImageReq { uint32 avatar_id = 11; } diff --git a/proto/SetPlayerHeadImageRsp.proto b/proto/SetPlayerHeadImageRsp.proto index a9c6429a..0b47d682 100644 --- a/proto/SetPlayerHeadImageRsp.proto +++ b/proto/SetPlayerHeadImageRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ProfilePicture.proto"; // CmdId: 4038 +// Obf: FFBCPLJOOKJ message SetPlayerHeadImageRsp { int32 retcode = 8; ProfilePicture profile_picture = 11; diff --git a/proto/SetPlayerNameReq.proto b/proto/SetPlayerNameReq.proto index c384257d..3c0d243f 100644 --- a/proto/SetPlayerNameReq.proto +++ b/proto/SetPlayerNameReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 168 +// Obf: MNAKOMCEIOL message SetPlayerNameReq { string nick_name = 8; } diff --git a/proto/SetPlayerNameRsp.proto b/proto/SetPlayerNameRsp.proto index 02a11f48..5e935e3e 100644 --- a/proto/SetPlayerNameRsp.proto +++ b/proto/SetPlayerNameRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 106 +// Obf: DPMBIHGIAKA message SetPlayerNameRsp { int32 retcode = 14; string nick_name = 15; diff --git a/proto/SetPlayerPropReq.proto b/proto/SetPlayerPropReq.proto index b07da3fc..8ed240d2 100644 --- a/proto/SetPlayerPropReq.proto +++ b/proto/SetPlayerPropReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "PropValue.proto"; // CmdId: 134 +// Obf: GPOOEKBEBCI message SetPlayerPropReq { repeated PropValue prop_list = 15; } diff --git a/proto/SetPlayerPropRsp.proto b/proto/SetPlayerPropRsp.proto index 8f95413e..078da7b8 100644 --- a/proto/SetPlayerPropRsp.proto +++ b/proto/SetPlayerPropRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 194 +// Obf: ECKMKKKGEBP message SetPlayerPropRsp { int32 retcode = 15; } diff --git a/proto/SetPlayerSignatureReq.proto b/proto/SetPlayerSignatureReq.proto index 06d7e9ef..851fd932 100644 --- a/proto/SetPlayerSignatureReq.proto +++ b/proto/SetPlayerSignatureReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4094 +// Obf: OCDFJPIHLBA message SetPlayerSignatureReq { string signature = 7; } diff --git a/proto/SetPlayerSignatureRsp.proto b/proto/SetPlayerSignatureRsp.proto index 49f8f5e8..f465869d 100644 --- a/proto/SetPlayerSignatureRsp.proto +++ b/proto/SetPlayerSignatureRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4016 +// Obf: OJEMMPNBMPF message SetPlayerSignatureRsp { string signature = 6; int32 retcode = 14; diff --git a/proto/SetUpAvatarTeamReq.proto b/proto/SetUpAvatarTeamReq.proto index 8a56da05..a61e6b7c 100644 --- a/proto/SetUpAvatarTeamReq.proto +++ b/proto/SetUpAvatarTeamReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1666 +// Obf: LHAACJBAOOB message SetUpAvatarTeamReq { uint64 cur_avatar_guid = 13; uint32 team_id = 14; diff --git a/proto/SetUpAvatarTeamRsp.proto b/proto/SetUpAvatarTeamRsp.proto index ae4dfaeb..6f92c103 100644 --- a/proto/SetUpAvatarTeamRsp.proto +++ b/proto/SetUpAvatarTeamRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1613 +// Obf: EBLCDMCNFJI message SetUpAvatarTeamRsp { uint64 cur_avatar_guid = 5; uint32 team_id = 2; diff --git a/proto/SetUpLunchBoxWidgetReq.proto b/proto/SetUpLunchBoxWidgetReq.proto index 84b1f5ad..10cfa0f0 100644 --- a/proto/SetUpLunchBoxWidgetReq.proto +++ b/proto/SetUpLunchBoxWidgetReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "LunchBoxData.proto"; // CmdId: 4257 +// Obf: KOMALFPCIAI message SetUpLunchBoxWidgetReq { LunchBoxData lunch_box_data = 14; } diff --git a/proto/SetUpLunchBoxWidgetRsp.proto b/proto/SetUpLunchBoxWidgetRsp.proto index 8f6e8b67..6b159532 100644 --- a/proto/SetUpLunchBoxWidgetRsp.proto +++ b/proto/SetUpLunchBoxWidgetRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "LunchBoxData.proto"; // CmdId: 4273 +// Obf: MKLJPIPDEHJ message SetUpLunchBoxWidgetRsp { LunchBoxData lunch_box_data = 2; int32 retcode = 9; diff --git a/proto/SetWidgetSlotReq.proto b/proto/SetWidgetSlotReq.proto index 4f4b255e..53c40869 100644 --- a/proto/SetWidgetSlotReq.proto +++ b/proto/SetWidgetSlotReq.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "WidgetSlotTag.proto"; import "WidgetSlotOp.proto"; // CmdId: 4300 +// Obf: JJDOFKPCAFB message SetWidgetSlotReq { uint32 material_id = 8; repeated WidgetSlotTag tag_list = 6; diff --git a/proto/SetWidgetSlotRsp.proto b/proto/SetWidgetSlotRsp.proto index 4bdc71a0..ed9c9a8e 100644 --- a/proto/SetWidgetSlotRsp.proto +++ b/proto/SetWidgetSlotRsp.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "WidgetSlotTag.proto"; import "WidgetSlotOp.proto"; // CmdId: 4286 +// Obf: LGMCNLPMOFI message SetWidgetSlotRsp { int32 retcode = 5; uint32 material_id = 11; diff --git a/proto/Shop.proto b/proto/Shop.proto index 7005e3ab..09a31d3d 100644 --- a/proto/Shop.proto +++ b/proto/Shop.proto @@ -19,17 +19,18 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "BBANKBFEFAA.proto"; -import "CLIPCGJEBBP.proto"; +import "ShopCardProduct.proto"; +import "ShopMcoinProduct.proto"; import "ShopGoods.proto"; -import "CKIBKCAKBNI.proto"; +import "ShopConcertProduct.proto"; +// Obf: JBIFADEKOFE message Shop { uint32 next_refresh_time = 2; - repeated BBANKBFEFAA KIGFMBMMIBP = 1; + repeated ShopCardProduct card_product_list = 1; uint32 shop_type = 5; - repeated CLIPCGJEBBP PHHBIDDLLLB = 14; + repeated ShopMcoinProduct mcoin_product_list = 14; uint32 city_id = 8; repeated ShopGoods goods_list = 7; uint32 city_reputation_level = 10; - repeated CKIBKCAKBNI DODBGAGDNDK = 6; + repeated ShopConcertProduct concert_product_list = 6; } diff --git a/proto/ShopCardProduct.proto b/proto/ShopCardProduct.proto index 296b64f7..6bba4f8b 100644 --- a/proto/ShopCardProduct.proto +++ b/proto/ShopCardProduct.proto @@ -1,26 +1,39 @@ +// 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"; - -// Name: OOHOEKGOKIO +// Obf: BBANKBFEFAA message ShopCardProduct { - // Name: IIOFMJEGPIJ - message ResinCard { - repeated ItemParam base_item_list = 1; - repeated ItemParam per_day_item_list = 2; - } - - string product_id = 1; - string price_tier = 2; - uint32 mcoin_base = 3; - uint32 hcoin_per_day = 4; - uint32 days = 5; - uint32 remain_reward_days = 6; - uint32 card_product_type = 7; - oneof extra_card_data { - ResinCard resin_card = 101; - } + // Obf: NGEFDJMEEDL + message ResinCard { + repeated ItemParam base_item_list = 1; + repeated ItemParam per_day_item_list = 2; + } + + string product_id = 1; + string price_tier = 2; + uint32 mcoin_base = 3; + uint32 hcoin_per_day = 4; + uint32 days = 5; + uint32 remain_reward_days = 6; + uint32 card_product_type = 7; + optional ResinCard resin_card = 101; } - diff --git a/proto/ShopConcertProduct.proto b/proto/ShopConcertProduct.proto index 080d8295..cae23d6d 100644 --- a/proto/ShopConcertProduct.proto +++ b/proto/ShopConcertProduct.proto @@ -1,16 +1,31 @@ +// 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"; -// Name: JAJEHOIAKLD +// Obf: CKIBKCAKBNI message ShopConcertProduct { - string product_id = 1; - string price_tier = 2; - uint32 obtain_count = 3; - uint32 obtain_limit = 4; - uint32 begin_time = 5; - uint32 end_time = 6; - uint32 buy_times = 7; + string product_id = 1; + string price_tier = 2; + uint32 obtain_count = 3; + uint32 obtain_limit = 4; + uint32 begin_time = 5; + uint32 end_time = 6; + uint32 buy_times = 7; } - diff --git a/proto/ShopGoods.proto b/proto/ShopGoods.proto index 415ded0b..c65c9cb6 100644 --- a/proto/ShopGoods.proto +++ b/proto/ShopGoods.proto @@ -1,29 +1,45 @@ +// 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"; -// 3.6 HELP +import "ItemParam.proto"; +// Obf: PIILCEEKMMC message ShopGoods { - uint32 goodsId = 1; //ok - uint32 EOMGIGFFCLI = 736; - ItemParam goodsItem = 7; //ok - uint32 maxLevel = 9; //ok - uint32 JGCLNJKOALJ = 1201; - uint32 buyLimit = 11; //LAKDFDKCMKC - uint32 ONDHAANEFIK = 1493; - uint32 beginTime = 14; //ok - repeated uint32 preGoodsIdList = 6; //ok - uint32 scoin = 15; - uint32 mcoin = 2; //ok - uint32 boughtNum = 3; //ok - uint32 singleLimit = 688; //GNENHCFPFCP - uint32 BKONLAFGBFC = 10; - uint32 endTime = 4; //ok - uint32 hcoin = 12; //ok - repeated ItemParam costItemList = 13; //ok - uint32 HLDEGIEBMBI = 617; - uint32 minLevel = 8; //ok - uint32 nextRefreshTime = 5; //ok + uint32 begin_time = 14; + uint32 APOECIACFPK = 1474; + repeated ItemParam cost_item_list = 10; + uint32 max_level = 8; + uint32 AEBBIJALJCB = 1508; + uint32 scoin = 12; + uint32 hcoin = 11; + uint32 min_level = 13; + uint32 bought_num = 7; + uint32 KINAPHHFNPA = 256; + uint32 next_refresh_time = 1; + uint32 buy_limit = 3; + ItemParam goods_item = 6; + uint32 secondary_sheet_id = 1819; + uint32 KAPLOLJDEON = 15; + uint32 goods_id = 9; + uint32 end_time = 4; + repeated uint32 preGoodsIdList = 5; + uint32 IAEPIAMFCPF = 772; + uint32 mcoin = 2; } diff --git a/proto/ShopMcoinProduct.proto b/proto/ShopMcoinProduct.proto index 275b3091..3ac86515 100644 --- a/proto/ShopMcoinProduct.proto +++ b/proto/ShopMcoinProduct.proto @@ -1,16 +1,31 @@ +// 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"; -// Name: JFMBGGFOPJO +// Obf: CLIPCGJEBBP message ShopMcoinProduct { - string product_id = 1; - string price_tier = 2; - uint32 mcoin_base = 3; - uint32 mcoin_non_first = 4; - uint32 mcoin_first = 5; - uint32 bought_num = 6; - bool is_audit = 7; + string product_id = 1; + string price_tier = 2; + uint32 mcoin_base = 3; + uint32 mcoin_non_first = 4; + uint32 mcoin_first = 5; + uint32 bought_num = 6; + bool is_audit = 7; } - diff --git a/proto/ShortAbilityHashPair.proto b/proto/ShortAbilityHashPair.proto index 94818358..9ef46e81 100644 --- a/proto/ShortAbilityHashPair.proto +++ b/proto/ShortAbilityHashPair.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: DJEMKNENFJA message ShortAbilityHashPair { sfixed32 ability_name_hash = 11; sfixed32 ability_config_hash = 14; diff --git a/proto/ShowAvatarInfo.proto b/proto/ShowAvatarInfo.proto index 8b8f55ea..d57a5295 100644 --- a/proto/ShowAvatarInfo.proto +++ b/proto/ShowAvatarInfo.proto @@ -23,6 +23,7 @@ import "PropValue.proto"; import "ShowEquip.proto"; import "AvatarFetterInfo.proto"; import "AvatarExcelInfo.proto"; +// Obf: LBFIEJKILCO message ShowAvatarInfo { uint32 avatar_id = 1; map prop_map = 2; diff --git a/proto/ShowEquip.proto b/proto/ShowEquip.proto index 8a8b5abd..a52fca3f 100644 --- a/proto/ShowEquip.proto +++ b/proto/ShowEquip.proto @@ -1,16 +1,31 @@ +// 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 "Reliquary.proto"; import "Weapon.proto"; - -// Name: KPPGCJMONCN +// Obf: EPAIHJBBEOM message ShowEquip { - uint32 item_id = 1; - oneof detail { - Reliquary reliquary = 2; - Weapon weapon = 3; - } + uint32 item_id = 1; + oneof detail { + Reliquary reliquary = 2; + Weapon weapon = 3; + } } - diff --git a/proto/SkipPlayerGameTimeReq.proto b/proto/SkipPlayerGameTimeReq.proto index d19d43a6..fec6e308 100644 --- a/proto/SkipPlayerGameTimeReq.proto +++ b/proto/SkipPlayerGameTimeReq.proto @@ -1,13 +1,28 @@ +// 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: 123 -// Name: GHMNCNNHLAI +// CmdId: 165 +// Obf: CLJNJBDHDEN message SkipPlayerGameTimeReq { - bool is_force_set = 6; - uint32 game_time = 5; - uint32 client_game_time = 14; + uint32 game_time = 6; + bool is_force_set = 12; + uint32 client_game_time = 11; } - diff --git a/proto/SkipPlayerGameTimeRsp.proto b/proto/SkipPlayerGameTimeRsp.proto index eecc213a..1a33738f 100644 --- a/proto/SkipPlayerGameTimeRsp.proto +++ b/proto/SkipPlayerGameTimeRsp.proto @@ -1,13 +1,28 @@ +// 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: 130 -// Name: DFPBHODHPKM +// CmdId: 129 +// Obf: MJEGBKCMNIE message SkipPlayerGameTimeRsp { - uint32 game_time = 9; - uint32 client_game_time = 1; - int32 retcode = 12; + int32 retcode = 12; + uint32 client_game_time = 11; + uint32 game_time = 15; } - diff --git a/proto/SkyCrystalDetectorData.proto b/proto/SkyCrystalDetectorData.proto index 78504b07..fcce834f 100644 --- a/proto/SkyCrystalDetectorData.proto +++ b/proto/SkyCrystalDetectorData.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; +// Obf: HDIPMHHKDFC message SkyCrystalDetectorData { bool is_hint_valid = 6; Vector hint_center_pos = 3; diff --git a/proto/GECIONGCJJF.proto b/proto/SkyCrystalDetectorQuickUseResult.proto similarity index 93% rename from proto/GECIONGCJJF.proto rename to proto/SkyCrystalDetectorQuickUseResult.proto index 0df63df0..3ecc28cd 100644 --- a/proto/GECIONGCJJF.proto +++ b/proto/SkyCrystalDetectorQuickUseResult.proto @@ -20,7 +20,8 @@ option java_package = "emu.grasscutter.net.proto"; import "SkyCrystalDetectorData.proto"; -message GECIONGCJJF { +// Obf: GECIONGCJJF +message SkyCrystalDetectorQuickUseResult { int32 retcode = 11; SkyCrystalDetectorData sky_crystal_detector_data = 4; } diff --git a/proto/SocialDetail.proto b/proto/SocialDetail.proto index f506563a..2f0c464f 100644 --- a/proto/SocialDetail.proto +++ b/proto/SocialDetail.proto @@ -24,6 +24,7 @@ import "FriendOnlineState.proto"; import "SocialShowAvatarInfo.proto"; import "FriendEnterHomeOption.proto"; import "ProfilePicture.proto"; +// Obf: JEKKBLBDEFP message SocialDetail { uint32 uid = 1; string nickname = 2; diff --git a/proto/SocialShowAvatarInfo.proto b/proto/SocialShowAvatarInfo.proto index 6708e19f..0c92a522 100644 --- a/proto/SocialShowAvatarInfo.proto +++ b/proto/SocialShowAvatarInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: HFJBPBGJGNP message SocialShowAvatarInfo { uint32 avatar_id = 1; uint32 level = 2; diff --git a/proto/SorushTrialDetailInfo.proto b/proto/SorushTrialDetailInfo.proto new file mode 100644 index 00000000..d6da8934 --- /dev/null +++ b/proto/SorushTrialDetailInfo.proto @@ -0,0 +1,28 @@ +// 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: BEBGFDMPMHD +message SorushTrialDetailInfo { + repeated uint32 DGELICKACOP = 6; + repeated uint32 COOILNKNEEF = 3; + map KFLLEIACPHC = 10; + repeated uint32 EJBPEFKFILC = 13; +} diff --git a/proto/SpiceActivityDetailInfo.proto b/proto/SpiceActivityDetailInfo.proto new file mode 100644 index 00000000..55c7d442 --- /dev/null +++ b/proto/SpiceActivityDetailInfo.proto @@ -0,0 +1,28 @@ +// 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 "SpiceStageData.proto"; +// Obf: KMDDHMJGLKE +message SpiceActivityDetailInfo { + uint32 KIFHDNINMHD = 7; + repeated SpiceStageData spice_stage_data_list = 8; + uint32 BDGNIOMACMP = 5; +} diff --git a/proto/SpiceStageData.proto b/proto/SpiceStageData.proto new file mode 100644 index 00000000..c230cd9a --- /dev/null +++ b/proto/SpiceStageData.proto @@ -0,0 +1,27 @@ +// 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: KGCOAKGGDMA +message SpiceStageData { + bool is_open = 11; + uint32 success_times = 14; + uint32 stage_id = 6; +} diff --git a/proto/StatueGadgetInfo.proto b/proto/StatueGadgetInfo.proto index 9f73f0f0..fa2f0d0b 100644 --- a/proto/StatueGadgetInfo.proto +++ b/proto/StatueGadgetInfo.proto @@ -1,10 +1,25 @@ +// 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"; -// Name: OFGJAIBKPKJ +// Obf: AEGLPKDOHJN message StatueGadgetInfo { - repeated uint32 opened_statue_uid_list = 1; + repeated uint32 opened_statue_uid_list = 1; } - diff --git a/proto/StopServerInfo.proto b/proto/StopServerInfo.proto index d15c58f2..d11731ec 100644 --- a/proto/StopServerInfo.proto +++ b/proto/StopServerInfo.proto @@ -1,13 +1,28 @@ +// 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"; -// Name: EEDNKCDNPIP +// Obf: CHDJMPLAMAF message StopServerInfo { - uint32 stop_begin_time = 1; - uint32 stop_end_time = 2; - string url = 3; - string content_msg = 4; + uint32 stop_begin_time = 1; + uint32 stop_end_time = 2; + string url = 3; + string content_msg = 4; } - diff --git a/proto/StoreItemChangeNotify.proto b/proto/StoreItemChangeNotify.proto index c0e47350..b6ab9895 100644 --- a/proto/StoreItemChangeNotify.proto +++ b/proto/StoreItemChangeNotify.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Item.proto"; import "StoreType.proto"; // CmdId: 602 +// Obf: MEIPEBBLOAK message StoreItemChangeNotify { repeated Item item_list = 4; StoreType store_type = 7; diff --git a/proto/StoreItemDelNotify.proto b/proto/StoreItemDelNotify.proto index b67ff3d5..dd04a608 100644 --- a/proto/StoreItemDelNotify.proto +++ b/proto/StoreItemDelNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "StoreType.proto"; // CmdId: 672 +// Obf: MJDDFMEHHPF message StoreItemDelNotify { StoreType store_type = 2; repeated uint64 guid_list = 3; diff --git a/proto/StoreType.proto b/proto/StoreType.proto index 3dd2bcec..1e9d348b 100644 --- a/proto/StoreType.proto +++ b/proto/StoreType.proto @@ -1,12 +1,27 @@ +// 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"; -// Name: MPBJOANOMOJ +// Obf: CLABPDKNMDH enum StoreType { STORE_TYPE_NONE = 0; STORE_TYPE_PACK = 1; STORE_TYPE_DEPOT = 2; } - diff --git a/proto/StoreWeightLimitNotify.proto b/proto/StoreWeightLimitNotify.proto index 0d281968..47f8a4ca 100644 --- a/proto/StoreWeightLimitNotify.proto +++ b/proto/StoreWeightLimitNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "StoreType.proto"; // CmdId: 696 +// Obf: DCOJNBIAKNK message StoreWeightLimitNotify { uint32 weight_limit = 7; uint32 material_count_limit = 5; diff --git a/proto/StrengthenPointData.proto b/proto/StrengthenPointData.proto index 552f6f81..07288dbd 100644 --- a/proto/StrengthenPointData.proto +++ b/proto/StrengthenPointData.proto @@ -19,7 +19,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: OJLOLCKMJNH message StrengthenPointData { - uint32 JGMKNJPHFDI = 1; - uint32 PLMNNJLCBPP = 8; + uint32 MJENJDAGDJI = 1; + uint32 NINKDFMACII = 8; } diff --git a/proto/SummerTimeDetailInfo.proto b/proto/SummerTimeDetailInfo.proto new file mode 100644 index 00000000..d4223906 --- /dev/null +++ b/proto/SummerTimeDetailInfo.proto @@ -0,0 +1,30 @@ +// 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 "SummerTimeSprintBoatInfo.proto"; +import "SummerTimeStageInfo.proto"; +// Obf: LGMHCEDKEJH +message SummerTimeDetailInfo { + uint32 content_close_time = 5; + SummerTimeSprintBoatInfo sprint_boat_info = 11; + bool is_content_closed = 15; + map stage_map = 6; +} diff --git a/proto/SummerTimeDungeonInfo.proto b/proto/SummerTimeDungeonInfo.proto new file mode 100644 index 00000000..7e5c363b --- /dev/null +++ b/proto/SummerTimeDungeonInfo.proto @@ -0,0 +1,29 @@ +// 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: DOGHNGGDOPO +message SummerTimeDungeonInfo { + uint32 ONINCEHHENA = 2; + uint32 PADCPPNAKOL = 4; + uint32 dungeon_id = 7; + uint32 OLEAMLOOABN = 3; + uint32 BOCOGLPBAHG = 13; +} diff --git a/proto/SummerTimeSprintBoatInfo.proto b/proto/SummerTimeSprintBoatInfo.proto new file mode 100644 index 00000000..341bd982 --- /dev/null +++ b/proto/SummerTimeSprintBoatInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "SummerTimeSprintBoatRecord.proto"; +// Obf: OJNCOEHJAKA +message SummerTimeSprintBoatInfo { + repeated SummerTimeSprintBoatRecord record_list = 3; +} diff --git a/proto/SummerTimeSprintBoatRecord.proto b/proto/SummerTimeSprintBoatRecord.proto new file mode 100644 index 00000000..dbebeaf7 --- /dev/null +++ b/proto/SummerTimeSprintBoatRecord.proto @@ -0,0 +1,29 @@ +// 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: GNOICPDCCBH +message SummerTimeSprintBoatRecord { + repeated uint32 watcher_id_list = 5; + uint32 group_id = 13; + uint32 best_score = 6; + uint32 start_time = 7; + bool is_touched = 9; +} diff --git a/proto/SummerTimeStageInfo.proto b/proto/SummerTimeStageInfo.proto new file mode 100644 index 00000000..17007017 --- /dev/null +++ b/proto/SummerTimeStageInfo.proto @@ -0,0 +1,27 @@ +// 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: NLIAPNIJAKO +message SummerTimeStageInfo { + uint32 stage_id = 12; + bool is_open = 2; + uint32 open_time = 8; +} diff --git a/proto/SummerTimeV2BoatStageInfo.proto b/proto/SummerTimeV2BoatStageInfo.proto new file mode 100644 index 00000000..a0cdb090 --- /dev/null +++ b/proto/SummerTimeV2BoatStageInfo.proto @@ -0,0 +1,28 @@ +// 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: JALCJCCHKJP +message SummerTimeV2BoatStageInfo { + uint32 best_score = 5; + uint32 stage_id = 8; + uint32 open_time = 2; + bool is_open = 13; +} diff --git a/proto/SummerTimeV2DetailInfo.proto b/proto/SummerTimeV2DetailInfo.proto new file mode 100644 index 00000000..8e4d1fe7 --- /dev/null +++ b/proto/SummerTimeV2DetailInfo.proto @@ -0,0 +1,31 @@ +// 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 "SummerTimeV2DungeonStageInfo.proto"; +import "SummerTimeV2BoatStageInfo.proto"; +// Obf: FABCDGBBNAB +message SummerTimeV2DetailInfo { + repeated SummerTimeV2DungeonStageInfo dungeon_stage_info_list = 9; + repeated SummerTimeV2BoatStageInfo boat_stage_info_list = 10; + uint32 KMNJLNJDKCK = 5; + uint32 OBHFBOAPBNK = 11; + bool is_content_closed = 12; +} diff --git a/proto/SummerTimeV2DungeonSettleInfo.proto b/proto/SummerTimeV2DungeonSettleInfo.proto new file mode 100644 index 00000000..4967537b --- /dev/null +++ b/proto/SummerTimeV2DungeonSettleInfo.proto @@ -0,0 +1,27 @@ +// 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: HFOHFIIKIBN +message SummerTimeV2DungeonSettleInfo { + uint32 KMNJLNJDKCK = 3; + bool is_success = 6; + uint32 OBHFBOAPBNK = 13; +} diff --git a/proto/SummerTimeV2DungeonStageInfo.proto b/proto/SummerTimeV2DungeonStageInfo.proto new file mode 100644 index 00000000..32f62222 --- /dev/null +++ b/proto/SummerTimeV2DungeonStageInfo.proto @@ -0,0 +1,28 @@ +// 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: GPEJIIGDKJJ +message SummerTimeV2DungeonStageInfo { + uint32 stage_id = 5; + bool is_prev_dungeon_succeed = 2; + bool is_open = 3; + uint32 open_time = 12; +} diff --git a/proto/SumoActivityDetailInfo.proto b/proto/SumoActivityDetailInfo.proto new file mode 100644 index 00000000..154e2a2b --- /dev/null +++ b/proto/SumoActivityDetailInfo.proto @@ -0,0 +1,28 @@ +// 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 "SumoStageData.proto"; +// Obf: NGGOFMMFPPM +message SumoActivityDetailInfo { + uint32 last_stage_id = 2; + map sumo_stage_map = 12; + uint32 difficulty_id = 10; +} diff --git a/proto/SumoAvatarInfo.proto b/proto/SumoAvatarInfo.proto index 33815710..9a637d0c 100644 --- a/proto/SumoAvatarInfo.proto +++ b/proto/SumoAvatarInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: FMCHEOACJGI message SumoAvatarInfo { bool is_trial = 4; uint64 avatar_id = 1; diff --git a/proto/SumoDungeonSettleNotify.proto b/proto/SumoDungeonSettleNotify.proto index 1aedd6fd..9ec21a04 100644 --- a/proto/SumoDungeonSettleNotify.proto +++ b/proto/SumoDungeonSettleNotify.proto @@ -20,11 +20,12 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 8606 +// Obf: CPECFKJCBMD message SumoDungeonSettleNotify { - uint32 DOOKJGCLOEL = 10; + uint32 DNKNMEGHIIJ = 10; uint32 difficulty_id = 13; bool is_new_record = 11; uint32 stage_id = 1; uint32 final_score = 3; - uint32 LIEGKDIANGC = 9; + uint32 HBMBMJPFLCP = 9; } diff --git a/proto/SumoStageData.proto b/proto/SumoStageData.proto new file mode 100644 index 00000000..8a12dcd7 --- /dev/null +++ b/proto/SumoStageData.proto @@ -0,0 +1,30 @@ +// 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 "SumoTeamData.proto"; +// Obf: OBIJGIMEDDH +message SumoStageData { + bool is_open = 1; + uint32 stage_id = 2; + repeated SumoTeamData team_list = 14; + uint32 open_time = 15; + uint32 max_score = 13; +} diff --git a/proto/SumoTeamData.proto b/proto/SumoTeamData.proto new file mode 100644 index 00000000..6a201aa5 --- /dev/null +++ b/proto/SumoTeamData.proto @@ -0,0 +1,27 @@ +// 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 "SumoAvatarInfo.proto"; +// Obf: JONCAGENEAF +message SumoTeamData { + repeated SumoAvatarInfo avatar_info_list = 10; + repeated uint32 skill_id_list = 5; +} diff --git a/proto/SyncScenePlayTeamEntityNotify.proto b/proto/SyncScenePlayTeamEntityNotify.proto index 3ed1dd8d..b971d69a 100644 --- a/proto/SyncScenePlayTeamEntityNotify.proto +++ b/proto/SyncScenePlayTeamEntityNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "PlayTeamEntityInfo.proto"; // CmdId: 3492 +// Obf: FKCHMCLMDEJ message SyncScenePlayTeamEntityNotify { repeated PlayTeamEntityInfo entity_info_list = 14; uint32 scene_id = 8; diff --git a/proto/SyncTeamEntityNotify.proto b/proto/SyncTeamEntityNotify.proto index 4c1f6d28..107a7e01 100644 --- a/proto/SyncTeamEntityNotify.proto +++ b/proto/SyncTeamEntityNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "TeamEntityInfo.proto"; // CmdId: 318 +// Obf: CDDMEPKMFHF message SyncTeamEntityNotify { repeated TeamEntityInfo team_entity_info_list = 2; uint32 scene_id = 13; diff --git a/proto/TakeAchievementGoalRewardReq.proto b/proto/TakeAchievementGoalRewardReq.proto index cfb8ce35..f15f003e 100644 --- a/proto/TakeAchievementGoalRewardReq.proto +++ b/proto/TakeAchievementGoalRewardReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2676 +// Obf: PDIDCMNCIAE message TakeAchievementGoalRewardReq { repeated uint32 id_list = 1; } diff --git a/proto/TakeAchievementGoalRewardRsp.proto b/proto/TakeAchievementGoalRewardRsp.proto index e27df64c..d9139db8 100644 --- a/proto/TakeAchievementGoalRewardRsp.proto +++ b/proto/TakeAchievementGoalRewardRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; // CmdId: 2689 +// Obf: FDGJLJMOBAD message TakeAchievementGoalRewardRsp { int32 retcode = 4; repeated ItemParam item_list = 1; diff --git a/proto/TakeAchievementRewardReq.proto b/proto/TakeAchievementRewardReq.proto index 5bcd57c4..2449c013 100644 --- a/proto/TakeAchievementRewardReq.proto +++ b/proto/TakeAchievementRewardReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2687 +// Obf: PALNPGEPFIH message TakeAchievementRewardReq { repeated uint32 id_list = 7; } diff --git a/proto/TakeAchievementRewardRsp.proto b/proto/TakeAchievementRewardRsp.proto index 2ddb8544..eb93b663 100644 --- a/proto/TakeAchievementRewardRsp.proto +++ b/proto/TakeAchievementRewardRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; // CmdId: 2671 +// Obf: ODOODHMAKDI message TakeAchievementRewardRsp { repeated ItemParam item_list = 13; repeated uint32 id_list = 11; diff --git a/proto/TakeBackGivingItemReq.proto b/proto/TakeBackGivingItemReq.proto index 5b33c425..b9f4a6fd 100644 --- a/proto/TakeBackGivingItemReq.proto +++ b/proto/TakeBackGivingItemReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 162 +// Obf: DJFBMLNEOFC message TakeBackGivingItemReq { uint32 giving_id = 2; } diff --git a/proto/TakeBackGivingItemRsp.proto b/proto/TakeBackGivingItemRsp.proto index 7c2b97f9..0981a438 100644 --- a/proto/TakeBackGivingItemRsp.proto +++ b/proto/TakeBackGivingItemRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 145 +// Obf: OJJEFFEPDLI message TakeBackGivingItemRsp { uint32 giving_id = 2; int32 retcode = 12; diff --git a/proto/TakeBattlePassMissionPointReq.proto b/proto/TakeBattlePassMissionPointReq.proto index a609ca6c..c881c353 100644 --- a/proto/TakeBattlePassMissionPointReq.proto +++ b/proto/TakeBattlePassMissionPointReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2625 +// Obf: FNGJJANOKFB message TakeBattlePassMissionPointReq { repeated uint32 mission_id_list = 4; } diff --git a/proto/TakeBattlePassMissionPointRsp.proto b/proto/TakeBattlePassMissionPointRsp.proto index fba9c5d6..bff9d4cf 100644 --- a/proto/TakeBattlePassMissionPointRsp.proto +++ b/proto/TakeBattlePassMissionPointRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2607 +// Obf: CKIKOLEHENE message TakeBattlePassMissionPointRsp { repeated uint32 mission_id_list = 1; int32 retcode = 3; diff --git a/proto/TakeBattlePassRewardReq.proto b/proto/TakeBattlePassRewardReq.proto index d7519f48..d2407829 100644 --- a/proto/TakeBattlePassRewardReq.proto +++ b/proto/TakeBattlePassRewardReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "BattlePassRewardTakeOption.proto"; // CmdId: 2626 +// Obf: EAHNLBGINBO message TakeBattlePassRewardReq { repeated BattlePassRewardTakeOption take_option_list = 11; } diff --git a/proto/TakeBattlePassRewardRsp.proto b/proto/TakeBattlePassRewardRsp.proto index 7ed7b704..9ec66215 100644 --- a/proto/TakeBattlePassRewardRsp.proto +++ b/proto/TakeBattlePassRewardRsp.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; import "BattlePassRewardTakeOption.proto"; // CmdId: 2639 +// Obf: JNPLKEHFOOM message TakeBattlePassRewardRsp { repeated ItemParam item_list = 10; repeated BattlePassRewardTakeOption take_option_list = 11; diff --git a/proto/TakeCityReputationParentQuestReq.proto b/proto/TakeCityReputationParentQuestReq.proto index 27cec85e..a203966c 100644 --- a/proto/TakeCityReputationParentQuestReq.proto +++ b/proto/TakeCityReputationParentQuestReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2848 +// Obf: LNAPPLPMLHC message TakeCityReputationParentQuestReq { uint32 city_id = 14; repeated uint32 parent_quest_list = 10; diff --git a/proto/TakeCityReputationParentQuestRsp.proto b/proto/TakeCityReputationParentQuestRsp.proto index 065d45e5..eb1bdcdc 100644 --- a/proto/TakeCityReputationParentQuestRsp.proto +++ b/proto/TakeCityReputationParentQuestRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; // CmdId: 2858 +// Obf: LHMECCFNKID message TakeCityReputationParentQuestRsp { repeated uint32 parent_quest_list = 8; int32 retcode = 4; diff --git a/proto/TakeCompoundOutputReq.proto b/proto/TakeCompoundOutputReq.proto index 6749eeeb..ec045451 100644 --- a/proto/TakeCompoundOutputReq.proto +++ b/proto/TakeCompoundOutputReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 198 +// Obf: ALOHABDLIMK message TakeCompoundOutputReq { uint32 compound_group_id = 1; uint32 compound_id = 7; diff --git a/proto/TakeCompoundOutputRsp.proto b/proto/TakeCompoundOutputRsp.proto index 1d06c263..f717af98 100644 --- a/proto/TakeCompoundOutputRsp.proto +++ b/proto/TakeCompoundOutputRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; // CmdId: 146 +// Obf: EIJPLGLEGGJ message TakeCompoundOutputRsp { repeated ItemParam item_list = 9; int32 retcode = 10; diff --git a/proto/TakeFurnitureMakeReq.proto b/proto/TakeFurnitureMakeReq.proto index 932846a5..292389eb 100644 --- a/proto/TakeFurnitureMakeReq.proto +++ b/proto/TakeFurnitureMakeReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4671 +// Obf: ICMOFCCCLIN message TakeFurnitureMakeReq { uint32 make_id = 12; bool is_fast_finish = 8; diff --git a/proto/TakeFurnitureMakeRsp.proto b/proto/TakeFurnitureMakeRsp.proto index 15545a8f..5fde61c5 100644 --- a/proto/TakeFurnitureMakeRsp.proto +++ b/proto/TakeFurnitureMakeRsp.proto @@ -22,10 +22,11 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; import "FurnitureMakeSlot.proto"; // CmdId: 4887 +// Obf: DKOFNELGLPK message TakeFurnitureMakeRsp { - repeated ItemParam returnItemList = 10; + repeated ItemParam return_item_list = 10; int32 retcode = 5; - repeated ItemParam OutputItemList = 8; + repeated ItemParam output_item_list = 8; uint32 make_id = 7; FurnitureMakeSlot furniture_make_slot = 14; } diff --git a/proto/TakeInvestigationRewardReq.proto b/proto/TakeInvestigationRewardReq.proto index 7e7d3be3..a488704c 100644 --- a/proto/TakeInvestigationRewardReq.proto +++ b/proto/TakeInvestigationRewardReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1904 +// Obf: BIGDKJLPFAM message TakeInvestigationRewardReq { uint32 id = 7; } diff --git a/proto/TakeInvestigationRewardRsp.proto b/proto/TakeInvestigationRewardRsp.proto index 880a63ca..58d68463 100644 --- a/proto/TakeInvestigationRewardRsp.proto +++ b/proto/TakeInvestigationRewardRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1905 +// Obf: NJKBEAJEHFB message TakeInvestigationRewardRsp { uint32 id = 7; int32 retcode = 8; diff --git a/proto/TakeInvestigationTargetRewardReq.proto b/proto/TakeInvestigationTargetRewardReq.proto index 06a0c360..f929fefa 100644 --- a/proto/TakeInvestigationTargetRewardReq.proto +++ b/proto/TakeInvestigationTargetRewardReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1917 +// Obf: DFPKMHAMAHL message TakeInvestigationTargetRewardReq { uint32 quest_id = 8; } diff --git a/proto/TakeInvestigationTargetRewardRsp.proto b/proto/TakeInvestigationTargetRewardRsp.proto index f327e367..8c22531b 100644 --- a/proto/TakeInvestigationTargetRewardRsp.proto +++ b/proto/TakeInvestigationTargetRewardRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1914 +// Obf: IHHFOENFHJG message TakeInvestigationTargetRewardRsp { int32 retcode = 15; uint32 quest_id = 4; diff --git a/proto/TakeMaterialDeleteReturnReq.proto b/proto/TakeMaterialDeleteReturnReq.proto index a483d4a1..388783b8 100644 --- a/proto/TakeMaterialDeleteReturnReq.proto +++ b/proto/TakeMaterialDeleteReturnReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "MaterialDeleteReturnType.proto"; // CmdId: 677 +// Obf: BOEOPIAOODM message TakeMaterialDeleteReturnReq { MaterialDeleteReturnType type = 5; } diff --git a/proto/TakeMaterialDeleteReturnRsp.proto b/proto/TakeMaterialDeleteReturnRsp.proto index b5fa946f..06e7447e 100644 --- a/proto/TakeMaterialDeleteReturnRsp.proto +++ b/proto/TakeMaterialDeleteReturnRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 692 +// Obf: NFIPDJLJCOG message TakeMaterialDeleteReturnRsp { int32 retcode = 7; } diff --git a/proto/TakePlayerLevelRewardReq.proto b/proto/TakePlayerLevelRewardReq.proto index 15e44673..f7b0c167 100644 --- a/proto/TakePlayerLevelRewardReq.proto +++ b/proto/TakePlayerLevelRewardReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 177 +// Obf: BDKEEBHCGLM message TakePlayerLevelRewardReq { uint32 level = 2; } diff --git a/proto/TakePlayerLevelRewardRsp.proto b/proto/TakePlayerLevelRewardRsp.proto index 2a23b98b..d7c000f0 100644 --- a/proto/TakePlayerLevelRewardRsp.proto +++ b/proto/TakePlayerLevelRewardRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 192 +// Obf: OEKGAKDIMMK message TakePlayerLevelRewardRsp { uint32 level = 7; uint32 reward_id = 10; diff --git a/proto/TakeoffEquipReq.proto b/proto/TakeoffEquipReq.proto index 5045eb76..fcb5d318 100644 --- a/proto/TakeoffEquipReq.proto +++ b/proto/TakeoffEquipReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 616 +// Obf: DDDNJNIKELL message TakeoffEquipReq { uint64 avatar_guid = 10; uint32 slot = 11; diff --git a/proto/TakeoffEquipRsp.proto b/proto/TakeoffEquipRsp.proto index 452bb49a..90791056 100644 --- a/proto/TakeoffEquipRsp.proto +++ b/proto/TakeoffEquipRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 628 +// Obf: LJFIEAFMABI message TakeoffEquipRsp { int32 retcode = 10; uint32 slot = 1; diff --git a/proto/TanukiTravelActivityDetailInfo.proto b/proto/TanukiTravelActivityDetailInfo.proto new file mode 100644 index 00000000..ce325fc6 --- /dev/null +++ b/proto/TanukiTravelActivityDetailInfo.proto @@ -0,0 +1,28 @@ +// 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 "TanukiTravelLevelData.proto"; +// Obf: BOOFCPHGDAK +message TanukiTravelActivityDetailInfo { + repeated TanukiTravelLevelData tanuki_travel_level_data_list = 12; + bool is_content_closed = 4; + uint32 finished_level_index = 10; +} diff --git a/proto/TanukiTravelActivityInfo.proto b/proto/TanukiTravelActivityInfo.proto deleted file mode 100644 index 158b84e7..00000000 --- a/proto/TanukiTravelActivityInfo.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - - -import "TanukiTravelLevelData.proto"; - -message TanukiTravelActivityInfo { - uint32 finishedLevelIndex = 11; - bool leftMonsters = 2; - repeated TanukiTravelLevelData tanukiTravelLevelDataList = 6; -} diff --git a/proto/TanukiTravelFinishGuideQuestNotify.proto b/proto/TanukiTravelFinishGuideQuestNotify.proto index 8627da21..976feb32 100644 --- a/proto/TanukiTravelFinishGuideQuestNotify.proto +++ b/proto/TanukiTravelFinishGuideQuestNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 8045 +// Obf: ECGJBENJDOP message TanukiTravelFinishGuideQuestNotify { uint32 activity_id = 12; } diff --git a/proto/TanukiTravelLevelData.proto b/proto/TanukiTravelLevelData.proto index f84aa877..08c59be9 100644 --- a/proto/TanukiTravelLevelData.proto +++ b/proto/TanukiTravelLevelData.proto @@ -1,12 +1,27 @@ +// 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"; -// Name: NAKACCCBMGO +// Obf: NLIDHPKHNHF message TanukiTravelLevelData { - uint32 route_id = 12; - bool is_open = 7; - bool is_finish = 11; + uint32 route_id = 14; + bool is_open = 9; + bool is_finish = 15; } - diff --git a/proto/TeamChainChooseAvatarInfo.proto b/proto/TeamChainChooseAvatarInfo.proto index b63d41ed..3934744d 100644 --- a/proto/TeamChainChooseAvatarInfo.proto +++ b/proto/TeamChainChooseAvatarInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: CHLPLBEMOKI message TeamChainChooseAvatarInfo { bool is_trial_avatar = 3; uint32 avatar_id = 8; diff --git a/proto/TeamChainDetailInfo.proto b/proto/TeamChainDetailInfo.proto new file mode 100644 index 00000000..8e7a6256 --- /dev/null +++ b/proto/TeamChainDetailInfo.proto @@ -0,0 +1,27 @@ +// 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 "TeamChainStageData.proto"; +// Obf: OFKBBPFDJKG +message TeamChainDetailInfo { + bool is_token_costume_reward = 11; + repeated TeamChainStageData stage_data_list = 5; +} diff --git a/proto/TeamChainSettleInfo.proto b/proto/TeamChainSettleInfo.proto new file mode 100644 index 00000000..4b461dc0 --- /dev/null +++ b/proto/TeamChainSettleInfo.proto @@ -0,0 +1,29 @@ +// 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: BIBIJELACGN +message TeamChainSettleInfo { + uint32 total_score = 1; + uint32 stage_id = 5; + repeated uint32 score_list = 2; + bool is_new_record = 9; + uint32 difficulty = 3; +} diff --git a/proto/TeamChainStageData.proto b/proto/TeamChainStageData.proto new file mode 100644 index 00000000..10058d56 --- /dev/null +++ b/proto/TeamChainStageData.proto @@ -0,0 +1,27 @@ +// 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: MEBOCEIKION +message TeamChainStageData { + uint32 best_score = 3; + bool is_open = 10; + uint32 stage_id = 7; +} diff --git a/proto/TeamEnterSceneInfo.proto b/proto/TeamEnterSceneInfo.proto index 5bb53222..a01bc8e8 100644 --- a/proto/TeamEnterSceneInfo.proto +++ b/proto/TeamEnterSceneInfo.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AbilitySyncStateInfo.proto"; import "AbilityControlBlock.proto"; +// Obf: CIPMBEDPLNL message TeamEnterSceneInfo { uint32 team_entity_id = 6; AbilitySyncStateInfo team_ability_info = 10; diff --git a/proto/TeamEntityInfo.proto b/proto/TeamEntityInfo.proto index b46ad62e..1099d711 100644 --- a/proto/TeamEntityInfo.proto +++ b/proto/TeamEntityInfo.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "AbilitySyncStateInfo.proto"; +// Obf: OABINEMNKPI message TeamEntityInfo { uint32 team_entity_id = 8; AbilitySyncStateInfo team_ability_info = 5; diff --git a/proto/ToTheMoonEnterSceneReq.proto b/proto/ToTheMoonEnterSceneReq.proto index 0cbb52f7..212dae59 100644 --- a/proto/ToTheMoonEnterSceneReq.proto +++ b/proto/ToTheMoonEnterSceneReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 6172 +// Obf: DCPNGDBIHKG message ToTheMoonEnterSceneReq { uint32 version = 6; uint32 scene_id = 11; diff --git a/proto/ToTheMoonQueryPathReq.proto b/proto/ToTheMoonQueryPathReq.proto index 2111f018..735083c9 100644 --- a/proto/ToTheMoonQueryPathReq.proto +++ b/proto/ToTheMoonQueryPathReq.proto @@ -21,33 +21,35 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; // CmdId: 6175 +// Obf: CIEJPEDGGGK message ToTheMoonQueryPathReq { - enum OALCKINEBHD { - OptionNone = 0; - OptionNormal = 1; + // Obf: OALCKINEBHD + enum OptionType { + OPTION_NONE = 0; + OPTION_NORMAL = 1; } enum NJDHEEAOEBE { - Classic = 0; - Tendency = 1; - Adaptive = 2; - Inflection = 3; + OILPBFMHGMF_CLASSIC = 0; + OILPBFMHGMF_TENDENCY = 1; + OILPBFMHGMF_ADAPTIVE = 2; + OILPBFMHGMF_INFLECTION = 3; } enum IAKAPNKHDPJ { - All = 0; - Air = 1; - Water = 2; + EHFBKPBIGHA_ALL = 0; + EHFBKPBIGHA_AIR = 1; + EHFBKPBIGHA_WATER = 2; } int32 fuzzy_range = 7; - OALCKINEBHD PPENFPGIFFL = 9; + OptionType query_type = 9; int32 query_id = 11; uint32 scene_id = 1; - bool PHNPILBKNAN = 3; - NJDHEEAOEBE EOOIJPDPPFG = 8; - IAKAPNKHDPJ GPLBKBPOBIF = 14; + bool PIODKBAAPMI = 3; + NJDHEEAOEBE HJKBMLBDJKE = 8; + IAKAPNKHDPJ FPKOPPELDPD = 14; Vector destination_pos = 10; Vector source_pos = 12; - bool GKLIGFPCPHK = 13; + bool PKAONDIKPNI = 13; } diff --git a/proto/ToTheMoonQueryPathRsp.proto b/proto/ToTheMoonQueryPathRsp.proto index 3064bc3c..cd2da198 100644 --- a/proto/ToTheMoonQueryPathRsp.proto +++ b/proto/ToTheMoonQueryPathRsp.proto @@ -21,11 +21,13 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; // CmdId: 6196 +// Obf: FJLGCJGKCNH message ToTheMoonQueryPathRsp { + // Obf: CMEHMMFDJGC enum PathStatusType { - StatusFail = 0; - StatusSucc = 1; - StatusPartial = 2; + STATUS_FAIL = 0; + STATUS_SUCC = 1; + STATUS_PARTIAL = 2; } repeated Vector corners = 4; diff --git a/proto/TowerAllDataReq.proto b/proto/TowerAllDataReq.proto index 0e7435ef..cdd9f1ea 100644 --- a/proto/TowerAllDataReq.proto +++ b/proto/TowerAllDataReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2435 +// Obf: BMOMJPFDKHO message TowerAllDataReq { bool is_interact = 11; } diff --git a/proto/TowerAllDataRsp.proto b/proto/TowerAllDataRsp.proto index 72607f2b..1dde6a5d 100644 --- a/proto/TowerAllDataRsp.proto +++ b/proto/TowerAllDataRsp.proto @@ -1,29 +1,45 @@ +// 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 "TowerCurLevelRecord.proto"; + import "TowerFloorRecord.proto"; import "TowerMonthlyBrief.proto"; - -// 3.6 HELP +import "TowerCurLevelRecord.proto"; +// CmdId: 2487 +// Obf: JHFGICEJJLA message TowerAllDataRsp { - uint32 tower_schedule_id = 10; - bool is_finished_entrance_floor = 4; - map floor_open_time_map = 1; - uint32 AJKNPOGBLDG = 6; // not used - bool is_first_interact = 11; - uint32 next_schedule_change_time = 5; - int32 retcode = 13; - uint32 PHCNCLHJFBM = 8; // not used - uint32 KPJMJMPPPGK = 12; // not used - uint32 valid_tower_record_num = 15; //NKMMGNAGOOA - TowerMonthlyBrief last_schedule_monthly_brief = 1890; - repeated TowerFloorRecord tower_floor_record_list = 2; - TowerMonthlyBrief monthly_brief = 7; - map skip_floor_granted_reward_item_map = 3; - uint32 GMMJNDFMHAM = 9; // GMMJNDFMHAM - uint32 schedule_start_time = 1783; - TowerCurLevelRecord cur_level_record = 14; + uint32 schedule_start_time = 159; + uint32 NALKMJPEKCD = 12; + uint32 MIFBIGEDCJH = 4; + map floor_open_time_map = 1; + repeated TowerFloorRecord tower_floor_record_list = 11; + uint32 next_schedule_change_time = 3; + bool is_first_interact = 2; + bool is_finished_entrance_floor = 10; + TowerMonthlyBrief last_schedule_monthly_brief = 5; + int32 retcode = 14; + TowerMonthlyBrief monthly_brief = 741; + uint32 MIGOLAOAOOK = 13; + TowerCurLevelRecord cur_level_record = 15; + uint32 EDFFKEPDKBN = 8; + map HDJMDHAPMME = 7; + uint32 DMCKKIKKMLB = 6; + uint32 tower_schedule_id = 9; } - diff --git a/proto/TowerCurLevelRecord.proto b/proto/TowerCurLevelRecord.proto index 6f670a27..c9244b5c 100644 --- a/proto/TowerCurLevelRecord.proto +++ b/proto/TowerCurLevelRecord.proto @@ -20,11 +20,12 @@ option java_package = "emu.grasscutter.net.proto"; import "TowerTeam.proto"; +// Obf: MKOKJFHLIGK message TowerCurLevelRecord { repeated TowerTeam tower_team_list = 11; repeated uint32 buff_id_list = 2; bool is_upper_part = 12; - uint32 cur_level_index = 9; + uint32 cur_floor_id = 9; bool is_empty = 3; - uint32 cur_floor_id = 1; + uint32 cur_level_index = 1; } diff --git a/proto/TowerCurLevelRecordChangeNotify.proto b/proto/TowerCurLevelRecordChangeNotify.proto index 69db1d4e..222efae3 100644 --- a/proto/TowerCurLevelRecordChangeNotify.proto +++ b/proto/TowerCurLevelRecordChangeNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "TowerCurLevelRecord.proto"; // CmdId: 2402 +// Obf: NNFONEJACKG message TowerCurLevelRecordChangeNotify { TowerCurLevelRecord cur_level_record = 13; } diff --git a/proto/TowerEnterLevelReq.proto b/proto/TowerEnterLevelReq.proto index 4539411e..36dcc95a 100644 --- a/proto/TowerEnterLevelReq.proto +++ b/proto/TowerEnterLevelReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2484 +// Obf: GMHIHFGPOBF message TowerEnterLevelReq { uint32 enter_point_id = 10; } diff --git a/proto/TowerEnterLevelRsp.proto b/proto/TowerEnterLevelRsp.proto index 673ca8c8..23e6c1a2 100644 --- a/proto/TowerEnterLevelRsp.proto +++ b/proto/TowerEnterLevelRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2464 +// Obf: LPPGHFCGFBD message TowerEnterLevelRsp { int32 retcode = 6; uint32 level_index = 9; diff --git a/proto/TowerFloorRecord.proto b/proto/TowerFloorRecord.proto index ae762f77..b2cade86 100644 --- a/proto/TowerFloorRecord.proto +++ b/proto/TowerFloorRecord.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "TowerLevelRecord.proto"; +// Obf: PMCAONINPDD message TowerFloorRecord { map passed_level_map = 14; uint32 floor_id = 3; diff --git a/proto/TowerFloorRecordChangeNotify.proto b/proto/TowerFloorRecordChangeNotify.proto index b9267839..552a012f 100644 --- a/proto/TowerFloorRecordChangeNotify.proto +++ b/proto/TowerFloorRecordChangeNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "TowerFloorRecord.proto"; // CmdId: 2496 +// Obf: MAFKENDBENG message TowerFloorRecordChangeNotify { repeated TowerFloorRecord tower_floor_record_list = 10; bool is_finished_entrance_floor = 5; diff --git a/proto/TowerLevelEndNotify.proto b/proto/TowerLevelEndNotify.proto index e038eb77..e2c1d68d 100644 --- a/proto/TowerLevelEndNotify.proto +++ b/proto/TowerLevelEndNotify.proto @@ -1,22 +1,37 @@ +// 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"; -// CmdId: 2481 -// Name: KGDJCGBBNBK +import "ItemParam.proto"; +// CmdId: 2466 +// Obf: ACPJMJPFENC message TowerLevelEndNotify { - enum ContinueStateType { + enum ContinueStateType { CONTINUE_STATE_TYPE_CAN_NOT_CONTINUE = 0; CONTINUE_STATE_TYPE_CAN_ENTER_NEXT_LEVEL = 1; CONTINUE_STATE_TYPE_CAN_ENTER_NEXT_FLOOR = 2; } - uint32 next_floor_id = 9; // NFPEACBMIHL - bool is_success = 11; - repeated ItemParam reward_item_list = 1; - uint32 continue_state = 2; // NMFAPIENEMG - repeated uint32 finished_star_cond_list = 6; + uint32 next_floor_id = 1; + uint32 continue_state = 2; + bool is_success = 4; + repeated uint32 finished_star_cond_list = 7; + repeated ItemParam reward_item_list = 10; } - diff --git a/proto/TowerLevelRecord.proto b/proto/TowerLevelRecord.proto index 05837767..94b909da 100644 --- a/proto/TowerLevelRecord.proto +++ b/proto/TowerLevelRecord.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: EPLOECPIEFN message TowerLevelRecord { repeated uint32 satisfied_cond_list = 3; uint32 level_id = 9; diff --git a/proto/TowerLevelStarCondData.proto b/proto/TowerLevelStarCondData.proto index 621a6fe7..054278fa 100644 --- a/proto/TowerLevelStarCondData.proto +++ b/proto/TowerLevelStarCondData.proto @@ -19,9 +19,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: BGEPDKGLCMN message TowerLevelStarCondData { - uint32 OOLICJPIIOB = 15; - uint32 LODABBNJIIL = 7; - bool JGJPFOAEFEN = 4; - bool ICCHLPHNHGN = 11; + uint32 star_cond_index = 15; + uint32 cond_value = 7; + bool HHFLBKFMCIH = 4; + bool DJEMLDOFGLI = 11; } diff --git a/proto/TowerLevelStarCondNotify.proto b/proto/TowerLevelStarCondNotify.proto index 1020e574..bd7e9083 100644 --- a/proto/TowerLevelStarCondNotify.proto +++ b/proto/TowerLevelStarCondNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "TowerLevelStarCondData.proto"; // CmdId: 2443 +// Obf: BMILIEDEACF message TowerLevelStarCondNotify { uint32 level_index = 3; repeated TowerLevelStarCondData cond_data_list = 6; diff --git a/proto/TowerMiddleLevelChangeTeamNotify.proto b/proto/TowerMiddleLevelChangeTeamNotify.proto index 3d0e63f4..4049e784 100644 --- a/proto/TowerMiddleLevelChangeTeamNotify.proto +++ b/proto/TowerMiddleLevelChangeTeamNotify.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2403 +// Obf: PEPCKKGFJCN message TowerMiddleLevelChangeTeamNotify { } diff --git a/proto/TowerMonthlyBrief.proto b/proto/TowerMonthlyBrief.proto index caabaa61..66e04a6a 100644 --- a/proto/TowerMonthlyBrief.proto +++ b/proto/TowerMonthlyBrief.proto @@ -1,13 +1,28 @@ +// 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"; -// Name: PFEKDHGCBPP +// Obf: PLCFJBMLEGG message TowerMonthlyBrief { - uint32 towerScheduleId = 12; - uint32 bestLevelIndex = 2; - uint32 bestFloorIndex = 9; - uint32 totalStarCount = 1; + uint32 LJGBNNKAJOF = 5; + uint32 FGDCNEJCNJO = 14; + uint32 tower_schedule_id = 6; + uint32 LINAGDMNNGF = 3; } - diff --git a/proto/TowerTeam.proto b/proto/TowerTeam.proto index f22db946..6709ec8c 100644 --- a/proto/TowerTeam.proto +++ b/proto/TowerTeam.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: NOGLNAGCMIJ message TowerTeam { uint32 tower_team_id = 13; repeated uint64 avatar_guid_list = 9; diff --git a/proto/TowerTeamSelectReq.proto b/proto/TowerTeamSelectReq.proto index d48f83c3..380911e0 100644 --- a/proto/TowerTeamSelectReq.proto +++ b/proto/TowerTeamSelectReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "TowerTeam.proto"; // CmdId: 2448 +// Obf: EAILCMAJAMH message TowerTeamSelectReq { repeated TowerTeam tower_team_list = 2; uint32 floor_id = 6; diff --git a/proto/TowerTeamSelectRsp.proto b/proto/TowerTeamSelectRsp.proto index 50e20dfb..ee9db7c1 100644 --- a/proto/TowerTeamSelectRsp.proto +++ b/proto/TowerTeamSelectRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 2458 +// Obf: KNFLOIHDFKG message TowerTeamSelectRsp { int32 retcode = 4; } diff --git a/proto/TrackingIOInfo.proto b/proto/TrackingIOInfo.proto index 50f7ebb7..9d64bca5 100644 --- a/proto/TrackingIOInfo.proto +++ b/proto/TrackingIOInfo.proto @@ -19,12 +19,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: JOKGLALOCCK message TrackingIOInfo { - string LOOADIODGII = 8; - string FNFKBHDGPCG = 15; - string ADPAEPKMKAM = 4; - string CECOEGINKBN = 9; - string MPHHEJIKHPF = 10; - string MKHJCEANNKC = 7; - string CBNNONJDMOM = 14; + string PHKLBMJLABP = 8; + string MCPANGKOECL = 15; + string OFKJCJFIHDA = 4; + string ADHIHLMGAAA = 9; + string BEBOGAEBAGG = 10; + string BBMJLHFKKDB = 7; + string OAKADAODLLM = 14; } diff --git a/proto/TreasureMapActivityDetailInfo.proto b/proto/TreasureMapActivityDetailInfo.proto new file mode 100644 index 00000000..70a6a383 --- /dev/null +++ b/proto/TreasureMapActivityDetailInfo.proto @@ -0,0 +1,35 @@ +// 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 "TreasureMapRegionInfo.proto"; +import "TreasureMapBonusChallengeInfo.proto"; +// Obf: MFOFKGPNAFM +message TreasureMapActivityDetailInfo { + uint32 currency_num = 15; + uint32 active_region_index = 10; + uint32 LNCICKPCKFO = 9; + uint32 AHKMMEEKNKE = 4; + repeated TreasureMapRegionInfo region_info_list = 14; + repeated TreasureMapBonusChallengeInfo bonus_challenge_list = 2; + uint32 treasure_close_time = 12; + bool is_mp_challenge_touched = 11; + uint32 BPGGGEFPDBM = 8; +} diff --git a/proto/TreasureMapBonusChallengeInfo.proto b/proto/TreasureMapBonusChallengeInfo.proto new file mode 100644 index 00000000..88f5dfec --- /dev/null +++ b/proto/TreasureMapBonusChallengeInfo.proto @@ -0,0 +1,29 @@ +// 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: FDNBCOFJKJB +message TreasureMapBonusChallengeInfo { + bool is_done = 1; + uint32 solution_id = 14; + bool is_active = 6; + uint32 config_id = 11; + map fragment_map = 5; +} diff --git a/proto/TreasureMapRegionInfo.proto b/proto/TreasureMapRegionInfo.proto index 68bd0bb3..90271992 100644 --- a/proto/TreasureMapRegionInfo.proto +++ b/proto/TreasureMapRegionInfo.proto @@ -20,14 +20,15 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; +// Obf: MKBIKOOLFKM message TreasureMapRegionInfo { - uint32 JAIOGCBIKEC = 6; + uint32 HHEFCPDDMAH = 6; Vector region_center_pos = 9; uint32 region_id = 14; - uint32 OANABNBFBPI = 15; - bool EHPGJNDPBIC = 12; + uint32 MFILLAMOAHJ = 15; + bool ALKEKFFIMPL = 12; uint32 start_time = 5; - bool CKIEBBJBOKP = 3; + bool IACKAEJAPLO = 3; uint32 scene_id = 8; uint32 region_radius = 4; } diff --git a/proto/TreasureMapRegionInfoNotify.proto b/proto/TreasureMapRegionInfoNotify.proto index 347a29dd..aadd1062 100644 --- a/proto/TreasureMapRegionInfoNotify.proto +++ b/proto/TreasureMapRegionInfoNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "TreasureMapRegionInfo.proto"; // CmdId: 2034 +// Obf: DEKOGKDOANP message TreasureMapRegionInfoNotify { TreasureMapRegionInfo region_info = 10; } diff --git a/proto/TreasureSeelieActivityDetailInfo.proto b/proto/TreasureSeelieActivityDetailInfo.proto new file mode 100644 index 00000000..688b96ad --- /dev/null +++ b/proto/TreasureSeelieActivityDetailInfo.proto @@ -0,0 +1,28 @@ +// 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 "TreasureSeelieRegionData.proto"; +// Obf: NAFAGCGIODM +message TreasureSeelieActivityDetailInfo { + repeated TreasureSeelieRegionData region_data_list = 6; + bool is_content_closed = 4; + uint32 treasure_close_time = 8; +} diff --git a/proto/TreasureSeelieRegionData.proto b/proto/TreasureSeelieRegionData.proto new file mode 100644 index 00000000..b4904c48 --- /dev/null +++ b/proto/TreasureSeelieRegionData.proto @@ -0,0 +1,35 @@ +// 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: GBBGOGACLPL +message TreasureSeelieRegionData { + float region_radius = 3; + bool is_open = 15; + bool is_done = 9; + uint32 GMPLAHBFNDI = 2; + uint32 PDGGKGMJEOF = 12; + uint32 region_id = 14; + uint32 open_time = 1; + uint32 scene_id = 7; + Vector region_center_pos = 4; + uint32 DDJIADJINIP = 8; +} diff --git a/proto/TrialAvatarActivityDetailInfo.proto b/proto/TrialAvatarActivityDetailInfo.proto new file mode 100644 index 00000000..b7b61681 --- /dev/null +++ b/proto/TrialAvatarActivityDetailInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "TrialAvatarActivityRewardDetailInfo.proto"; +// Obf: CNHGNLNNLKL +message TrialAvatarActivityDetailInfo { + repeated TrialAvatarActivityRewardDetailInfo reward_info_list = 6; +} diff --git a/proto/TrialAvatarActivityRewardDetailInfo.proto b/proto/TrialAvatarActivityRewardDetailInfo.proto new file mode 100644 index 00000000..e3ab1393 --- /dev/null +++ b/proto/TrialAvatarActivityRewardDetailInfo.proto @@ -0,0 +1,28 @@ +// 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: LEJKLPGFMIG +message TrialAvatarActivityRewardDetailInfo { + bool ICGKJKIDFKM = 9; + bool KCJNPAELNLF = 12; + uint32 reward_id = 14; + uint32 trial_avatar_index_id = 5; +} diff --git a/proto/TrialAvatarFirstPassDungeonNotify.proto b/proto/TrialAvatarFirstPassDungeonNotify.proto index 21da1728..65858574 100644 --- a/proto/TrialAvatarFirstPassDungeonNotify.proto +++ b/proto/TrialAvatarFirstPassDungeonNotify.proto @@ -1,11 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 2089 -// Name: LJGHKOONHHG +// CmdId: 2005 +// Obf: ACMPPBHOFEN message TrialAvatarFirstPassDungeonNotify { - uint32 trial_avatar_index_id = 5; + uint32 trial_avatar_index_id = 7; } - diff --git a/proto/TrialAvatarGrantRecord.proto b/proto/TrialAvatarGrantRecord.proto index 7982c871..59b79574 100644 --- a/proto/TrialAvatarGrantRecord.proto +++ b/proto/TrialAvatarGrantRecord.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: GCFNFGACEOP message TrialAvatarGrantRecord { uint32 grant_reason = 1; uint32 from_parent_quest_id = 2; diff --git a/proto/TrialAvatarInfo.proto b/proto/TrialAvatarInfo.proto index ee56f7a2..c860af0c 100644 --- a/proto/TrialAvatarInfo.proto +++ b/proto/TrialAvatarInfo.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Item.proto"; import "TrialAvatarGrantRecord.proto"; +// Obf: LHKLGLMFEOF message TrialAvatarInfo { uint32 trial_avatar_id = 1; repeated Item trial_equip_list = 2; diff --git a/proto/TrifleItem.proto b/proto/TrifleItem.proto deleted file mode 100644 index e534dc02..00000000 --- a/proto/TrifleItem.proto +++ /dev/null @@ -1,19 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - - -import "Material.proto"; -import "Equip.proto"; -import "Furniture.proto"; - -message TrifleItem { - uint32 itemId = 1; - uint64 guid = 2; - oneof detail { - Material material = 5; - Equip equip = 6; - Furniture furniture = 7; - } -} diff --git a/proto/TriggerCreateGadgetToEquipPartNotify.proto b/proto/TriggerCreateGadgetToEquipPartNotify.proto index 996070fd..70ca77be 100644 --- a/proto/TriggerCreateGadgetToEquipPartNotify.proto +++ b/proto/TriggerCreateGadgetToEquipPartNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 342 +// Obf: IPLIBPLHDPF message TriggerCreateGadgetToEquipPartNotify { uint32 entity_id = 15; uint32 gadget_entity_id = 3; diff --git a/proto/TryEnterHomeReq.proto b/proto/TryEnterHomeReq.proto index f5753740..cd91eb9e 100644 --- a/proto/TryEnterHomeReq.proto +++ b/proto/TryEnterHomeReq.proto @@ -20,9 +20,10 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4565 +// Obf: DGPBLIIAEOL message TryEnterHomeReq { - bool LPBDGIDFAGD = 12; + bool is_transfer_to_safe_point = 12; uint32 target_point = 8; uint32 target_uid = 11; - bool GFPCLFLDKJF = 14; + bool GGBOCPDIIKL = 14; } diff --git a/proto/TryEnterHomeRsp.proto b/proto/TryEnterHomeRsp.proto index d526a298..e772272f 100644 --- a/proto/TryEnterHomeRsp.proto +++ b/proto/TryEnterHomeRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4762 +// Obf: KOMBHGLOIOI message TryEnterHomeRsp { uint32 target_uid = 11; repeated uint32 param_list = 6; diff --git a/proto/UgcActivityDetailInfo.proto b/proto/UgcActivityDetailInfo.proto new file mode 100644 index 00000000..e25913b7 --- /dev/null +++ b/proto/UgcActivityDetailInfo.proto @@ -0,0 +1,29 @@ +// 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 "OfficialCustomDungeon.proto"; +// Obf: ECPILCBJFEO +message UgcActivityDetailInfo { + uint32 custom_dungeon_group_id = 5; + bool FHPMJMNGPMO = 9; + repeated OfficialCustomDungeon official_custom_dungeon_list = 1; + bool EDIAHDMJHHF = 4; +} diff --git a/proto/UgcMusicBriefInfo.proto b/proto/UgcMusicBriefInfo.proto index 103cdb4a..59d2844d 100644 --- a/proto/UgcMusicBriefInfo.proto +++ b/proto/UgcMusicBriefInfo.proto @@ -1,30 +1,45 @@ +// 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"; -// Name: JFGLKLBDHBF +// Obf: OMNDDJHEJKO message UgcMusicBriefInfo { - bool OPKICKNECFH = 12; - uint32 IMLAOIECPAF = 7; - uint32 AEFAIFLGINI = 1145; - uint32 JLENMFBAPHN = 3; - bool is_psn_platform = 9; - uint32 version = 11; - bool PBOHPBBOLMA = 6; - bool FIMEFIBGPBM = 13; - uint64 import_from_ugc_guid = 14; - uint64 ugc_guid = 5; - uint32 LJLNNDMKBHD = 898; - repeated uint32 KEKFLIHPMDE = 1457; - uint32 CKGODIPLAEP = 10; - uint32 music_id = 15; - uint32 EFIMGDCDJEI = 1; - string creator_nickname = 4; - uint32 AEOJLGHLMBO = 602; - uint32 LNPANKACJKB = 2; - uint32 max_score = 8; - repeated uint32 HLBMBEECICD = 1858; - uint32 NMCPJCNAJFC = 1292; + uint32 KKJAPAIMHIC = 202; + bool PJGMJFMIEHC = 4; + uint64 import_from_ugc_guid = 7; + uint32 music_id = 15; + bool LNKPDCCGIAH = 5; + uint32 NAHIMHCLDPP = 1797; + uint32 BCGJBPBHCIH = 6; + uint32 KFHMNMKPDJG = 3; + bool is_psn_platform = 2; + uint32 INNALIGPKDP = 1022; + repeated uint32 EFPAABGJJNA = 283; + uint32 ENGPANOHIJF = 10; + uint32 CPKICNCAJJI = 11; + uint64 ugc_guid = 1; + bool BIMIGJFEMBK = 9; + uint32 version = 14; + uint32 GBEJELFJOCL = 8; + repeated uint32 BFKFFKFPHOJ = 1951; + uint32 max_score = 13; + string creator_nickname = 12; + uint32 GGINDIFEHBC = 587; } - diff --git a/proto/BNDMFMICDHI.proto b/proto/UgcMusicNote.proto similarity index 95% rename from proto/BNDMFMICDHI.proto rename to proto/UgcMusicNote.proto index c841b49b..cf1b3064 100644 --- a/proto/BNDMFMICDHI.proto +++ b/proto/UgcMusicNote.proto @@ -19,7 +19,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -message BNDMFMICDHI { +// Obf: BNDMFMICDHI +message UgcMusicNote { uint32 start_time = 4; uint32 end_time = 3; } diff --git a/proto/UgcMusicRecord.proto b/proto/UgcMusicRecord.proto new file mode 100644 index 00000000..1488beea --- /dev/null +++ b/proto/UgcMusicRecord.proto @@ -0,0 +1,27 @@ +// 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 "UgcMusicTrack.proto"; +// Obf: CFFGCLHLGPN +message UgcMusicRecord { + repeated UgcMusicTrack music_track_list = 3; + uint32 music_id = 14; +} diff --git a/proto/UgcMusicTrack.proto b/proto/UgcMusicTrack.proto new file mode 100644 index 00000000..98767134 --- /dev/null +++ b/proto/UgcMusicTrack.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "UgcMusicNote.proto"; +// Obf: EANCFIOAJDF +message UgcMusicTrack { + repeated UgcMusicNote music_note_list = 9; +} diff --git a/proto/UgcType.proto b/proto/UgcType.proto index ff2740e3..e64b8bc5 100644 --- a/proto/UgcType.proto +++ b/proto/UgcType.proto @@ -19,7 +19,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: KKNEGGLBKML enum UgcType { - UgcType_None = 0; - UgcType_MusicGame = 1; + UGC_TYPE_NONE = 0; + UGC_TYPE_MUSIC_GAME = 1; } diff --git a/proto/Uint32Pair.proto b/proto/Uint32Pair.proto index a8580a80..e2a2977d 100644 --- a/proto/Uint32Pair.proto +++ b/proto/Uint32Pair.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: MKMEPCLAACG message Uint32Pair { uint32 key = 1; uint32 value = 2; diff --git a/proto/UnionCmd.proto b/proto/UnionCmd.proto index 411c1988..e8ab126e 100644 --- a/proto/UnionCmd.proto +++ b/proto/UnionCmd.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: AIPCAGJJPKM message UnionCmd { uint32 message_id = 1; bytes body = 13; diff --git a/proto/UnionCmdNotify.proto b/proto/UnionCmdNotify.proto index c82d3c3f..68bb5dab 100644 --- a/proto/UnionCmdNotify.proto +++ b/proto/UnionCmdNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "UnionCmd.proto"; // CmdId: 16 +// Obf: DABEPBFAFLP message UnionCmdNotify { repeated UnionCmd cmd_list = 8; } diff --git a/proto/UnlockAvatarTalentReq.proto b/proto/UnlockAvatarTalentReq.proto index 56202b66..86caa8c7 100644 --- a/proto/UnlockAvatarTalentReq.proto +++ b/proto/UnlockAvatarTalentReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1075 +// Obf: DOFKMGNPCOO message UnlockAvatarTalentReq { uint64 avatar_guid = 9; uint32 talent_id = 7; diff --git a/proto/UnlockAvatarTalentRsp.proto b/proto/UnlockAvatarTalentRsp.proto index 2fcc62f8..b5ea5f78 100644 --- a/proto/UnlockAvatarTalentRsp.proto +++ b/proto/UnlockAvatarTalentRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 1096 +// Obf: MHPHLLEMCMH message UnlockAvatarTalentRsp { uint32 talent_id = 14; uint64 avatar_guid = 4; diff --git a/proto/UnlockNameCardNotify.proto b/proto/UnlockNameCardNotify.proto index 373de7c5..b7cb0e76 100644 --- a/proto/UnlockNameCardNotify.proto +++ b/proto/UnlockNameCardNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4043 +// Obf: GAEJLADHKBA message UnlockNameCardNotify { uint32 name_card_id = 3; } diff --git a/proto/UnlockPersonalLineReq.proto b/proto/UnlockPersonalLineReq.proto index 161941c4..a1ed2c84 100644 --- a/proto/UnlockPersonalLineReq.proto +++ b/proto/UnlockPersonalLineReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 493 +// Obf: LDPHCGEKALF message UnlockPersonalLineReq { uint32 personal_line_id = 5; } diff --git a/proto/UnlockPersonalLineRsp.proto b/proto/UnlockPersonalLineRsp.proto index ff9295aa..a4b4f737 100644 --- a/proto/UnlockPersonalLineRsp.proto +++ b/proto/UnlockPersonalLineRsp.proto @@ -20,11 +20,12 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 411 +// Obf: BEPAEGMNOLD message UnlockPersonalLineRsp { uint32 personal_line_id = 10; int32 retcode = 11; oneof param { - uint32 chapter_id = 3; - uint32 level = 7; + uint32 level = 3; + uint32 chapter_id = 7; } } diff --git a/proto/UnlockTransPointReq.proto b/proto/UnlockTransPointReq.proto index 85e47d4b..3abc5ee4 100644 --- a/proto/UnlockTransPointReq.proto +++ b/proto/UnlockTransPointReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 3230 +// Obf: PDOBCLEDKAB message UnlockTransPointReq { uint32 scene_id = 1; uint32 point_id = 9; diff --git a/proto/UnlockTransPointRsp.proto b/proto/UnlockTransPointRsp.proto index fc6b45b1..0fe18746 100644 --- a/proto/UnlockTransPointRsp.proto +++ b/proto/UnlockTransPointRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 3046 +// Obf: NCJAFFIJJMO message UnlockTransPointRsp { int32 retcode = 9; } diff --git a/proto/UnlockedFurnitureFormulaDataNotify.proto b/proto/UnlockedFurnitureFormulaDataNotify.proto index b1050a7a..2b51c111 100644 --- a/proto/UnlockedFurnitureFormulaDataNotify.proto +++ b/proto/UnlockedFurnitureFormulaDataNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4597 +// Obf: NGOCNIBJGOO message UnlockedFurnitureFormulaDataNotify { repeated uint32 furniture_id_list = 12; bool is_all = 8; diff --git a/proto/UnlockedFurnitureSuiteDataNotify.proto b/proto/UnlockedFurnitureSuiteDataNotify.proto index 5eac2e8c..b9324bb1 100644 --- a/proto/UnlockedFurnitureSuiteDataNotify.proto +++ b/proto/UnlockedFurnitureSuiteDataNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4622 +// Obf: EMJHJCPGCPI message UnlockedFurnitureSuiteDataNotify { repeated uint32 furniture_suite_id_list = 9; bool is_all = 1; diff --git a/proto/UpdateAbilityCreatedMovingPlatformNotify.proto b/proto/UpdateAbilityCreatedMovingPlatformNotify.proto index 7446050f..7376ae99 100644 --- a/proto/UpdateAbilityCreatedMovingPlatformNotify.proto +++ b/proto/UpdateAbilityCreatedMovingPlatformNotify.proto @@ -18,10 +18,17 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "OpType.proto"; // CmdId: 894 -message UpdateAbilityCreatedMovingPlatformNotify { +// Obf: BDLHLHEIKLM +message UpdateAbilityCreatedMovingPlatformNotify { + // Obf: GIGDLMCLDGC + enum OpType { + OP_TYPE_NONE = 0; + OP_TYPE_ACTIVATE = 1; + OP_TYPE_DEACTIVATE = 2; + } + OpType op_type = 1; uint32 entity_id = 13; } diff --git a/proto/UpdatePlayerShowAvatarListReq.proto b/proto/UpdatePlayerShowAvatarListReq.proto index 7fd020d7..138a83c6 100644 --- a/proto/UpdatePlayerShowAvatarListReq.proto +++ b/proto/UpdatePlayerShowAvatarListReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4053 +// Obf: IDGPDGMKBCL message UpdatePlayerShowAvatarListReq { bool is_show_avatar = 3; repeated uint32 show_avatar_id_list = 12; diff --git a/proto/UpdatePlayerShowAvatarListRsp.proto b/proto/UpdatePlayerShowAvatarListRsp.proto index db983571..d759b797 100644 --- a/proto/UpdatePlayerShowAvatarListRsp.proto +++ b/proto/UpdatePlayerShowAvatarListRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4056 +// Obf: HBEKAMKKEKB message UpdatePlayerShowAvatarListRsp { repeated uint32 show_avatar_id_list = 3; bool is_show_avatar = 13; diff --git a/proto/UpdatePlayerShowNameCardListReq.proto b/proto/UpdatePlayerShowNameCardListReq.proto index f7e5aa57..4a38bf6c 100644 --- a/proto/UpdatePlayerShowNameCardListReq.proto +++ b/proto/UpdatePlayerShowNameCardListReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4069 +// Obf: FPJKFKPKJOL message UpdatePlayerShowNameCardListReq { repeated uint32 show_name_card_id_list = 4; } diff --git a/proto/UpdatePlayerShowNameCardListRsp.proto b/proto/UpdatePlayerShowNameCardListRsp.proto index 2090c2ce..2a5cd6e3 100644 --- a/proto/UpdatePlayerShowNameCardListRsp.proto +++ b/proto/UpdatePlayerShowNameCardListRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4010 +// Obf: PGDCICEECHJ message UpdatePlayerShowNameCardListRsp { int32 retcode = 6; repeated uint32 show_name_card_id_list = 2; diff --git a/proto/UseItemReq.proto b/proto/UseItemReq.proto index 46a9b51b..7812c1f3 100644 --- a/proto/UseItemReq.proto +++ b/proto/UseItemReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 635 +// Obf: GNDGAEMNKPM message UseItemReq { uint32 count = 7; uint32 option_idx = 11; diff --git a/proto/UseItemRsp.proto b/proto/UseItemRsp.proto index af480b20..cc695209 100644 --- a/proto/UseItemRsp.proto +++ b/proto/UseItemRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 687 +// Obf: BNAMGPENBII message UseItemRsp { uint64 guid = 8; int32 retcode = 10; diff --git a/proto/Vector.proto b/proto/Vector.proto index ec2fb2c5..447af59f 100644 --- a/proto/Vector.proto +++ b/proto/Vector.proto @@ -1,12 +1,27 @@ +// 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"; -// Name: KKFEDHALJFH +// Obf: PBDDPMHLPJG message Vector { - float x = 1; - float y = 2; - float z = 3; + float x = 1; + float y = 2; + float z = 3; } - diff --git a/proto/Vector3Int.proto b/proto/Vector3Int.proto index 9892bbf4..520bab03 100644 --- a/proto/Vector3Int.proto +++ b/proto/Vector3Int.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: HIFDGGNOKNC message Vector3Int { int32 x = 1; int32 y = 2; diff --git a/proto/VectorPlane.proto b/proto/VectorPlane.proto index ef7818a1..da996b04 100644 --- a/proto/VectorPlane.proto +++ b/proto/VectorPlane.proto @@ -1,11 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Name: KCKOEEDAIMB +// Obf: DGAPKAKNFKK message VectorPlane { - float x = 1; - float y = 2; + float x = 1; + float y = 2; } - diff --git a/proto/VehicleInfo.proto b/proto/VehicleInfo.proto index 330372dd..d4b39bc2 100644 --- a/proto/VehicleInfo.proto +++ b/proto/VehicleInfo.proto @@ -1,13 +1,28 @@ +// 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"; - -// Name: AAIPFEKBIGD +// Obf: AIJLDNNMBEG message VehicleInfo { - repeated VehicleMember member_list = 1; - uint32 owner_uid = 2; - float cur_stamina = 3; + repeated VehicleMember member_list = 1; + uint32 owner_uid = 2; + float cur_stamina = 3; } - diff --git a/proto/VehicleInteractReq.proto b/proto/VehicleInteractReq.proto index 6b047519..cb50c6a5 100644 --- a/proto/VehicleInteractReq.proto +++ b/proto/VehicleInteractReq.proto @@ -21,8 +21,9 @@ option java_package = "emu.grasscutter.net.proto"; import "VehicleInteractType.proto"; // CmdId: 833 +// Obf: PJIEJOJGDBJ message VehicleInteractReq { - bool GDPMONPHEPH = 5; + bool NKHNKOHCCHJ = 5; uint32 entity_id = 9; VehicleInteractType interact_type = 2; uint32 pos = 14; diff --git a/proto/VehicleInteractRsp.proto b/proto/VehicleInteractRsp.proto index c7ca5399..4e86c18b 100644 --- a/proto/VehicleInteractRsp.proto +++ b/proto/VehicleInteractRsp.proto @@ -23,13 +23,14 @@ import "Vector.proto"; import "VehicleMember.proto"; import "VehicleInteractType.proto"; // CmdId: 824 +// Obf: BGCJBJNDCDB message VehicleInteractRsp { - Vector AMNIDPNNJLG = 14; + Vector KPLLINDPCBJ = 14; VehicleMember member = 3; uint32 entity_id = 9; - uint32 PHMCOINMOPH = 15; + uint32 IDLLLBLACAE = 15; VehicleInteractType interact_type = 7; int32 retcode = 11; uint32 gadget_id = 13; - Vector FLDHOMPALBK = 10; + Vector MBJJPEGEDME = 10; } diff --git a/proto/VehicleInteractType.proto b/proto/VehicleInteractType.proto index 4fe95302..3ff4c723 100644 --- a/proto/VehicleInteractType.proto +++ b/proto/VehicleInteractType.proto @@ -1,12 +1,27 @@ +// 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"; -// Name: PCBLIOLCMAE +// Obf: HPLKIGCFFBO enum VehicleInteractType { VEHICLE_INTERACT_TYPE_NONE = 0; VEHICLE_INTERACT_TYPE_IN = 1; VEHICLE_INTERACT_TYPE_OUT = 2; } - diff --git a/proto/VehicleLocationInfo.proto b/proto/VehicleLocationInfo.proto index 32b60a3c..a4220075 100644 --- a/proto/VehicleLocationInfo.proto +++ b/proto/VehicleLocationInfo.proto @@ -20,9 +20,10 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; +// Obf: CEKLMKGAAMM message VehicleLocationInfo { - float HPKGDHPIAMA = 10; - float GBJAFCNFHEB = 1; + float BPINFNMHLLL = 10; + float DCCJBGLMDOC = 1; repeated uint32 uid_list = 12; uint32 entity_id = 7; uint32 owner_uid = 9; diff --git a/proto/VehicleMember.proto b/proto/VehicleMember.proto index 174fa0d8..e0cad9c0 100644 --- a/proto/VehicleMember.proto +++ b/proto/VehicleMember.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: LJCCNICECIC message VehicleMember { uint32 uid = 1; uint64 avatar_guid = 2; diff --git a/proto/VehicleStaminaNotify.proto b/proto/VehicleStaminaNotify.proto index b7dd604b..fd36ba6b 100644 --- a/proto/VehicleStaminaNotify.proto +++ b/proto/VehicleStaminaNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 803 +// Obf: LHKKCADAMFD message VehicleStaminaNotify { uint32 entity_id = 15; float cur_stamina = 13; diff --git a/proto/VintageActivityDetailInfo.proto b/proto/VintageActivityDetailInfo.proto new file mode 100644 index 00000000..e6700e93 --- /dev/null +++ b/proto/VintageActivityDetailInfo.proto @@ -0,0 +1,35 @@ +// 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 "VintageBoothUsedItemData.proto"; +import "VintageMarketInfo.proto"; +import "VintageCampChallengeStageData.proto"; +import "VintagePresentStageData.proto"; +import "VintageHuntingStageData.proto"; +// Obf: APBBCFJOEOD +message VintageActivityDetailInfo { + bool is_content_closed = 1; + VintageBoothUsedItemData booth_data = 11; + VintageMarketInfo market_info = 3; + map camp_stage_map = 14; + map present_stage_map = 8; + map hunting_stage_map = 10; +} diff --git a/proto/VintageBoothUsedItemData.proto b/proto/VintageBoothUsedItemData.proto index 5b7d995f..f33be901 100644 --- a/proto/VintageBoothUsedItemData.proto +++ b/proto/VintageBoothUsedItemData.proto @@ -1,11 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Name: JEONPFEGIOJ +// Obf: LAPLEDLNMOP message VintageBoothUsedItemData { - bool is_open = 7; - uint32 gadget_id = 9; + bool is_open = 14; + uint32 gadget_id = 15; } - diff --git a/proto/VintageCampChallengeLevelData.proto b/proto/VintageCampChallengeLevelData.proto new file mode 100644 index 00000000..7b3486df --- /dev/null +++ b/proto/VintageCampChallengeLevelData.proto @@ -0,0 +1,28 @@ +// 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: MHCOINNJFDI +message VintageCampChallengeLevelData { + uint32 level_id = 1; + bool is_finish = 14; + bool is_open = 13; + uint32 stage_id = 9; +} diff --git a/proto/VintageCampChallengeStageData.proto b/proto/VintageCampChallengeStageData.proto new file mode 100644 index 00000000..c6e563f8 --- /dev/null +++ b/proto/VintageCampChallengeStageData.proto @@ -0,0 +1,31 @@ +// 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 "VintageCampChallengeLevelData.proto"; +// Obf: GIEMAGHCMDC +message VintageCampChallengeStageData { + bool is_finish = 4; + bool is_open = 10; + uint32 open_time = 12; + uint32 CAHPAJPMHIN = 11; + uint32 stage_id = 6; + map camp_level_map = 15; +} diff --git a/proto/PBAFNBPPAND.proto b/proto/VintageHuntingStageData.proto similarity index 84% rename from proto/PBAFNBPPAND.proto rename to proto/VintageHuntingStageData.proto index 19af1de7..f08e6d22 100644 --- a/proto/PBAFNBPPAND.proto +++ b/proto/VintageHuntingStageData.proto @@ -19,11 +19,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -message PBAFNBPPAND { - float JAMAEJNMGEF = 6; - float MOANDMEMOJP = 2; - float EJMAIJMBJJB = 14; - float EEAGNMPLFHH = 13; - uint32 EFGMPILEDDL = 5; - uint32 DEKNKFMJMCI = 8; +// Obf: DCHIFHIDHGD +message VintageHuntingStageData { + uint32 open_time = 15; + bool is_open = 11; + uint32 stage_id = 13; + uint32 EOEMEKGNKIM = 10; + bool is_finish = 9; } diff --git a/proto/VintageMarketDealInfo.proto b/proto/VintageMarketDealInfo.proto new file mode 100644 index 00000000..97b4f1c7 --- /dev/null +++ b/proto/VintageMarketDealInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "VintageMarketTraderInfo.proto"; +// Obf: CKOJLAKBAGH +message VintageMarketDealInfo { + map trader_item_info_map = 10; +} diff --git a/proto/VintageMarketDeliverItemReq.proto b/proto/VintageMarketDeliverItemReq.proto index a06e9153..0e9e25d1 100644 --- a/proto/VintageMarketDeliverItemReq.proto +++ b/proto/VintageMarketDeliverItemReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; // CmdId: 23543 +// Obf: MHMGHKMPJDE message VintageMarketDeliverItemReq { uint32 trader_id = 15; repeated ItemParam deliver_item_list = 10; diff --git a/proto/VintageMarketDeliverItemRsp.proto b/proto/VintageMarketDeliverItemRsp.proto index ad875b5e..26df26aa 100644 --- a/proto/VintageMarketDeliverItemRsp.proto +++ b/proto/VintageMarketDeliverItemRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 21476 +// Obf: GMGFPDFNNCP message VintageMarketDeliverItemRsp { int32 retcode = 15; uint32 trader_id = 2; diff --git a/proto/VintageMarketInfo.proto b/proto/VintageMarketInfo.proto new file mode 100644 index 00000000..8cbe8746 --- /dev/null +++ b/proto/VintageMarketInfo.proto @@ -0,0 +1,48 @@ +// 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 "VintageMarketDealInfo.proto"; +import "VintageMarketStoreInfo.proto"; +// Obf: PDENNFLJELI +message VintageMarketInfo { + map bargain_info_map = 11; + repeated uint32 MEEJFKENNMP = 13; + uint32 CLPNPHDFNBH = 6; + bool ALAECLHNADI = 10; + repeated uint32 BPOFBDLJFPK = 949; + bool LNEAMNHFFMO = 7; + repeated uint32 JABDNKAFNLP = 9; + uint32 FFOKDDBKLOA = 5; + bool IIPEEFDNMDK = 425; + repeated uint32 LBLKBOHLCOK = 12; + bool ODNMKMIFAOB = 8; + bool HBGKGPCPKKI = 4; + uint32 BKNOJOEHIMI = 142; + uint32 KNEDMCJKLNI = 1042; + repeated uint32 unlock_strategy_list = 1; + VintageMarketDealInfo deal_info = 14; + uint32 store_round = 2; + repeated VintageMarketStoreInfo open_store_list = 15; + bool OELIEEFPHHF = 1856; + bool OPEBDIBANJC = 1190; + bool OAFFFOFDCEH = 3; + uint32 CPJECBCDIAF = 162; +} diff --git a/proto/VintageMarketStoreInfo.proto b/proto/VintageMarketStoreInfo.proto new file mode 100644 index 00000000..7a50dd7a --- /dev/null +++ b/proto/VintageMarketStoreInfo.proto @@ -0,0 +1,29 @@ +// 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: INMJLAOJGFE +message VintageMarketStoreInfo { + repeated uint32 FHILDEANGEK = 3; + uint32 store_id = 8; + uint32 slot_count = 9; + repeated uint32 LHLCBBGOCNE = 13; + repeated uint32 strategy_list = 15; +} diff --git a/proto/VintageMarketTraderInfo.proto b/proto/VintageMarketTraderInfo.proto new file mode 100644 index 00000000..e9a7a14b --- /dev/null +++ b/proto/VintageMarketTraderInfo.proto @@ -0,0 +1,27 @@ +// 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"; +// Obf: CIOAOABLMOM +message VintageMarketTraderInfo { + uint32 trader_id = 8; + repeated ItemParam available_item_list = 12; +} diff --git a/proto/VintagePresentLevelData.proto b/proto/VintagePresentLevelData.proto new file mode 100644 index 00000000..4baf800e --- /dev/null +++ b/proto/VintagePresentLevelData.proto @@ -0,0 +1,28 @@ +// 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: AEGIBHGNMDO +message VintagePresentLevelData { + uint32 present_id = 6; + bool is_finish = 4; + uint32 stage_id = 5; + bool is_open = 13; +} diff --git a/proto/VintagePresentStageData.proto b/proto/VintagePresentStageData.proto new file mode 100644 index 00000000..857b2df0 --- /dev/null +++ b/proto/VintagePresentStageData.proto @@ -0,0 +1,30 @@ +// 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 "VintagePresentLevelData.proto"; +// Obf: GCJFMLKOFKM +message VintagePresentStageData { + bool is_open = 10; + uint32 stage_id = 4; + bool is_finish = 14; + uint32 open_time = 15; + map present_level_map = 3; +} diff --git a/proto/VisionType.proto b/proto/VisionType.proto index 38c267f7..9c342816 100644 --- a/proto/VisionType.proto +++ b/proto/VisionType.proto @@ -1,29 +1,44 @@ +// 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"; -// Name: KHKOLNIDAEP +// Obf: EKIAFPHGIBH enum VisionType { - VISION_TYPE_NONE = 0; - VISION_TYPE_MEET = 1; - VISION_TYPE_REBORN = 2; - VISION_TYPE_REPLACE = 3; - VISION_TYPE_WAYPOINT_REBORN = 4; - VISION_TYPE_MISS = 5; - VISION_TYPE_DIE = 6; - VISION_TYPE_GATHER_ESCAPE = 7; - VISION_TYPE_REFRESH = 8; - VISION_TYPE_TRANSPORT = 9; - VISION_TYPE_REPLACE_DIE = 10; - VISION_TYPE_REPLACE_NO_NOTIFY = 11; - VISION_TYPE_BORN = 12; - VISION_TYPE_PICKUP = 13; - VISION_TYPE_REMOVE = 14; - VISION_TYPE_CHANGE_COSTUME = 15; - VISION_TYPE_FISH_REFRESH = 16; - VISION_TYPE_FISH_BIG_SHOCK = 17; - VISION_TYPE_FISH_QTE_SUCC = 18; - VISION_TYPE_CAPTURE_DISAPPEAR = 19; + VISION_TYPE_NONE = 0; + VISION_TYPE_MEET = 1; + VISION_TYPE_REBORN = 2; + VISION_TYPE_REPLACE = 3; + VISION_TYPE_WAYPOINT_REBORN = 4; + VISION_TYPE_MISS = 5; + VISION_TYPE_DIE = 6; + VISION_TYPE_GATHER_ESCAPE = 7; + VISION_TYPE_REFRESH = 8; + VISION_TYPE_TRANSPORT = 9; + VISION_TYPE_REPLACE_DIE = 10; + VISION_TYPE_REPLACE_NO_NOTIFY = 11; + VISION_TYPE_BORN = 12; + VISION_TYPE_PICKUP = 13; + VISION_TYPE_REMOVE = 14; + VISION_TYPE_CHANGE_COSTUME = 15; + VISION_TYPE_FISH_REFRESH = 16; + VISION_TYPE_FISH_BIG_SHOCK = 17; + VISION_TYPE_FISH_QTE_SUCC = 18; + VISION_TYPE_CAPTURE_DISAPPEAR = 19; } - diff --git a/proto/WaterSpiritActivityDetailInfo.proto b/proto/WaterSpiritActivityDetailInfo.proto new file mode 100644 index 00000000..1cbb5494 --- /dev/null +++ b/proto/WaterSpiritActivityDetailInfo.proto @@ -0,0 +1,27 @@ +// 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: JHKGJMFENDI +message WaterSpiritActivityDetailInfo { + uint32 region_search_id = 7; + map search_time_map = 5; + uint32 mp_play_id = 13; +} diff --git a/proto/Weapon.proto b/proto/Weapon.proto index 2a54f525..097ebf42 100644 --- a/proto/Weapon.proto +++ b/proto/Weapon.proto @@ -1,13 +1,28 @@ +// 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"; -// Name: LKKKOFHDIBB +// Obf: ONOPOBPAHOE message Weapon { - uint32 level = 1; - uint32 exp = 2; - uint32 promote_level = 3; - map affix_map = 4; + uint32 level = 1; + uint32 exp = 2; + uint32 promote_level = 3; + map affix_map = 4; } - diff --git a/proto/WeaponAwakenReq.proto b/proto/WeaponAwakenReq.proto index 7665404d..a33d12ff 100644 --- a/proto/WeaponAwakenReq.proto +++ b/proto/WeaponAwakenReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 666 +// Obf: ODIJEFHHODN message WeaponAwakenReq { map affix_level_map = 11; uint64 item_guid = 2; diff --git a/proto/WeaponAwakenRsp.proto b/proto/WeaponAwakenRsp.proto index 0b916b6b..85cb45a2 100644 --- a/proto/WeaponAwakenRsp.proto +++ b/proto/WeaponAwakenRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 643 +// Obf: EBKEOGAFFJH message WeaponAwakenRsp { uint32 target_weapon_awaken_level = 3; map cur_affix_level_map = 6; diff --git a/proto/WeaponPromoteReq.proto b/proto/WeaponPromoteReq.proto index f12a60f4..47398ca7 100644 --- a/proto/WeaponPromoteReq.proto +++ b/proto/WeaponPromoteReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 606 +// Obf: APGGEFMJPLG message WeaponPromoteReq { uint64 target_weapon_guid = 10; } diff --git a/proto/WeaponPromoteRsp.proto b/proto/WeaponPromoteRsp.proto index cc5b912a..d7d126a1 100644 --- a/proto/WeaponPromoteRsp.proto +++ b/proto/WeaponPromoteRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 633 +// Obf: GBBFEEHGFJE message WeaponPromoteRsp { int32 retcode = 15; uint64 target_weapon_guid = 2; diff --git a/proto/WeaponUpgradeReq.proto b/proto/WeaponUpgradeReq.proto index 28883ac4..33dbde97 100644 --- a/proto/WeaponUpgradeReq.proto +++ b/proto/WeaponUpgradeReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; // CmdId: 688 +// Obf: PCCDPKOLOBP message WeaponUpgradeReq { uint64 target_weapon_guid = 10; repeated uint64 food_weapon_guid_list = 5; diff --git a/proto/WeaponUpgradeRsp.proto b/proto/WeaponUpgradeRsp.proto index 5492d7c7..35742499 100644 --- a/proto/WeaponUpgradeRsp.proto +++ b/proto/WeaponUpgradeRsp.proto @@ -21,10 +21,11 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; // CmdId: 668 +// Obf: GJGGNFCKMIB message WeaponUpgradeRsp { - uint32 cur_level = 2; + uint32 old_level = 2; uint64 target_weapon_guid = 4; - uint32 old_level = 15; + uint32 cur_level = 15; int32 retcode = 5; repeated ItemParam item_param_list = 14; } diff --git a/proto/WearEquipReq.proto b/proto/WearEquipReq.proto index 941ce637..ba196772 100644 --- a/proto/WearEquipReq.proto +++ b/proto/WearEquipReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 634 +// Obf: CHPMDCJOKNH message WearEquipReq { uint64 equip_guid = 9; uint64 avatar_guid = 1; diff --git a/proto/WearEquipRsp.proto b/proto/WearEquipRsp.proto index 832f9e28..40e2f36b 100644 --- a/proto/WearEquipRsp.proto +++ b/proto/WearEquipRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 694 +// Obf: FEFMCMNKCEN message WearEquipRsp { uint64 equip_guid = 2; int32 retcode = 10; diff --git a/proto/WeatherInfo.proto b/proto/WeatherInfo.proto index 70d3f290..5d0ea46a 100644 --- a/proto/WeatherInfo.proto +++ b/proto/WeatherInfo.proto @@ -1,10 +1,25 @@ +// 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"; -// Name: BPMBJDCDKEL +// Obf: BMHFKGLDMII message WeatherInfo { - uint32 weather_area_id = 1; + uint32 weather_area_id = 1; } - diff --git a/proto/WeatherWizardData.proto b/proto/WeatherWizardData.proto index a2b015a0..5b182379 100644 --- a/proto/WeatherWizardData.proto +++ b/proto/WeatherWizardData.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: DOMMBGFEDII message WeatherWizardData { uint32 shield_value = 5; } diff --git a/proto/WeekendDjinnInfo.proto b/proto/WeekendDjinnInfo.proto index 60667d68..df54cce8 100644 --- a/proto/WeekendDjinnInfo.proto +++ b/proto/WeekendDjinnInfo.proto @@ -1,12 +1,27 @@ +// 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"; - -// Name: NEPCBPPFILI +// Obf: ILCMJCOHIKF message WeekendDjinnInfo { - Vector rot = 15; - Vector pos = 6; + Vector rot = 14; + Vector pos = 13; } - diff --git a/proto/WeeklyBossResinDiscountInfo.proto b/proto/WeeklyBossResinDiscountInfo.proto index e1769558..cc7b0406 100644 --- a/proto/WeeklyBossResinDiscountInfo.proto +++ b/proto/WeeklyBossResinDiscountInfo.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: EJPHPKAJEJB message WeeklyBossResinDiscountInfo { uint32 discount_num = 1; uint32 discount_num_limit = 2; diff --git a/proto/WidgetCameraInfo.proto b/proto/WidgetCameraInfo.proto new file mode 100644 index 00000000..a5fe861d --- /dev/null +++ b/proto/WidgetCameraInfo.proto @@ -0,0 +1,25 @@ +// 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: CNJMNIJCIAA +message WidgetCameraInfo { + uint32 target_entity_id = 5; +} diff --git a/proto/WidgetCoolDownData.proto b/proto/WidgetCoolDownData.proto index f701aa5d..9b0c17bd 100644 --- a/proto/WidgetCoolDownData.proto +++ b/proto/WidgetCoolDownData.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: OFHAPFBPCJN message WidgetCoolDownData { bool is_success = 15; uint32 id = 10; diff --git a/proto/WidgetCoolDownNotify.proto b/proto/WidgetCoolDownNotify.proto index fd472e97..d59f16ff 100644 --- a/proto/WidgetCoolDownNotify.proto +++ b/proto/WidgetCoolDownNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "WidgetCoolDownData.proto"; // CmdId: 4298 +// Obf: APKIPCDAHLD message WidgetCoolDownNotify { repeated WidgetCoolDownData normal_cool_down_data_list = 5; repeated WidgetCoolDownData group_cool_down_data_list = 7; diff --git a/proto/WidgetCreateLocationInfo.proto b/proto/WidgetCreateLocationInfo.proto index 83b56684..755960e7 100644 --- a/proto/WidgetCreateLocationInfo.proto +++ b/proto/WidgetCreateLocationInfo.proto @@ -1,12 +1,27 @@ +// 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"; - -// Name: HPEAEINKHOM +// Obf: ODLCGPLCCDF message WidgetCreateLocationInfo { - Vector pos = 4; - Vector rot = 1; + Vector pos = 15; + Vector rot = 8; } - diff --git a/proto/WidgetCreatorInfo.proto b/proto/WidgetCreatorInfo.proto index d9416803..de618428 100644 --- a/proto/WidgetCreatorInfo.proto +++ b/proto/WidgetCreatorInfo.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "WidgetCreatorOpType.proto"; import "WidgetCreateLocationInfo.proto"; +// Obf: MGKIFECKMDL message WidgetCreatorInfo { WidgetCreatorOpType op_type = 13; WidgetCreateLocationInfo location_info = 8; diff --git a/proto/WidgetCreatorOpType.proto b/proto/WidgetCreatorOpType.proto index 26066b24..e2c6e1d3 100644 --- a/proto/WidgetCreatorOpType.proto +++ b/proto/WidgetCreatorOpType.proto @@ -1,12 +1,27 @@ +// 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"; -// Name: HFCKLPODICN +// Obf: LACENMJJAHB enum WidgetCreatorOpType { - WIDGET_CREATOR_TYPE_NONE = 0; - WIDGET_CREATOR_TYPE_RETRACT = 1; - WIDGET_CREATOR_TYPE_RETRACT_AND_CREATE = 2; + WIDGET_CREATOR_TYPE_NONE = 0; + WIDGET_CREATOR_TYPE_RETRACT = 1; + WIDGET_CREATOR_TYPE_RETRACT_AND_CREATE = 2; } - diff --git a/proto/WidgetDoBagReq.proto b/proto/WidgetDoBagReq.proto index 3e067cdb..f56ab036 100644 --- a/proto/WidgetDoBagReq.proto +++ b/proto/WidgetDoBagReq.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "WidgetCreateLocationInfo.proto"; import "WidgetCreatorInfo.proto"; // CmdId: 4295 +// Obf: JFBFFLAEENK message WidgetDoBagReq { uint32 material_id = 10; oneof op_info { diff --git a/proto/WidgetDoBagRsp.proto b/proto/WidgetDoBagRsp.proto index fcfd93fb..dbcbc16f 100644 --- a/proto/WidgetDoBagRsp.proto +++ b/proto/WidgetDoBagRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 4290 +// Obf: FEPEMHCMCOL message WidgetDoBagRsp { uint32 material_id = 7; int32 retcode = 5; diff --git a/proto/WidgetGadgetAllDataNotify.proto b/proto/WidgetGadgetAllDataNotify.proto index 7e09ff41..64d4af0c 100644 --- a/proto/WidgetGadgetAllDataNotify.proto +++ b/proto/WidgetGadgetAllDataNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "WidgetGadgetData.proto"; // CmdId: 4252 +// Obf: IJIBKCFOCNO message WidgetGadgetAllDataNotify { repeated WidgetGadgetData widget_gadget_data = 13; } diff --git a/proto/WidgetGadgetData.proto b/proto/WidgetGadgetData.proto index 3139ca36..9f0f08d7 100644 --- a/proto/WidgetGadgetData.proto +++ b/proto/WidgetGadgetData.proto @@ -19,6 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Obf: DMLGIAOKEMI message WidgetGadgetData { repeated uint32 gadget_entity_id_list = 14; uint32 gadget_id = 15; diff --git a/proto/WidgetGadgetDataNotify.proto b/proto/WidgetGadgetDataNotify.proto index 606b7044..d16fd1c7 100644 --- a/proto/WidgetGadgetDataNotify.proto +++ b/proto/WidgetGadgetDataNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "WidgetGadgetData.proto"; // CmdId: 4291 +// Obf: OBICHLEMPEG message WidgetGadgetDataNotify { WidgetGadgetData widget_gadget_data = 2; } diff --git a/proto/WidgetSlotChangeNotify.proto b/proto/WidgetSlotChangeNotify.proto index 7c4665bb..69ac5bc1 100644 --- a/proto/WidgetSlotChangeNotify.proto +++ b/proto/WidgetSlotChangeNotify.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "WidgetSlotOp.proto"; import "WidgetSlotData.proto"; // CmdId: 4296 +// Obf: KFDKDKMIEIE message WidgetSlotChangeNotify { WidgetSlotOp op = 11; WidgetSlotData slot = 12; diff --git a/proto/WidgetSlotData.proto b/proto/WidgetSlotData.proto index bc5910ea..f3f342c5 100644 --- a/proto/WidgetSlotData.proto +++ b/proto/WidgetSlotData.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; import "WidgetSlotTag.proto"; +// Obf: BEOHCOKHPFF message WidgetSlotData { WidgetSlotTag tag = 1; uint32 material_id = 15; diff --git a/proto/WidgetSlotOp.proto b/proto/WidgetSlotOp.proto index 8ac03424..73a7f6c0 100644 --- a/proto/WidgetSlotOp.proto +++ b/proto/WidgetSlotOp.proto @@ -1,11 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Name: GOHGODJALDD +// Obf: DAADDKFJJAH enum WidgetSlotOp { - WIDGET_SLOT_OP_ATTACH = 0; - WIDGET_SLOT_OP_DETACH = 1; + WIDGET_SLOT_OP_ATTACH = 0; + WIDGET_SLOT_OP_DETACH = 1; } - diff --git a/proto/WidgetSlotTag.proto b/proto/WidgetSlotTag.proto index f130e7e1..e3af07b0 100644 --- a/proto/WidgetSlotTag.proto +++ b/proto/WidgetSlotTag.proto @@ -1,11 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Name: PKGFJDKCLNB +// Obf: GMCPLJCPMGC enum WidgetSlotTag { WIDGET_SLOT_TAG_QUICK_USE = 0; WIDGET_SLOT_TAG_ATTACH_AVATAR = 1; } - diff --git a/proto/WindFieldDetailInfo.proto b/proto/WindFieldDetailInfo.proto new file mode 100644 index 00000000..5b099a8a --- /dev/null +++ b/proto/WindFieldDetailInfo.proto @@ -0,0 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + + +import "WindFieldStageInfo.proto"; +// Obf: FNGDIKANJCP +message WindFieldDetailInfo { + repeated WindFieldStageInfo stage_info_list = 11; +} diff --git a/proto/WindFieldDungeonFailReason.proto b/proto/WindFieldDungeonFailReason.proto new file mode 100644 index 00000000..6d56b268 --- /dev/null +++ b/proto/WindFieldDungeonFailReason.proto @@ -0,0 +1,29 @@ +// 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: LCLLFHFCPHG +enum WindFieldDungeonFailReason { + WIND_FIELD_DUNGEON_FAIL_NONE = 0; + WIND_FIELD_DUNGEON_FAIL_CANCEL = 1; + WIND_FIELD_DUNGEON_FAIL_TIMEOUT = 2; + WIND_FIELD_DUNGEON_FAIL_ALL_AVATAR_DIE = 3; + WIND_FIELD_DUNGEON_FAIL_LUA_INTERRUPT = 4; +} diff --git a/proto/WindFieldDungeonSettleInfo.proto b/proto/WindFieldDungeonSettleInfo.proto new file mode 100644 index 00000000..27612db8 --- /dev/null +++ b/proto/WindFieldDungeonSettleInfo.proto @@ -0,0 +1,28 @@ +// 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 "WindFieldDungeonFailReason.proto"; +// Obf: PPOLACNECHC +message WindFieldDungeonSettleInfo { + repeated uint32 DNPOFKIINPL = 4; + repeated uint32 EDDJEJMNLLC = 12; + WindFieldDungeonFailReason fail_reason = 5; +} diff --git a/proto/WindFieldStageInfo.proto b/proto/WindFieldStageInfo.proto new file mode 100644 index 00000000..9de8e68e --- /dev/null +++ b/proto/WindFieldStageInfo.proto @@ -0,0 +1,27 @@ +// 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: OHPBMALIMLN +message WindFieldStageInfo { + bool is_open = 12; + uint32 stage_id = 3; + uint32 open_time = 11; +} diff --git a/proto/WindSeedType1Notify.proto b/proto/WindSeedType1Notify.proto index 6e765d9f..221155ad 100644 --- a/proto/WindSeedType1Notify.proto +++ b/proto/WindSeedType1Notify.proto @@ -1,12 +1,27 @@ +// 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: 23435 -// Name: DKKHNGCHJHL +// CmdId: 23131 +// Obf: ELJDECFEHLJ message WindSeedType1Notify { - bytes payload = 12; - uint32 config_id = 7; + uint32 config_id = 11; + bytes payload = 2; } - diff --git a/proto/WinterCampAcceptAllGiveItemReq.proto b/proto/WinterCampAcceptAllGiveItemReq.proto index f687c524..f257638c 100644 --- a/proto/WinterCampAcceptAllGiveItemReq.proto +++ b/proto/WinterCampAcceptAllGiveItemReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 8002 +// Obf: PGDMGFMKDBM message WinterCampAcceptAllGiveItemReq { } diff --git a/proto/WinterCampAcceptAllGiveItemRsp.proto b/proto/WinterCampAcceptAllGiveItemRsp.proto index a97e433d..a14e842e 100644 --- a/proto/WinterCampAcceptAllGiveItemRsp.proto +++ b/proto/WinterCampAcceptAllGiveItemRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "WinterCampAcceptItemResultInfo.proto"; // CmdId: 8328 +// Obf: LPKOFENPJCK message WinterCampAcceptAllGiveItemRsp { repeated WinterCampAcceptItemResultInfo accept_item_result_info = 12; int32 retcode = 10; diff --git a/proto/WinterCampAcceptGiveItemReq.proto b/proto/WinterCampAcceptGiveItemReq.proto index 0c751dd1..e5e94147 100644 --- a/proto/WinterCampAcceptGiveItemReq.proto +++ b/proto/WinterCampAcceptGiveItemReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 8603 +// Obf: BKPNLGDHNAF message WinterCampAcceptGiveItemReq { uint32 uid = 12; } diff --git a/proto/WinterCampAcceptGiveItemRsp.proto b/proto/WinterCampAcceptGiveItemRsp.proto index 0fa2d40d..1342aa5d 100644 --- a/proto/WinterCampAcceptGiveItemRsp.proto +++ b/proto/WinterCampAcceptGiveItemRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "WinterCampAcceptItemResultInfo.proto"; // CmdId: 8718 +// Obf: OGPFPMJDDJE message WinterCampAcceptGiveItemRsp { int32 retcode = 2; WinterCampAcceptItemResultInfo accept_item_result_info = 10; diff --git a/proto/WinterCampAcceptItemResultInfo.proto b/proto/WinterCampAcceptItemResultInfo.proto index 847a0b9a..ab534a27 100644 --- a/proto/WinterCampAcceptItemResultInfo.proto +++ b/proto/WinterCampAcceptItemResultInfo.proto @@ -20,8 +20,9 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; +// Obf: LMFILKMHFDJ message WinterCampAcceptItemResultInfo { - repeated ItemParam JIBPNDLPCGH = 10; + repeated ItemParam MEMJEIJFBHN = 10; uint32 uid = 2; - repeated ItemParam DKAFEBPODKI = 6; + repeated ItemParam OOOIGNDHNNO = 6; } diff --git a/proto/WinterCampActivityDetailInfo.proto b/proto/WinterCampActivityDetailInfo.proto new file mode 100644 index 00000000..268760a1 --- /dev/null +++ b/proto/WinterCampActivityDetailInfo.proto @@ -0,0 +1,35 @@ +// 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 "WinterCampStageInfo.proto"; +import "ItemParam.proto"; +import "WinterCampRaceStageInfo.proto"; +// Obf: CPOACHLJDKL +message WinterCampActivityDetailInfo { + WinterCampStageInfo battle_info = 10; + repeated uint32 NIAGCOKBHAF = 13; + repeated uint32 LBHKJHGNONI = 11; + repeated ItemParam used_item_list = 14; + repeated WinterCampRaceStageInfo race_info_list = 2; + bool is_content_closed = 6; + WinterCampStageInfo explore_info = 1; + repeated uint32 ECMPMKDFEND = 8; +} diff --git a/proto/WinterCampGetCanGiveFriendItemReq.proto b/proto/WinterCampGetCanGiveFriendItemReq.proto index e81d130a..eaf93031 100644 --- a/proto/WinterCampGetCanGiveFriendItemReq.proto +++ b/proto/WinterCampGetCanGiveFriendItemReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 8598 +// Obf: BBPPOBIMPIC message WinterCampGetCanGiveFriendItemReq { } diff --git a/proto/WinterCampGetCanGiveFriendItemRsp.proto b/proto/WinterCampGetCanGiveFriendItemRsp.proto index 16ee87aa..5bc1c810 100644 --- a/proto/WinterCampGetCanGiveFriendItemRsp.proto +++ b/proto/WinterCampGetCanGiveFriendItemRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; // CmdId: 8470 +// Obf: HMJHEIFDELL message WinterCampGetCanGiveFriendItemRsp { repeated ItemParam item_list = 9; int32 retcode = 6; diff --git a/proto/WinterCampGetRecvItemListReq.proto b/proto/WinterCampGetRecvItemListReq.proto index 3388dbe4..4d78a53d 100644 --- a/proto/WinterCampGetRecvItemListReq.proto +++ b/proto/WinterCampGetRecvItemListReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 8339 +// Obf: JBADDDJFJIN message WinterCampGetRecvItemListReq { } diff --git a/proto/WinterCampGetRecvItemListRsp.proto b/proto/WinterCampGetRecvItemListRsp.proto index f10f1d37..d6354f42 100644 --- a/proto/WinterCampGetRecvItemListRsp.proto +++ b/proto/WinterCampGetRecvItemListRsp.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "WinterCampRecvItemData.proto"; // CmdId: 8882 +// Obf: OEAPHJPCFHA message WinterCampGetRecvItemListRsp { repeated WinterCampRecvItemData recv_item_data_list = 4; int32 retcode = 11; diff --git a/proto/WinterCampGiveFriendItemReq.proto b/proto/WinterCampGiveFriendItemReq.proto index 864c2824..bdf2721e 100644 --- a/proto/WinterCampGiveFriendItemReq.proto +++ b/proto/WinterCampGiveFriendItemReq.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; // CmdId: 8878 +// Obf: FPLLNAOJKDL message WinterCampGiveFriendItemReq { repeated ItemParam item_list = 5; uint32 uid = 14; diff --git a/proto/WinterCampGiveFriendItemRsp.proto b/proto/WinterCampGiveFriendItemRsp.proto index a2996b0f..373876c2 100644 --- a/proto/WinterCampGiveFriendItemRsp.proto +++ b/proto/WinterCampGiveFriendItemRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 8765 +// Obf: FJNPNJMCGJP message WinterCampGiveFriendItemRsp { int32 retcode = 7; repeated uint32 limit_item_id_list = 4; diff --git a/proto/WinterCampRaceStageInfo.proto b/proto/WinterCampRaceStageInfo.proto new file mode 100644 index 00000000..5e49681f --- /dev/null +++ b/proto/WinterCampRaceStageInfo.proto @@ -0,0 +1,29 @@ +// 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: EGJNNEHKJCO +message WinterCampRaceStageInfo { + Vector pos = 7; + uint32 open_time = 2; + uint32 max_score = 15; + uint32 id = 11; +} diff --git a/proto/WinterCampRecvItemData.proto b/proto/WinterCampRecvItemData.proto index 814d053a..b7198339 100644 --- a/proto/WinterCampRecvItemData.proto +++ b/proto/WinterCampRecvItemData.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "ProfilePicture.proto"; import "ItemParam.proto"; +// Obf: FGKLCIBICPE message WinterCampRecvItemData { string nickname = 7; ProfilePicture profile_picture = 5; diff --git a/proto/WinterCampRecvItemNotify.proto b/proto/WinterCampRecvItemNotify.proto index 5a43e4e4..e4d524cf 100644 --- a/proto/WinterCampRecvItemNotify.proto +++ b/proto/WinterCampRecvItemNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "WinterCampRecvItemData.proto"; // CmdId: 8284 +// Obf: LDFIBAJCHBO message WinterCampRecvItemNotify { WinterCampRecvItemData recv_item_data = 15; } diff --git a/proto/WinterCampStageInfo.proto b/proto/WinterCampStageInfo.proto new file mode 100644 index 00000000..6810e503 --- /dev/null +++ b/proto/WinterCampStageInfo.proto @@ -0,0 +1,31 @@ +// 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: IBAACKMBMDC +message WinterCampStageInfo { + uint32 open_time = 7; + Vector pos = 4; + uint32 id = 9; + bool is_finished = 2; + uint32 cur_progress = 14; + uint32 total_progress = 6; +} diff --git a/proto/WorktopInfo.proto b/proto/WorktopInfo.proto index eb375b70..be1d3dbf 100644 --- a/proto/WorktopInfo.proto +++ b/proto/WorktopInfo.proto @@ -1,11 +1,26 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Name: PLAEKPJCLFB +// Obf: LHPOPGLKKEE message WorktopInfo { - repeated uint32 option_list = 1; - bool is_guest_can_operate = 2; + repeated uint32 option_list = 1; + bool is_guest_can_operate = 2; } - diff --git a/proto/WorktopOptionNotify.proto b/proto/WorktopOptionNotify.proto index b34ace66..7dd28f4f 100644 --- a/proto/WorktopOptionNotify.proto +++ b/proto/WorktopOptionNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 872 +// Obf: DEJDCEGIBII message WorktopOptionNotify { uint32 gadget_entity_id = 4; repeated uint32 option_list = 11; diff --git a/proto/WorldChestOpenNotify.proto b/proto/WorldChestOpenNotify.proto index 9fc1a18c..0675b731 100644 --- a/proto/WorldChestOpenNotify.proto +++ b/proto/WorldChestOpenNotify.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 3098 +// Obf: GOCBFIPGBEC message WorldChestOpenNotify { uint32 group_id = 11; uint32 config_id = 6; diff --git a/proto/WorldDataNotify.proto b/proto/WorldDataNotify.proto index 6feeceb3..4ddd2d0c 100644 --- a/proto/WorldDataNotify.proto +++ b/proto/WorldDataNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "PropValue.proto"; // CmdId: 3465 +// Obf: GGEEDINMPLC message WorldDataNotify { map world_prop_map = 14; } diff --git a/proto/WorldOwnerBlossomBriefInfoNotify.proto b/proto/WorldOwnerBlossomBriefInfoNotify.proto index ee24bb04..0f7352f0 100644 --- a/proto/WorldOwnerBlossomBriefInfoNotify.proto +++ b/proto/WorldOwnerBlossomBriefInfoNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "BlossomBriefInfo.proto"; // CmdId: 2772 +// Obf: PHFHKCMBGOB message WorldOwnerBlossomBriefInfoNotify { repeated BlossomBriefInfo brief_info_list = 10; } diff --git a/proto/WorldOwnerDailyTaskNotify.proto b/proto/WorldOwnerDailyTaskNotify.proto index e27376c8..1f8200ca 100644 --- a/proto/WorldOwnerDailyTaskNotify.proto +++ b/proto/WorldOwnerDailyTaskNotify.proto @@ -21,8 +21,9 @@ option java_package = "emu.grasscutter.net.proto"; import "DailyTaskInfo.proto"; // CmdId: 169 +// Obf: MECIJHANDBI message WorldOwnerDailyTaskNotify { - uint32 filter_city_id = 5; - uint32 finished_daily_task_num = 6; + uint32 finished_daily_task_num = 5; + uint32 filter_city_id = 6; repeated DailyTaskInfo task_list = 15; } diff --git a/proto/WorldPlayerDieNotify.proto b/proto/WorldPlayerDieNotify.proto index cde6c781..62c2ae39 100644 --- a/proto/WorldPlayerDieNotify.proto +++ b/proto/WorldPlayerDieNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "PlayerDieType.proto"; // CmdId: 214 +// Obf: BNHIPBPNGMA message WorldPlayerDieNotify { PlayerDieType die_type = 14; uint32 murderer_entity_id = 9; diff --git a/proto/WorldPlayerInfoNotify.proto b/proto/WorldPlayerInfoNotify.proto index 2c387102..450d95b8 100644 --- a/proto/WorldPlayerInfoNotify.proto +++ b/proto/WorldPlayerInfoNotify.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "OnlinePlayerInfo.proto"; import "PlayerWidgetInfo.proto"; // CmdId: 3344 +// Obf: PAAJDHIIGDG message WorldPlayerInfoNotify { repeated OnlinePlayerInfo player_info_list = 11; repeated PlayerWidgetInfo player_widget_info_list = 1; diff --git a/proto/WorldPlayerLocationNotify.proto b/proto/WorldPlayerLocationNotify.proto index 09ebc5a0..081f224b 100644 --- a/proto/WorldPlayerLocationNotify.proto +++ b/proto/WorldPlayerLocationNotify.proto @@ -22,6 +22,7 @@ option java_package = "emu.grasscutter.net.proto"; import "PlayerWorldLocationInfo.proto"; import "PlayerLocationInfo.proto"; // CmdId: 256 +// Obf: CFNJLMJCOIP message WorldPlayerLocationNotify { repeated PlayerWorldLocationInfo player_world_loc_list = 7; repeated PlayerLocationInfo player_loc_list = 9; diff --git a/proto/WorldPlayerRTTNotify.proto b/proto/WorldPlayerRTTNotify.proto index 709a1e97..438aab40 100644 --- a/proto/WorldPlayerRTTNotify.proto +++ b/proto/WorldPlayerRTTNotify.proto @@ -21,6 +21,7 @@ option java_package = "emu.grasscutter.net.proto"; import "PlayerRTTInfo.proto"; // CmdId: 6 +// Obf: DBMMIAMOIGH message WorldPlayerRTTNotify { repeated PlayerRTTInfo player_rtt_list = 9; } diff --git a/proto/WorldPlayerReviveReq.proto b/proto/WorldPlayerReviveReq.proto index 3acc70eb..d2704776 100644 --- a/proto/WorldPlayerReviveReq.proto +++ b/proto/WorldPlayerReviveReq.proto @@ -20,5 +20,6 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 273 +// Obf: OBKKEOENCLB message WorldPlayerReviveReq { } diff --git a/proto/WorldPlayerReviveRsp.proto b/proto/WorldPlayerReviveRsp.proto index 2f63727d..6c963ee5 100644 --- a/proto/WorldPlayerReviveRsp.proto +++ b/proto/WorldPlayerReviveRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 204 +// Obf: COOLDGLJJKA message WorldPlayerReviveRsp { int32 retcode = 9; }