From 17243dfc53054f836971a04de80ec66093e45f21 Mon Sep 17 00:00:00 2001 From: Yuuki <6851027-yukiz@users.noreply.gitlab.com> Date: Wed, 28 Aug 2024 17:09:22 +0800 Subject: [PATCH] first try sync --- proto/AbilityIdentifier.proto | 18 +- proto/AbilityInvokeArgument.proto | 166 +++++++------ proto/AbilityInvokeEntry.proto | 32 +-- proto/AbilityInvokeEntryHead.proto | 23 +- proto/Achievement.proto | 27 +-- proto/AchievementAllDataNotify.proto | 14 +- proto/ActivityInfo.proto | 55 +++-- proto/ActivityInfoNotify.proto | 14 +- proto/ActivityPushTipsData.proto | 14 +- proto/ActivityPushTipsState.proto | 15 +- proto/ActivityScheduleInfo.proto | 19 +- proto/ActivityScheduleInfoNotify.proto | 16 +- proto/ActivityWatcherInfo.proto | 17 +- proto/AddQuestContentProgressReq.proto | 13 +- proto/AddQuestContentProgressRsp.proto | 11 +- proto/AiSkillCdInfo.proto | 11 +- proto/AnnounceData.proto | 28 +-- proto/AskAddFriendNotify.proto | 16 +- proto/AskAddFriendReq.proto | 13 +- proto/AttackHitEffectResult.proto | 18 +- proto/AttackResult.proto | 57 +++-- proto/AvatarChangeCostumeNotify.proto | 9 +- proto/AvatarChangeCostumeReq.proto | 11 +- proto/AvatarChangeCostumeRsp.proto | 13 +- proto/AvatarDataNotify.proto | 2 +- proto/AvatarDieAnimationEndReq.proto | 13 +- proto/AvatarDieAnimationEndRsp.proto | 13 +- proto/AvatarEnterSceneInfo.proto | 4 +- proto/AvatarEquipChangeNotify.proto | 19 +- proto/AvatarExpeditionDataNotify.proto | 29 +-- proto/AvatarExpeditionInfo.proto | 35 +-- proto/AvatarFetterDataNotify.proto | 11 +- proto/AvatarFlycloakChangeNotify.proto | 11 +- proto/AvatarGainCostumeNotify.proto | 14 +- proto/AvatarGainFlycloakNotify.proto | 14 +- proto/AvatarLifeStateChangeNotify.proto | 24 +- proto/AvatarPropNotify.proto | 11 +- proto/AvatarTeamAllDataNotify.proto | 2 +- proto/AvatarTeamUpdateNotify.proto | 2 +- proto/AvatarWearFlycloakReq.proto | 14 +- proto/AvatarWearFlycloakRsp.proto | 16 +- proto/BackMyWorldRsp.proto | 28 +-- proto/BattlePassAllDataNotify.proto | 20 +- proto/BattlePassCurScheduleUpdateNotify.proto | 16 +- proto/BattlePassCycle.proto | 13 +- proto/BattlePassMission.proto | 22 +- proto/BattlePassMissionUpdateNotify.proto | 11 +- proto/BattlePassProduct.proto | 13 +- proto/BattlePassRewardPlanOption.proto | 10 + proto/BattlePassRewardTag.proto | 15 +- proto/BattlePassSchedule.proto | 38 +-- proto/BattlePassUnlockStatus.proto | 5 +- proto/Birthday.proto | 12 +- proto/BlockInfo.proto | 6 +- proto/ChallengeBrief.proto | 17 +- proto/ChallengeDataNotify.proto | 16 +- proto/ChallengeFinishType.proto | 17 +- proto/ChangeAvatarReq.proto | 2 +- proto/ChangeAvatarRsp.proto | 2 +- proto/ChangeEnergyReason.proto | 9 +- proto/ChangeHpDebts.proto | 11 - proto/ChangeHpDebtsReason.proto | 13 + proto/ChangeHpReason.proto | 80 ++++--- proto/ChangeMailStarNotify.proto | 13 +- proto/ChapterState.proto | 32 +-- proto/ChapterStateNotify.proto | 49 +--- proto/ChatInfo.proto | 36 +-- proto/ChildQuest.proto | 12 +- proto/CityInfo.proto | 15 +- proto/ClientAbilityChangeNotify.proto | 14 +- proto/ClientAbilityInitFinishNotify.proto | 16 +- proto/CodexDataUpdateNotify.proto | 15 +- proto/CodexType.proto | 27 ++- proto/CombatInvocationsNotify.proto | 10 +- proto/CombatInvokeEntry.proto | 13 +- proto/CombatTypeArgument.proto | 9 +- proto/CreateVehicleReq.proto | 20 +- proto/CreateVehicleRsp.proto | 17 +- proto/CurVehicleInfo.proto | 4 +- proto/CustomDungeonFinishType.proto | 14 +- proto/CustomDungeonResultInfo.proto | 24 +- proto/CutSceneBeginNotify.proto | 17 +- proto/CutSceneExtraParam.proto | 11 +- proto/DailyDungeonEntryInfo.proto | 20 +- proto/DealAddFriendReq.proto | 15 +- proto/DealAddFriendResultType.proto | 22 +- proto/DealAddFriendRsp.proto | 17 +- proto/DelMailReq.proto | 12 +- proto/DelMailRsp.proto | 13 +- proto/DetailAbilityInfo.proto | 19 +- proto/DetailInfo.proto | 7 +- proto/DoGachaReq.proto | 20 +- proto/DoGachaRsp.proto | 51 ++-- proto/DoSetPlayerBornDataNotify.proto | 2 +- proto/DungeonChallengeBeginNotify.proto | 21 +- proto/DungeonChallengeFinishNotify.proto | 36 +-- proto/DungeonDieOptionReq.proto | 16 +- proto/DungeonEnterPosInfo.proto | 11 +- proto/DungeonEntryInfo.proto | 18 +- proto/DungeonEntryInfoReq.proto | 13 +- proto/DungeonEntryInfoRsp.proto | 19 +- proto/DungeonEntryPointInfo.proto | 14 +- proto/DungeonPlayerDieNotify.proto | 33 +-- proto/DungeonSettleNotify.proto | 32 +-- proto/EnterSceneDoneReq.proto | 2 +- proto/EnterSceneDoneRsp.proto | 2 +- proto/EnterScenePeerNotify.proto | 2 +- proto/EnterSceneReadyReq.proto | 2 +- proto/EnterSceneReadyRsp.proto | 2 +- proto/EnterType.proto | 30 +-- proto/EnterWorldAreaReq.proto | 16 +- proto/EnterWorldAreaRsp.proto | 18 +- proto/EntityClientExtraInfo.proto | 2 +- proto/EntityFightPropChangeReasonNotify.proto | 33 +-- proto/EntityFightPropUpdateNotify.proto | 16 +- proto/EquipParam.proto | 16 +- proto/EvtAiSyncSkillCdNotify.proto | 9 +- proto/EvtAvatarLockChairReq.proto | 15 +- proto/EvtAvatarLockChairRsp.proto | 19 +- proto/EvtAvatarStandUpNotify.proto | 18 +- proto/EvtBeingHitInfo.proto | 13 +- proto/EvtBulletHitNotify.proto | 32 +-- proto/EvtCreateGadgetNotify.proto | 56 ++--- proto/EvtDoSkillSuccNotify.proto | 15 +- proto/FinishedParentQuestNotify.proto | 9 +- proto/FinishedParentQuestUpdateNotify.proto | 9 +- proto/ForwardType.proto | 9 +- proto/FriendBrief.proto | 55 ++--- proto/FriendEnterHomeOption.proto | 10 +- proto/FriendOnlineState.proto | 6 +- ...FurnitureCurModuleArrangeCountNotify.proto | 29 +-- proto/FurnitureMakeReq.proto | 26 +- proto/GachaInfo.proto | 74 +++--- proto/GachaItem.proto | 20 +- proto/GachaTransferItem.proto | 14 +- proto/GachaUpInfo.proto | 13 +- proto/GadgetBornType.proto | 18 +- proto/GadgetInteractReq.proto | 21 +- proto/GadgetInteractRsp.proto | 21 +- proto/GadgetStateNotify.proto | 15 +- proto/GetActivityInfoReq.proto | 13 +- proto/GetActivityInfoRsp.proto | 18 +- proto/GetAllMailNotify.proto | 11 +- proto/GetAllMailResultNotify.proto | 21 +- proto/GetAllUnlockNameCardReq.proto | 10 +- proto/GetAllUnlockNameCardRsp.proto | 14 +- proto/GetDailyDungeonEntryInfoRsp.proto | 16 +- proto/GetFriendShowAvatarInfoReq.proto | 13 +- proto/GetFriendShowAvatarInfoRsp.proto | 33 +-- proto/GetFriendShowNameCardInfoRsp.proto | 17 +- ...GetFurnitureCurModuleArrangeCountReq.proto | 26 +- proto/GetGachaInfoReq.proto | 9 +- proto/GetGachaInfoRsp.proto | 24 +- proto/GetInvestigationMonsterRsp.proto | 15 +- proto/GetMailItemReq.proto | 11 +- proto/GetMailItemRsp.proto | 15 +- proto/GetMapAreaRsp.proto | 15 +- proto/GetOnlinePlayerListReq.proto | 10 +- proto/GetOnlinePlayerListRsp.proto | 16 +- proto/GetPlayerAskFriendListReq.proto | 11 +- proto/GetPlayerAskFriendListRsp.proto | 15 +- proto/GetPlayerBlacklistRsp.proto | 31 +-- proto/GetPlayerFriendListReq.proto | 9 +- proto/GetPlayerFriendListRsp.proto | 15 +- proto/GetPlayerHomeCompInfoReq.proto | 26 +- proto/GetPlayerSocialDetailReq.proto | 11 +- proto/GetPlayerSocialDetailRsp.proto | 13 +- proto/GetPlayerTokenReq.proto | 12 +- proto/GetPlayerTokenRsp.proto | 8 +- proto/GetProfilePictureDataReq.proto | 10 +- proto/GetProfilePictureDataRsp.proto | 14 +- proto/GetRegionSearchReq.proto | 26 +- proto/GetSceneAreaReq.proto | 14 +- proto/GetSceneAreaRsp.proto | 16 +- proto/GetScenePointReq.proto | 16 +- proto/GetScenePointRsp.proto | 37 +-- proto/GetShopReq.proto | 13 +- proto/GetShopRsp.proto | 15 +- proto/GetWidgetSlotReq.proto | 11 +- proto/GetWidgetSlotRsp.proto | 16 +- proto/HitColliderType.proto | 17 +- proto/HitCollision.proto | 19 +- proto/HitTreeNotify.proto | 17 +- proto/HomeAllUnlockedBgmIdListNotify.proto | 15 +- proto/HomeAnimalData.proto | 16 +- proto/HomeAvatarAllFinishRewardNotify.proto | 29 +-- proto/HomeAvatarCostumeChangeNotify.proto | 30 +-- proto/HomeAvatarRewardEventGetReq.proto | 30 +-- proto/HomeAvatarRewardEventGetRsp.proto | 33 +-- proto/HomeAvatarRewardEventInfo.proto | 34 +-- proto/HomeAvatarRewardEventNotify.proto | 33 +-- proto/HomeAvatarSummonAllEventNotify.proto | 29 +-- proto/HomeAvatarSummonEventInfo.proto | 36 +-- proto/HomeAvatarSummonEventReq.proto | 32 +-- proto/HomeAvatarTalkFinishInfo.proto | 13 +- proto/HomeAvatarTalkFinishInfoNotify.proto | 12 +- proto/HomeAvatarTalkRsp.proto | 14 +- proto/HomeBasicInfo.proto | 28 ++- proto/HomeBasicInfoNotify.proto | 13 +- proto/HomeBlockArrangementInfo.proto | 41 ++-- proto/HomeBlockDotPattern.proto | 15 +- proto/HomeBlockFieldData.proto | 22 +- proto/HomeBlockSubFieldData.proto | 14 +- proto/HomeChangeBgmNotify.proto | 14 +- proto/HomeChangeBgmReq.proto | 14 +- proto/HomeChangeEditModeReq.proto | 13 +- proto/HomeChangeEditModeRsp.proto | 15 +- proto/HomeChooseModuleReq.proto | 13 +- proto/HomeChooseModuleRsp.proto | 15 +- proto/HomeComfortInfoNotify.proto | 14 +- proto/HomeEnterEditModeFinishReq.proto | 26 +- proto/HomeEnterEditModeFinishRsp.proto | 28 +-- proto/HomeFurnitureCustomSuiteData.proto | 16 +- proto/HomeFurnitureData.proto | 19 +- proto/HomeFurnitureGroupData.proto | 14 +- proto/HomeFurnitureSuiteData.proto | 20 +- proto/HomeGetArrangementInfoReq.proto | 28 +-- proto/HomeGetArrangementInfoRsp.proto | 16 +- proto/HomeGetBasicInfoReq.proto | 26 +- proto/HomeLimitedShopInfo.proto | 21 +- proto/HomeMarkPointFurnitureData.proto | 22 +- proto/HomeMarkPointNPCData.proto | 12 +- proto/HomeMarkPointNotify.proto | 13 +- proto/HomeMarkPointSceneData.proto | 22 +- proto/HomeMarkPointSuiteData.proto | 10 +- proto/HomeModuleComfortInfo.proto | 15 +- proto/HomeModuleSeenReq.proto | 14 +- proto/HomeModuleSeenRsp.proto | 16 +- proto/HomeModuleUnlockNotify.proto | 13 +- proto/HomeNpcData.proto | 18 +- proto/HomePreChangeEditModeNotify.proto | 13 +- proto/HomeSceneArrangementInfo.proto | 41 ++-- proto/HomeSceneJumpReq.proto | 13 +- proto/HomeSceneJumpRsp.proto | 16 +- proto/HomeTransferReq.proto | 17 +- proto/HomeUpdateArrangementInfoReq.proto | 13 +- proto/HomeUpdateArrangementInfoRsp.proto | 28 +-- proto/HostPlayerNotify.proto | 2 +- proto/InferencePageInfo.proto | 10 +- proto/InferenceWordInfo.proto | 16 +- proto/InterOpType.proto | 9 +- proto/InteractType.proto | 9 +- proto/Investigation.proto | 17 +- proto/InvestigationMonster.proto | 53 ++--- proto/InvestigationTarget.proto | 19 +- proto/ItemAddHintNotify.proto | 24 +- proto/ItemHint.proto | 17 +- proto/LackingResourceInfo.proto | 24 +- proto/LifeStateChangeNotify.proto | 25 +- {unimplemented => proto}/LockState.proto | 0 proto/MailChangeNotify.proto | 13 +- proto/MailCollectState.proto | 4 +- proto/MailData.proto | 28 ++- proto/MailItem.proto | 10 +- proto/MailTextContent.proto | 14 +- proto/MainCoop.proto | 22 +- proto/MapAreaInfo.proto | 13 +- proto/MapLayerInfo.proto | 10 +- proto/MapMarkFromType.proto | 15 +- proto/MapMarkPoint.proto | 23 +- proto/MapMarkPointType.proto | 9 +- proto/MarkMapReq.proto | 22 +- proto/MarkMapRsp.proto | 11 +- proto/MissionStatus.proto | 11 + proto/MonsterBornType.proto | 10 +- proto/MotionState.proto | 222 +++++++++--------- proto/MovingPlatformType.proto | 12 +- proto/MpSettingType.proto | 6 +- proto/NeedBeginTime.proto | 9 + .../NeedPlayerLevel.proto | 0 proto/NpcTalkReq.proto | 13 +- proto/NpcTalkRsp.proto | 18 +- proto/ObstacleInfo.proto | 23 +- proto/ObstacleModifyNotify.proto | 21 +- proto/OnlinePlayerInfo.proto | 33 +-- proto/OpenStateChangeNotify.proto | 2 +- proto/OpenStateUpdateNotify.proto | 2 +- proto/OtherPlayerEnterHomeNotify.proto | 13 +- proto/ParamList.proto | 10 +- proto/ParentQuest.proto | 35 +-- proto/ParentQuestRandomInfo.proto | 12 +- proto/PathStatusType.proto | 5 +- proto/PathfindingEnterSceneReq.proto | 21 +- proto/PersonalLineAllDataReq.proto | 26 +- proto/PersonalSceneJumpReq.proto | 12 +- proto/PingReq.proto | 4 +- proto/PingRsp.proto | 2 +- proto/PlatformType.proto | 50 ++-- proto/PlayTeamEntityInfo.proto | 19 +- proto/PlayerApplyEnterMpNotify.proto | 13 +- proto/PlayerChatNotify.proto | 16 +- proto/PlayerChatReq.proto | 15 +- proto/PlayerDataNotify.proto | 2 +- proto/PlayerDieOption.proto | 17 +- proto/PlayerDieType.proto | 26 +- proto/PlayerEnterDungeonReq.proto | 16 +- proto/PlayerEnterDungeonRsp.proto | 15 +- proto/PlayerEnterSceneInfoNotify.proto | 2 +- proto/PlayerEnterSceneNotify.proto | 14 +- proto/PlayerGameTimeNotify.proto | 2 +- proto/PlayerHomeCompInfo.proto | 14 +- proto/PlayerHomeCompInfoNotify.proto | 11 +- proto/PlayerInvestigationAllInfoNotify.proto | 15 +- proto/PlayerInvestigationNotify.proto | 11 +- proto/PlayerInvestigationTargetNotify.proto | 11 +- proto/PlayerLocationInfo.proto | 14 +- proto/PlayerLoginReq.proto | 12 +- proto/PlayerLoginRsp.proto | 8 +- proto/PlayerPropChangeNotify.proto | 14 +- proto/PlayerPropChangeReasonNotify.proto | 16 +- proto/PlayerPropNotify.proto | 11 +- proto/PlayerQuitDungeonReq.proto | 13 +- proto/PlayerQuitFromHomeNotify.proto | 12 +- proto/PlayerSetPauseReq.proto | 9 +- proto/PlayerSetPauseRsp.proto | 9 +- proto/PlayerStoreNotify.proto | 2 +- proto/PlayerTimeNotify.proto | 13 +- proto/PlayerWidgetInfo.proto | 11 +- proto/PlayerWorldSceneInfo.proto | 17 +- proto/PlayerWorldSceneInfoListNotify.proto | 11 +- proto/PostEnterSceneReq.proto | 2 +- proto/PostEnterSceneRsp.proto | 2 +- proto/PotionDungeonResultInfo.proto | 18 +- proto/PrivateChatNotify.proto | 14 +- proto/PrivateChatReq.proto | 16 +- proto/ProfilePicture.proto | 15 +- proto/PropChangeReason.proto | 36 +-- proto/ProtEntityType.proto | 32 +-- proto/PullPrivateChatReq.proto | 16 +- proto/PullPrivateChatRsp.proto | 16 +- proto/PullRecentChatReq.proto | 14 +- proto/PullRecentChatRsp.proto | 16 +- proto/Quest.proto | 30 +-- proto/QuestDestroyNpcReq.proto | 11 +- proto/QuestDestroyNpcRsp.proto | 13 +- proto/QuestListNotify.proto | 9 +- proto/QuestListUpdateNotify.proto | 9 +- proto/QuestProgressUpdateNotify.proto | 13 +- proto/QuestTransmitRsp.proto | 13 +- proto/QuestUpdateQuestVarNotify.proto | 13 +- proto/ReadMailNotify.proto | 11 +- {unimplemented => proto}/Reason.proto | 0 {unimplemented => proto}/ResinCard.proto | 0 proto/ResinChangeNotify.proto | 32 +-- proto/ResinCostType.proto | 9 +- proto/Retcode.proto | 112 ++++----- proto/SceneAreaUnlockNotify.proto | 13 +- proto/SceneAreaWeatherNotify.proto | 21 +- proto/SceneAvatarInfo.proto | 2 +- proto/SceneEntityAiInfo.proto | 8 +- proto/SceneEntityAppearNotify.proto | 2 +- proto/SceneEntityDisappearNotify.proto | 2 +- proto/SceneEntityDrownRsp.proto | 15 +- proto/SceneForceLockNotify.proto | 2 +- proto/SceneForceUnlockNotify.proto | 2 +- proto/SceneInitFinishRsp.proto | 2 +- proto/ScenePlayerInfo.proto | 19 +- proto/ScenePlayerInfoNotify.proto | 11 +- proto/ScenePlayerLocationNotify.proto | 15 +- proto/ScenePointUnlockNotify.proto | 17 +- proto/SceneTeamAvatar.proto | 4 +- proto/SceneTeamUpdateNotify.proto | 2 +- proto/SceneTimeNotify.proto | 17 +- proto/SceneTransToPointReq.proto | 14 +- proto/SceneTransToPointRsp.proto | 17 +- proto/SelectWorktopOptionReq.proto | 14 +- proto/SelectWorktopOptionRsp.proto | 15 +- proto/ServantInfo.proto | 8 +- proto/ServerAnnounceNotify.proto | 13 +- proto/ServerBuffChangeNotify.proto | 20 +- proto/ServerGlobalValueChangeNotify.proto | 17 +- proto/ServerTimeNotify.proto | 2 +- proto/SetEntityClientDataNotify.proto | 13 +- proto/SetFriendEnterHomeOptionReq.proto | 14 +- proto/SetNameCardReq.proto | 12 +- proto/SetNameCardRsp.proto | 14 +- proto/SetOpenStateReq.proto | 16 +- proto/SetOpenStateRsp.proto | 18 +- proto/SetPlayerBirthdayReq.proto | 10 +- proto/SetPlayerBirthdayRsp.proto | 12 +- proto/SetPlayerBornDataReq.proto | 2 +- proto/SetPlayerBornDataRsp.proto | 2 +- proto/SetPlayerHeadImageReq.proto | 12 +- proto/SetPlayerHeadImageRsp.proto | 13 +- proto/SetPlayerNameReq.proto | 12 +- proto/SetPlayerNameRsp.proto | 14 +- proto/SetPlayerPropReq.proto | 13 +- proto/SetPlayerSignatureReq.proto | 12 +- proto/SetPlayerSignatureRsp.proto | 14 +- proto/SetUpAvatarTeamReq.proto | 2 +- proto/SetUpAvatarTeamRsp.proto | 2 +- proto/SetWidgetSlotReq.proto | 17 +- proto/SetWidgetSlotRsp.proto | 25 +- {unimplemented => proto}/ShapeType.proto | 0 proto/Shop.proto | 31 +-- proto/ShopCardProduct.proto | 33 ++- proto/ShopConcertProduct.proto | 22 +- proto/ShopGoods.proto | 54 ++--- proto/ShopMcoinProduct.proto | 22 +- proto/ShortAbilityHashPair.proto | 2 +- proto/ShowAvatarInfo.proto | 51 ++-- proto/ShowEquip.proto | 33 +-- proto/SocialDetail.proto | 68 +++--- proto/SocialShowAvatarInfo.proto | 16 +- proto/State.proto | 11 + proto/StoreItemChangeNotify.proto | 12 +- proto/StoreWeightLimitNotify.proto | 20 +- proto/StrengthenPointData.proto | 13 +- proto/SyncScenePlayTeamEntityNotify.proto | 13 +- proto/SyncTeamEntityNotify.proto | 13 +- proto/SystemHint.proto | 8 + proto/TakeBattlePassMissionPointRsp.proto | 13 +- proto/TeamEntityInfo.proto | 13 +- proto/ToTheMoonEnterSceneReq.proto | 15 +- proto/ToTheMoonQueryPathRsp.proto | 47 ++-- proto/TowerAllDataReq.proto | 11 +- proto/TowerLevelEndNotify.proto | 23 +- proto/TrialAvatarFirstPassDungeonNotify.proto | 13 +- proto/TryEnterHomeReq.proto | 19 +- proto/TryEnterHomeRsp.proto | 17 +- proto/Uint32Pair.proto | 11 +- proto/UnfreezeGroupLimitNotify.proto | 13 +- proto/UnionCmd.proto | 13 +- proto/UnionCmdNotify.proto | 14 +- proto/UpdatePlayerShowAvatarListReq.proto | 15 +- proto/UpdatePlayerShowAvatarListRsp.proto | 17 +- proto/UpdatePlayerShowNameCardListReq.proto | 12 +- proto/UpdatePlayerShowNameCardListRsp.proto | 14 +- proto/UseItemReq.proto | 20 +- proto/UseItemRsp.proto | 20 +- proto/Vector3Int.proto | 13 +- proto/VehicleInteractReq.proto | 20 +- proto/VehicleInteractRsp.proto | 26 +- proto/VehicleInteractType.proto | 30 +-- proto/VehicleLocationInfo.proto | 23 +- proto/VehicleStaminaNotify.proto | 30 +-- proto/WearEquipReq.proto | 14 +- proto/WearEquipRsp.proto | 16 +- proto/WeekendDjinnInfo.proto | 14 +- proto/WidgetCreateLocationInfo.proto | 15 +- proto/WidgetCreatorInfo.proto | 18 +- proto/WidgetCreatorOpType.proto | 15 +- proto/WidgetDoBagReq.proto | 18 +- proto/WidgetDoBagRsp.proto | 15 +- proto/WidgetGadgetAllDataNotify.proto | 14 +- proto/WidgetGadgetData.proto | 13 +- proto/WidgetGadgetDataNotify.proto | 14 +- proto/WidgetSlotChangeNotify.proto | 16 +- proto/WidgetSlotData.proto | 15 +- proto/WidgetSlotOp.proto | 13 +- proto/WindSeedType1Notify.proto | 11 +- proto/WorktopOptionNotify.proto | 15 +- proto/WorldDataNotify.proto | 11 +- proto/WorldPlayerDieNotify.proto | 21 +- proto/WorldPlayerReviveReq.proto | 26 +- proto/WorldPlayerReviveRsp.proto | 28 +-- 456 files changed, 4016 insertions(+), 4049 deletions(-) create mode 100644 proto/BattlePassRewardPlanOption.proto delete mode 100644 proto/ChangeHpDebts.proto create mode 100644 proto/ChangeHpDebtsReason.proto rename {unimplemented => proto}/LockState.proto (100%) create mode 100644 proto/MissionStatus.proto create mode 100644 proto/NeedBeginTime.proto rename {unimplemented => proto}/NeedPlayerLevel.proto (100%) rename {unimplemented => proto}/Reason.proto (100%) rename {unimplemented => proto}/ResinCard.proto (100%) rename {unimplemented => proto}/ShapeType.proto (100%) create mode 100644 proto/State.proto create mode 100644 proto/SystemHint.proto diff --git a/proto/AbilityIdentifier.proto b/proto/AbilityIdentifier.proto index 9daa909e..1fa7054a 100644 --- a/proto/AbilityIdentifier.proto +++ b/proto/AbilityIdentifier.proto @@ -1,13 +1,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 -// 4.7.0 -message AbilityIdentifier { - uint32 HDPFOJMGBJA = 5; - bool is_serverbuff_modifier = 6; - uint32 IPGHMJALPKC = 7; - int32 local_id = 10; - uint32 instanced_modifier_id = 14; - uint32 instanced_ability_id = 15; -} \ No newline at end of file +message AbilityIdentifier { + uint32 NKIEALGKIJD = 2; + uint32 instanced_modifier_id = 5; + uint32 instanced_ability_id = 9; + uint32 AJAEPNGNILD = 13; + bool is_serverbuff_modifier = 14; + int32 local_id = 15; +} \ No newline at end of file diff --git a/proto/AbilityInvokeArgument.proto b/proto/AbilityInvokeArgument.proto index 31374606..196d3711 100644 --- a/proto/AbilityInvokeArgument.proto +++ b/proto/AbilityInvokeArgument.proto @@ -1,81 +1,91 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + 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_META_TRIGGER_ARKHE_REACTION = 23; - 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_ACTION_LEVEL_BANK_ADD_STUFF = 67; - 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_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_RAYCAST_SELECT_TARGET = 126; - ABILITY_INVOKE_ARGUMENT_MIXIN_ENERGY_CRYSTAL_TARGET = 127; - ABILITY_INVOKE_ARGUMENT_MIXIN_ROTATION_FOLLOW_CAMERA = 128; - ABILITY_INVOKE_ARGUMENT_MIXIN_BUOYANT_FORCE = 129; - ABILITY_INVOKE_ARGUMENT_MIXIN_FILMFEST_BALL_GAME = 130; - ABILITY_INVOKE_ARGUMENT_MIXIN_CHECK_SCAN_ENTITY = 131; - ABILITY_INVOKE_ARGUMENT_MIXIN_TIME_TRACK_PLAYER = 133; -} \ No newline at end of file + 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_META_TRIGGER_ARKHE_REACTION = 23; + ABILITY_INVOKE_ARGUMENT_META_CHANGE_NYX_VALUE = 24; + 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_ACTION_LEVEL_BANK_ADD_STUFF = 67; + ABILITY_INVOKE_ARGUMENT_ACTION_GET_MATERIAL_PARAM_FLOAT = 68; + ABILITY_INVOKE_ARGUMENT_ACTION_GET_MATERIAL_PARAM_VECTOR = 69; + ABILITY_INVOKE_ARGUMENT_ACTION_SPECTACLE_BUILD_RECREATE_GADGET = 70; + 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_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_RAYCAST_SELECT_TARGET = 126; + ABILITY_INVOKE_ARGUMENT_MIXIN_ENERGY_CRYSTAL_TARGET = 127; + ABILITY_INVOKE_ARGUMENT_MIXIN_ROTATION_FOLLOW_CAMERA = 128; + ABILITY_INVOKE_ARGUMENT_MIXIN_BUOYANT_FORCE = 129; + ABILITY_INVOKE_ARGUMENT_MIXIN_FILMFEST_BALL_GAME = 130; + ABILITY_INVOKE_ARGUMENT_MIXIN_CHECK_SCAN_ENTITY = 131; + ABILITY_INVOKE_ARGUMENT_MIXIN_TIME_TRACK_PLAYER = 133; + ABILITY_INVOKE_ARGUMENT_MIXIN_PART_FOLLOW = 134; + ABILITY_INVOKE_ARGUMENT_MIXIN_CHANGE_PHLOGISTON = 135; + ABILITY_INVOKE_ARGUMENT_MIXIN_HUMAN_DRAGON_COLLAB_PICK_PHLOGISTON_BALL = 136; + ABILITY_INVOKE_ARGUMENT_MIXIN_FREQUENCY_SHIELD_BAR = 137; + ABILITY_INVOKE_ARGUMENT_MIXIN_VEHICLE_STEER_BY_CAMERA = 141; +} diff --git a/proto/AbilityInvokeEntry.proto b/proto/AbilityInvokeEntry.proto index 449cb74c..bb35efba 100644 --- a/proto/AbilityInvokeEntry.proto +++ b/proto/AbilityInvokeEntry.proto @@ -1,18 +1,20 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -import "AbilityInvokeEntryHead.proto"; -import "ForwardType.proto"; +// Version: 5.0 + import "AbilityInvokeArgument.proto"; -// 4.7.0 -// ? -message AbilityInvokeEntry { - uint32 event_id = 1; - uint32 forward_peer = 2; - bool is_ignore_auth = 4; - double total_tick_time = 7; - AbilityInvokeEntryHead head = 10; - uint32 entity_id = 11; - bytes ability_data = 12; - ForwardType forward_type = 13; - AbilityInvokeArgument argument_type = 15; -} \ No newline at end of file +import "ForwardType.proto"; +import "AbilityInvokeEntryHead.proto"; + +message AbilityInvokeEntry { + uint32 event_id = 2; + AbilityInvokeArgument argument_type = 3; + uint32 forward_peer = 4; + ForwardType forward_type = 7; + AbilityInvokeEntryHead head = 8; + bool is_ignore_auth = 9; + uint32 entity_id = 11; + double total_tick_time = 12; + bytes ability_data = 14; +} \ No newline at end of file diff --git a/proto/AbilityInvokeEntryHead.proto b/proto/AbilityInvokeEntryHead.proto index 1da3a61e..f7bf3c5b 100644 --- a/proto/AbilityInvokeEntryHead.proto +++ b/proto/AbilityInvokeEntryHead.proto @@ -1,13 +1,14 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message AbilityInvokeEntryHead { - uint32 target_id = 3; - uint32 instanced_modifier_id = 7; - uint32 instanced_ability_id = 8; - bool is_serverbuff_modifier = 9; - int32 modifier_config_local_id = 13; - uint32 server_buff_uid = 14; - int32 local_id = 15; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + +message AbilityInvokeEntryHead { + int32 local_id = 1; + uint32 server_buff_uid = 5; + int32 modifier_config_local_id = 6; + bool is_serverbuff_modifier = 7; + uint32 instanced_ability_id = 9; + uint32 target_id = 13; + uint32 instanced_modifier_id = 14; +} \ No newline at end of file diff --git a/proto/Achievement.proto b/proto/Achievement.proto index 54eeb4a5..40d3ed1a 100644 --- a/proto/Achievement.proto +++ b/proto/Achievement.proto @@ -1,19 +1,18 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 -// 4.7.0 -// FIHHOFLHLOC message Achievement { - enum Status { - STATUS_INVALID = 0; - STATUS_UNFINISHED = 1; - STATUS_FINISHED = 2; - STATUS_REWARD_TAKEN = 3; - } - - uint32 id = 14; - Status status = 8; - uint32 cur_progress = 15; - uint32 total_progress = 9; - uint32 finish_timestamp = 13; + enum Status { + STATUS_INVALID = 0; + STATUS_UNFINISHED = 1; + STATUS_FINISHED = 2; + STATUS_REWARD_TAKEN = 3; + } + uint32 cur_progress = 3; + uint32 total_progress = 4; + uint32 finish_timestamp = 8; + Status status = 9; + uint32 id = 15; } diff --git a/proto/AchievementAllDataNotify.proto b/proto/AchievementAllDataNotify.proto index 3d11e951..676e2cce 100644 --- a/proto/AchievementAllDataNotify.proto +++ b/proto/AchievementAllDataNotify.proto @@ -1,12 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 259 import "Achievement.proto"; -// 4.7.0 -// CmdId: 7450 -// CPJHPFLCICH -message AchievementAllDataNotify { - repeated uint32 reward_taken_goal_id_list = 12; - repeated Achievement achievement_list = 8; -} +message AchievementAllDataNotify { + repeated Achievement achievement_list = 8; + repeated uint32 reward_taken_goal_id_list = 15; +} \ No newline at end of file diff --git a/proto/ActivityInfo.proto b/proto/ActivityInfo.proto index a147ecff..ca831975 100644 --- a/proto/ActivityInfo.proto +++ b/proto/ActivityInfo.proto @@ -1,27 +1,42 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + import "ActivityWatcherInfo.proto"; import "ActivityPushTipsData.proto"; - import "MusicGameActivityDetailInfo.proto"; -// 4.7.0 -// Obf: ? -message ActivityInfo { - uint32 schedule_id = 2; // OK - uint32 activity_id = 11; // OK - uint32 activity_type = 5; // SUS - uint32 begin_time = 12; // OK - uint32 end_time = 6; // OK - bool is_finished = 9; // OK - repeated ActivityWatcherInfo watcher_info_list = 1; // OK - map activity_coin_map = 578; // sus or 800 - repeated uint32 meet_cond_list = 4; // sus 4,13.676,2020 - uint32 cur_score = 738; // OK - uint32 first_day_start_time = 1414; // sus - map wish_gift_num_map = 800; // sus - repeated ActivityPushTipsData activity_push_tips_data_list = 1223; // OK - oneof detail { - MusicGameActivityDetailInfo music_game_info = 780; // ? - } +message ActivityInfo { + repeated uint32 meet_cond_list = 1; // 11 + uint32 end_time = 4; + uint32 begin_time = 6; + bool is_finished = 7; + bool FALGLCJDKCL = 8; + repeated ActivityWatcherInfo watcher_info_list = 10; + repeated uint32 expire_cond_list = 11; // 1 + uint32 schedule_id = 12; + bool ONCLIGBKLPF = 13; + uint32 activity_type = 14; + uint32 activity_id = 15; + uint32 cur_score = 63; + uint32 FFGHMFNFPNL = 253; + uint32 first_day_start_time = 373; + uint32 LKODGHFICBH = 426; + bool CDBIIEIPBFF = 509; + bool LCHFFKHPJIO = 678; + bool ILKPGDKEIEG = 739; + repeated uint32 taken_reward_list = 818; + uint64 CIDDJFNIMPJ = 892; + repeated ActivityPushTipsData activity_push_tips_data_list = 983; + uint32 MPPFCLCENAP = 1040; + repeated uint64 GONEPFEDMEL = 1246; + repeated uint32 NJCGNGLKPBJ = 1267; + bool ODMJHPBFIKO = 1408; + map activity_coin_map = 1791; + //CFKJEDGPNAE OKBINABFBKP = 1839; + map wish_gift_num_map = 1954; + oneof detail { + MusicGameActivityDetailInfo music_game_info = 1099; + } } diff --git a/proto/ActivityInfoNotify.proto b/proto/ActivityInfoNotify.proto index e07a85b1..79ba1c77 100644 --- a/proto/ActivityInfoNotify.proto +++ b/proto/ActivityInfoNotify.proto @@ -1,9 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 29575 + import "ActivityInfo.proto"; -// 4.7.0 -// CmdId: 20264 -// Obf: EBMLNILFGGE -message ActivityInfoNotify { - ActivityInfo activity_info = 4; -} + +message ActivityInfoNotify { + ActivityInfo activity_info = 6; +} \ No newline at end of file diff --git a/proto/ActivityPushTipsData.proto b/proto/ActivityPushTipsData.proto index 4b9391a0..1d40a1d7 100644 --- a/proto/ActivityPushTipsData.proto +++ b/proto/ActivityPushTipsData.proto @@ -1,9 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + import "ActivityPushTipsState.proto"; -// Obf: NGGPLOGCGMF -// 4.7.0 -message ActivityPushTipsData { - uint32 activity_push_tips_id = 10; - ActivityPushTipsState state = 8; -} + +message ActivityPushTipsData { + ActivityPushTipsState state = 3; + uint32 activity_push_tips_id = 7; +} \ No newline at end of file diff --git a/proto/ActivityPushTipsState.proto b/proto/ActivityPushTipsState.proto index 1365186a..8621ccc8 100644 --- a/proto/ActivityPushTipsState.proto +++ b/proto/ActivityPushTipsState.proto @@ -1,9 +1,10 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// Obf: BJBGIBKCEEM -// 4.7.0 -enum ActivityPushTipsState { - ACTIVITY_PUSH_TIPS_STATE_NONE = 0; - ACTIVITY_PUSH_TIPS_STATE_START = 1; - ACTIVITY_PUSH_TIPS_STATE_READ = 2; -} +// Version: 5.0 + +enum ActivityPushTipsState { + ACTIVITY_PUSH_TIPS_STATE_NONE = 0; + ACTIVITY_PUSH_TIPS_STATE_START = 1; + ACTIVITY_PUSH_TIPS_STATE_READ = 2; +} \ No newline at end of file diff --git a/proto/ActivityScheduleInfo.proto b/proto/ActivityScheduleInfo.proto index ba6670c0..aa6fdb52 100644 --- a/proto/ActivityScheduleInfo.proto +++ b/proto/ActivityScheduleInfo.proto @@ -1,11 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// Obf: EHFDEDADODA -message ActivityScheduleInfo { - bool is_open = 3; - uint32 begin_time = 13; - uint32 end_time = 6; - uint32 schedule_id = 5; - uint32 activity_id = 14; -} +// Version: 5.0 + +message ActivityScheduleInfo { + uint32 begin_time = 6; + uint32 activity_id = 7; + bool is_open = 9; + uint32 end_time = 13; + uint32 schedule_id = 14; +} \ No newline at end of file diff --git a/proto/ActivityScheduleInfoNotify.proto b/proto/ActivityScheduleInfoNotify.proto index 02c88228..1f7de450 100644 --- a/proto/ActivityScheduleInfoNotify.proto +++ b/proto/ActivityScheduleInfoNotify.proto @@ -1,10 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 28401 + import "ActivityScheduleInfo.proto"; -// 4.7.0 -// CmdId: 29397 -// Obf: MGBFMLMPMCA -message ActivityScheduleInfoNotify { - repeated ActivityScheduleInfo activity_schedule_list = 2; - uint32 remain_fly_sea_lamp_num = 12; -} + +message ActivityScheduleInfoNotify { + uint32 remain_fly_sea_lamp_num = 1; + repeated ActivityScheduleInfo activity_schedule_list = 12; +} \ No newline at end of file diff --git a/proto/ActivityWatcherInfo.proto b/proto/ActivityWatcherInfo.proto index a6465061..ae903a68 100644 --- a/proto/ActivityWatcherInfo.proto +++ b/proto/ActivityWatcherInfo.proto @@ -1,10 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// Obf: IGECABELLEF -message ActivityWatcherInfo { - uint32 total_progress = 9; - uint32 watcher_id = 12; - bool is_taken_reward = 6; - uint32 cur_progress = 3; -} +// Version: 5.0 + +message ActivityWatcherInfo { + uint32 total_progress = 7; + uint32 cur_progress = 8; + bool is_taken_reward = 9; + uint32 watcher_id = 11; +} \ No newline at end of file diff --git a/proto/AddQuestContentProgressReq.proto b/proto/AddQuestContentProgressReq.proto index 0e8ff8b7..3895ce5f 100644 --- a/proto/AddQuestContentProgressReq.proto +++ b/proto/AddQuestContentProgressReq.proto @@ -1,10 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 20088 -// 4.7.0 -message AddQuestContentProgressReq { - uint32 add_progress = 2; - uint32 param = 4; - uint32 content_type = 9; -} \ No newline at end of file +message AddQuestContentProgressReq { + uint32 content_type = 7; + uint32 param = 11; + uint32 add_progress = 15; +} \ No newline at end of file diff --git a/proto/AddQuestContentProgressRsp.proto b/proto/AddQuestContentProgressRsp.proto index 2c1cbd83..d07f3985 100644 --- a/proto/AddQuestContentProgressRsp.proto +++ b/proto/AddQuestContentProgressRsp.proto @@ -1,9 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 22640 -// 4.7.0 -message AddQuestContentProgressRsp { - uint32 content_type = 7; - int32 retcode = 8; -} \ No newline at end of file +message AddQuestContentProgressRsp { + uint32 content_type = 12; + int32 retcode = 15; +} \ No newline at end of file diff --git a/proto/AiSkillCdInfo.proto b/proto/AiSkillCdInfo.proto index 76bdd219..155cf1ac 100644 --- a/proto/AiSkillCdInfo.proto +++ b/proto/AiSkillCdInfo.proto @@ -1,10 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 -// 4.7.0 -// EOBEHCHGHPF -message AiSkillCdInfo { - map skill_cd_map = 4; - map skill_group_cd_map = 14; -} \ No newline at end of file +message AiSkillCdInfo { + map skill_group_cd_map = 12; + map skill_cd_map = 14; +} \ No newline at end of file diff --git a/proto/AnnounceData.proto b/proto/AnnounceData.proto index fb104d3e..df5eaac6 100644 --- a/proto/AnnounceData.proto +++ b/proto/AnnounceData.proto @@ -1,16 +1,16 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// KNODJMAAMPD -message AnnounceData { - string center_system_text = 14; // we need this (2x13 wrong, 14x13 ok) - string count_down_text = 2; - string dungeon_confirm_text = 15; - uint32 end_time = 3; - uint32 count_down_frequency = 8; // ? - uint32 config_id = 7; - uint32 begin_time = 12; - bool is_center_system_last_5_every_minutes = 5; - uint32 center_system_frequency = 13; // ? -} +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + +message AnnounceData { + uint32 end_time = 1; + uint32 count_down_frequency = 3; + string dungeon_confirm_text = 6; + string count_down_text = 7; + uint32 center_system_frequency = 8; + bool is_center_system_last5_every_minutes = 10; + string center_system_text = 12; + uint32 begin_time = 13; + uint32 config_id = 14; +} \ No newline at end of file diff --git a/proto/AskAddFriendNotify.proto b/proto/AskAddFriendNotify.proto index d60ab301..12c4fcaf 100644 --- a/proto/AskAddFriendNotify.proto +++ b/proto/AskAddFriendNotify.proto @@ -1,10 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 5432 + import "FriendBrief.proto"; -// 4.7.0 -// CmdId: 27545?,147 -// Obf: GGACHDHALAE -message AskAddFriendNotify { - uint32 target_uid = 12; - FriendBrief target_friend_brief = 9; -} + +message AskAddFriendNotify { + FriendBrief target_friend_brief = 5; + uint32 target_uid = 14; +} \ No newline at end of file diff --git a/proto/AskAddFriendReq.proto b/proto/AskAddFriendReq.proto index 84cea6c9..ca6f65b1 100644 --- a/proto/AskAddFriendReq.proto +++ b/proto/AskAddFriendReq.proto @@ -1,8 +1,9 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 4872 -// Obf: BDGPNIDOEIB -message AskAddFriendReq { - uint32 target_uid = 11; -} +// Version: 5.0 +// CmdId: 23646 + +message AskAddFriendReq { + uint32 target_uid = 10; +} \ No newline at end of file diff --git a/proto/AttackHitEffectResult.proto b/proto/AttackHitEffectResult.proto index b1f6967d..7b4c718f 100644 --- a/proto/AttackHitEffectResult.proto +++ b/proto/AttackHitEffectResult.proto @@ -1,13 +1,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 -// 4.7.0 -message AttackHitEffectResult { - float ICKHFGPOHOB = 1; - float PJBNLHEDMKH = 2; - float HEMHBCPCDAP = 3; - uint32 AJFIGFGCMLO = 12; - float CEECMAJGHLC = 14; - uint32 MHOBBFJGOFL = 15; -} +message AttackHitEffectResult { + uint32 KIHHJKCGGCC = 3; + float HFHKMEOPFBI = 5; + uint32 ECBDDJLPPMK = 6; + float DADJPJBELMO = 8; + float HDJALIDKDPN = 10; + float CCLCOGCLHKO = 13; +} \ No newline at end of file diff --git a/proto/AttackResult.proto b/proto/AttackResult.proto index 5a334d2f..e6b759ea 100644 --- a/proto/AttackResult.proto +++ b/proto/AttackResult.proto @@ -1,30 +1,43 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 import "AbilityIdentifier.proto"; -import "AttackHitEffectResult.proto"; import "Vector.proto"; +import "AttackHitEffectResult.proto"; import "HitCollision.proto"; -// 4.7.0 -message AttackResult { - AbilityIdentifier ability_identifier = 12; - AttackHitEffectResult hit_eff_result = 3; - Vector resolved_dir = 10; - string anim_event_id = 1; - HitCollision hit_collision = 15; - int32 hit_retreat_angle_compat = 9; - uint32 attacker_id = 5; - uint32 defense_id = 6; - uint32 element_type = 11; - float damage = 8; - uint32 KLIGFACEFPN = 23; - float NMBBCBBEPDA = 54; - float DJAEOHKJLIM = 114; - uint32 OAPLECACBOM = 337; - uint32 FCKAKKLDCJL = 507; - uint32 HMKBBEKDPCG = 916; - float PHOMPNBJFAN = 1582; - uint32 NJAMJODILKJ = 2032; -} +message AttackResult { + uint32 attacker_id = 1; + float damage = 2; + int32 hit_retreat_angle_compat = 3; + uint32 defense_id = 5; + AbilityIdentifier ability_identifier = 6; + uint32 IICFMJEJOBO = 7; + bool is_crit = 8; + Vector resolved_dir = 9; + uint32 BAABHEHFAPH = 10; + uint32 element_type = 11; + AttackHitEffectResult hit_eff_result = 13; + string anim_event_id = 14; + HitCollision hit_collision = 15; + uint32 MPBEBAKODGF = 222; + uint32 EBLEIGGLHLG = 309; + float element_amplify_rate = 389; // 533 + float element_durability_attenuation = 533; // 389 + bool mute_element_hurt = 590; + uint32 MFLNDGPEJOE = 606; + float damage_shield = 779; + uint32 IFMINIBILFH = 823; + uint32 JKGEMBOBALF = 1349; + uint32 EKJHPCHCMLF = 1525; + uint32 POAFAPLMPEB = 1640; + bool use_gadget_damage_action = 1733; + uint32 ELIFILCNKFD = 1756; + float endure_delta = 1827; + uint32 FLPFBAFHGNN = 1842; + uint32 NMPEDJOPMMB = 1859; + bool is_resist_text = 1978; + uint32 GMNJEDPKNDE = 2023; +} \ No newline at end of file diff --git a/proto/AvatarChangeCostumeNotify.proto b/proto/AvatarChangeCostumeNotify.proto index 5afea66c..cbcf924c 100644 --- a/proto/AvatarChangeCostumeNotify.proto +++ b/proto/AvatarChangeCostumeNotify.proto @@ -1,10 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 5367 import "SceneEntityInfo.proto"; -// 4.7.0 -message AvatarChangeCostumeNotify { - SceneEntityInfo entity_info = 2; -} \ No newline at end of file +message AvatarChangeCostumeNotify { + SceneEntityInfo entity_info = 15; +} \ No newline at end of file diff --git a/proto/AvatarChangeCostumeReq.proto b/proto/AvatarChangeCostumeReq.proto index 06ce0185..d0758d38 100644 --- a/proto/AvatarChangeCostumeReq.proto +++ b/proto/AvatarChangeCostumeReq.proto @@ -1,9 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 28185 -// 4.7.0 -message AvatarChangeCostumeReq { - uint64 avatar_guid = 3; - uint32 costume_id = 7; -} \ No newline at end of file +message AvatarChangeCostumeReq { + uint32 costume_id = 13; + uint64 avatar_guid = 10; +} \ No newline at end of file diff --git a/proto/AvatarChangeCostumeRsp.proto b/proto/AvatarChangeCostumeRsp.proto index 3c3d4cda..4e6a5bbc 100644 --- a/proto/AvatarChangeCostumeRsp.proto +++ b/proto/AvatarChangeCostumeRsp.proto @@ -1,10 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 3408 -// 4.7.0 -message AvatarChangeCostumeRsp { - uint64 avatar_guid = 2; - int32 retcode = 11; - uint32 costume_id = 13; -} \ No newline at end of file +message AvatarChangeCostumeRsp { + uint64 avatar_guid = 4; + uint32 costume_id = 9; + int32 retcode = 15; +} \ No newline at end of file diff --git a/proto/AvatarDataNotify.proto b/proto/AvatarDataNotify.proto index 60f64ef1..0ad80e7b 100644 --- a/proto/AvatarDataNotify.proto +++ b/proto/AvatarDataNotify.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 23378 +// CmdId: 23378 import "AvatarInfo.proto"; import "AvatarTeam.proto"; diff --git a/proto/AvatarDieAnimationEndReq.proto b/proto/AvatarDieAnimationEndReq.proto index d03a1594..ab85e49e 100644 --- a/proto/AvatarDieAnimationEndReq.proto +++ b/proto/AvatarDieAnimationEndReq.proto @@ -1,12 +1,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 943 import "Vector.proto"; -// 4.7.0 -message AvatarDieAnimationEndReq { - uint64 die_guid = 1; - uint32 skill_id = 2; - Vector reborn_pos = 6; -} \ No newline at end of file +message AvatarDieAnimationEndReq { + Vector reborn_pos = 13; + uint64 die_guid = 12; + uint32 skill_id = 7; +} \ No newline at end of file diff --git a/proto/AvatarDieAnimationEndRsp.proto b/proto/AvatarDieAnimationEndRsp.proto index 464fe6c3..2c02d50e 100644 --- a/proto/AvatarDieAnimationEndRsp.proto +++ b/proto/AvatarDieAnimationEndRsp.proto @@ -1,10 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 20675 -// 4.7.0 -message AvatarDieAnimationEndRsp { - uint32 skill_id = 3; - int32 retcode = 12; - uint64 die_guid = 13; -} \ No newline at end of file +message AvatarDieAnimationEndRsp { + int32 retcode = 6; + uint64 die_guid = 11; + uint32 skill_id = 13; +} \ No newline at end of file diff --git a/proto/AvatarEnterSceneInfo.proto b/proto/AvatarEnterSceneInfo.proto index 4514c1ac..ce045be3 100644 --- a/proto/AvatarEnterSceneInfo.proto +++ b/proto/AvatarEnterSceneInfo.proto @@ -8,11 +8,11 @@ import "ServerBuff.proto"; message AvatarEnterSceneInfo { uint32 weapon_entity_id = 3; - AbilitySyncStateInfo avatar_ability_info = 4; + AbilitySyncStateInfo weapon_ability_info = 4; uint32 avatar_entity_id = 6; uint64 weapon_guid = 7; repeated ServerBuff server_buff_list = 8; - AbilitySyncStateInfo weapon_ability_info = 9; + AbilitySyncStateInfo avatar_ability_info = 9; repeated uint32 buff_id_list = 10; uint64 avatar_guid = 12; } \ No newline at end of file diff --git a/proto/AvatarEquipChangeNotify.proto b/proto/AvatarEquipChangeNotify.proto index 1c2b91f2..9c209b37 100644 --- a/proto/AvatarEquipChangeNotify.proto +++ b/proto/AvatarEquipChangeNotify.proto @@ -1,16 +1,17 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 6767 import "SceneWeaponInfo.proto"; import "SceneReliquaryInfo.proto"; -// 4.7.0 -message AvatarEquipChangeNotify { - uint32 equip_type = 1; - SceneWeaponInfo weapon = 2; - uint32 item_id = 9; - uint64 avatar_guid = 13; - uint64 equip_guid = 14; - SceneReliquaryInfo reliquary = 15; -} \ No newline at end of file +message AvatarEquipChangeNotify { + uint64 avatar_guid = 1; + SceneWeaponInfo weapon = 4; + uint64 equip_guid = 7; + uint32 equip_type = 10; + SceneReliquaryInfo reliquary = 11; + uint32 item_id = 12; +} \ No newline at end of file diff --git a/proto/AvatarExpeditionDataNotify.proto b/proto/AvatarExpeditionDataNotify.proto index 0f2b6790..3a50660d 100644 --- a/proto/AvatarExpeditionDataNotify.proto +++ b/proto/AvatarExpeditionDataNotify.proto @@ -1,24 +1,11 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 22907 + import "AvatarExpeditionInfo.proto"; -// CmdId: 26803 -// Obf: FCCLNDJAANA -message AvatarExpeditionDataNotify { - map expedition_info_map = 4; -} + +message AvatarExpeditionDataNotify { + map expedition_info_map = 3; +} \ No newline at end of file diff --git a/proto/AvatarExpeditionInfo.proto b/proto/AvatarExpeditionInfo.proto index 3ed1490e..35ab9bee 100644 --- a/proto/AvatarExpeditionInfo.proto +++ b/proto/AvatarExpeditionInfo.proto @@ -1,27 +1,14 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + import "AvatarExpeditionState.proto"; -// Obf: MBBNGLKDKFD -message AvatarExpeditionInfo { - AvatarExpeditionState state = 1; - uint32 exp_id = 2; - uint32 hour_time = 3; - uint32 start_time = 4; - float shorten_ratio = 5; -} + +message AvatarExpeditionInfo { + AvatarExpeditionState state = 1; + uint32 exp_id = 2; + uint32 hour_time = 3; + uint32 start_time = 4; + float shorten_ratio = 5; +} \ No newline at end of file diff --git a/proto/AvatarFetterDataNotify.proto b/proto/AvatarFetterDataNotify.proto index 73d9a265..d270ae0a 100644 --- a/proto/AvatarFetterDataNotify.proto +++ b/proto/AvatarFetterDataNotify.proto @@ -1,10 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 4274 import "AvatarFetterInfo.proto"; -// 4.6.0 -// CmdId: 28961 -message AvatarFetterDataNotify { - map fetter_info_map = 10; -} \ No newline at end of file +message AvatarFetterDataNotify { + map fetter_info_map = 12; +} \ No newline at end of file diff --git a/proto/AvatarFlycloakChangeNotify.proto b/proto/AvatarFlycloakChangeNotify.proto index 117c98a4..4944fd58 100644 --- a/proto/AvatarFlycloakChangeNotify.proto +++ b/proto/AvatarFlycloakChangeNotify.proto @@ -1,9 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 28644 -// 4.7.0 -message AvatarFlycloakChangeNotify { - uint32 flycloak_id = 7; - uint64 avatar_guid = 11; -} \ No newline at end of file +message AvatarFlycloakChangeNotify { + uint32 flycloak_id = 4; + uint64 avatar_guid = 10; +} \ No newline at end of file diff --git a/proto/AvatarGainCostumeNotify.proto b/proto/AvatarGainCostumeNotify.proto index 851f616c..43764d96 100644 --- a/proto/AvatarGainCostumeNotify.proto +++ b/proto/AvatarGainCostumeNotify.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 25586 -// KHNMMCJAOCB -message AvatarGainCostumeNotify { - uint32 costume_id = 1; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 25978 + +message AvatarGainCostumeNotify { + uint32 costume_id = 2; +} \ No newline at end of file diff --git a/proto/AvatarGainFlycloakNotify.proto b/proto/AvatarGainFlycloakNotify.proto index 03fc48d1..aebd6aee 100644 --- a/proto/AvatarGainFlycloakNotify.proto +++ b/proto/AvatarGainFlycloakNotify.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 2863 -// DCIIMGJNLPA -message AvatarGainFlycloakNotify { - uint32 flycloak_id = 7; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 6824 + +message AvatarGainFlycloakNotify { + uint32 flycloak_id = 13; +} \ No newline at end of file diff --git a/proto/AvatarLifeStateChangeNotify.proto b/proto/AvatarLifeStateChangeNotify.proto index 2475597e..a3e75fb6 100644 --- a/proto/AvatarLifeStateChangeNotify.proto +++ b/proto/AvatarLifeStateChangeNotify.proto @@ -1,17 +1,19 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 4653 -import "ServerBuff.proto"; import "PlayerDieType.proto"; +import "ServerBuff.proto"; -// 4.7.0 -message AvatarLifeStateChangeNotify { - repeated ServerBuff server_buff_list = 2; - PlayerDieType die_type = 3; - uint32 source_entity_id = 6; - string attack_tag = 7; - uint64 avatar_guid = 9; - uint32 move_reliable_seq = 10; - uint32 life_state = 15; -} \ No newline at end of file +message AvatarLifeStateChangeNotify { + uint32 source_entity_id = 2; + repeated string EPGOBHIEDOI = 3; + PlayerDieType die_type = 5; + uint64 avatar_guid = 9; + uint32 move_reliable_seq = 10; + uint32 life_state = 11; + repeated ServerBuff server_buff_list = 14; + string attack_tag = 15; +} \ No newline at end of file diff --git a/proto/AvatarPropNotify.proto b/proto/AvatarPropNotify.proto index d26251b0..db0e9b69 100644 --- a/proto/AvatarPropNotify.proto +++ b/proto/AvatarPropNotify.proto @@ -1,9 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 21114 -// 4.7.0 -message AvatarPropNotify { - map prop_map = 9; - uint64 avatar_guid = 12; -} \ No newline at end of file +message AvatarPropNotify { + uint64 avatar_guid = 6; + map prop_map = 8; +} \ No newline at end of file diff --git a/proto/AvatarTeamAllDataNotify.proto b/proto/AvatarTeamAllDataNotify.proto index 07d4c4e9..cbbb045f 100644 --- a/proto/AvatarTeamAllDataNotify.proto +++ b/proto/AvatarTeamAllDataNotify.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 22603 +// CmdId: 22603 import "AvatarTeam.proto"; diff --git a/proto/AvatarTeamUpdateNotify.proto b/proto/AvatarTeamUpdateNotify.proto index 5b896472..2d812863 100644 --- a/proto/AvatarTeamUpdateNotify.proto +++ b/proto/AvatarTeamUpdateNotify.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 28759 +// CmdId: 28759 import "AvatarTeam.proto"; diff --git a/proto/AvatarWearFlycloakReq.proto b/proto/AvatarWearFlycloakReq.proto index 5dee44cf..e06759f6 100644 --- a/proto/AvatarWearFlycloakReq.proto +++ b/proto/AvatarWearFlycloakReq.proto @@ -1,8 +1,10 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message AvatarWearFlycloakReq { - uint64 avatar_guid = 10; - uint32 flycloak_id = 12; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 243 + +message AvatarWearFlycloakReq { + uint64 avatar_guid = 4; + uint32 flycloak_id = 10; +} \ No newline at end of file diff --git a/proto/AvatarWearFlycloakRsp.proto b/proto/AvatarWearFlycloakRsp.proto index 41d83a81..1b0ddd9f 100644 --- a/proto/AvatarWearFlycloakRsp.proto +++ b/proto/AvatarWearFlycloakRsp.proto @@ -1,9 +1,11 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message AvatarWearFlycloakRsp { - uint32 flycloak_id = 3; - int32 retcode = 5; - uint64 avatar_guid = 9; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 27660 + +message AvatarWearFlycloakRsp { + uint64 avatar_guid = 8; + uint32 flycloak_id = 9; + int32 retcode = 13; +} \ No newline at end of file diff --git a/proto/BackMyWorldRsp.proto b/proto/BackMyWorldRsp.proto index fc20e5fc..aecfb32c 100644 --- a/proto/BackMyWorldRsp.proto +++ b/proto/BackMyWorldRsp.proto @@ -1,23 +1,9 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// CmdId: 25964 -// Obf: CLFDBEPFLAI -message BackMyWorldRsp { - int32 retcode = 9; -} +// Version: 5.0 +// CmdId: 23771 + +message BackMyWorldRsp { + int32 retcode = 3; +} \ No newline at end of file diff --git a/proto/BattlePassAllDataNotify.proto b/proto/BattlePassAllDataNotify.proto index 7392b84a..03889b16 100644 --- a/proto/BattlePassAllDataNotify.proto +++ b/proto/BattlePassAllDataNotify.proto @@ -1,15 +1,17 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 27624 -import "BattlePassMission.proto"; import "BattlePassSchedule.proto"; +import "BattlePassMission.proto"; -// CmdId: 2963 -// Version: 4.7.0 -// Obfs: ? -message BattlePassAllDataNotify { - bool have_cur_schedule = 4; - repeated BattlePassMission mission_list = 10; - BattlePassSchedule cur_schedule = 1; -} +message BattlePassAllDataNotify { + bool have_cur_schedule = 1; + BattlePassSchedule cur_schedule = 3; + bool HNDKICJJANM = 8; + bool is_viewed = 9; + repeated BattlePassMission mission_list = 12; + uint32 default_reward_type = 13; +} \ No newline at end of file diff --git a/proto/BattlePassCurScheduleUpdateNotify.proto b/proto/BattlePassCurScheduleUpdateNotify.proto index 2d7769e7..92bde1bb 100644 --- a/proto/BattlePassCurScheduleUpdateNotify.proto +++ b/proto/BattlePassCurScheduleUpdateNotify.proto @@ -1,13 +1,15 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 1819 import "BattlePassSchedule.proto"; -// CmdId: 23013 -// Version: 4.7.0 -// Obfs: ? -message BattlePassCurScheduleUpdateNotify { - bool have_cur_schedule = 3; - BattlePassSchedule cur_schedule = 12; -} +message BattlePassCurScheduleUpdateNotify { + uint32 default_reward_type = 2; + bool is_viewed = 3; + bool have_cur_schedule = 7; + bool HNDKICJJANM = 9; + BattlePassSchedule cur_schedule = 12; +} \ No newline at end of file diff --git a/proto/BattlePassCycle.proto b/proto/BattlePassCycle.proto index 3e0051ec..e3b3a520 100644 --- a/proto/BattlePassCycle.proto +++ b/proto/BattlePassCycle.proto @@ -1,11 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 -// Version: 4.7.0 -// Obfs: ? -message BattlePassCycle { - uint32 end_time = 6; - uint32 begin_time = 2; - uint32 cycle_idx = 15; -} +message BattlePassCycle { + uint32 begin_time = 1; + uint32 cycle_idx = 13; + uint32 end_time = 14; +} \ No newline at end of file diff --git a/proto/BattlePassMission.proto b/proto/BattlePassMission.proto index 83cc3ced..08f3038f 100644 --- a/proto/BattlePassMission.proto +++ b/proto/BattlePassMission.proto @@ -1,24 +1,20 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + -// Version: 4.7.0 -// Obfs: ? message BattlePassMission { - enum MissionStatus { + enum MissionStatus { MISSION_STATUS_INVALID = 0; MISSION_STATUS_UNFINISHED = 1; MISSION_STATUS_FINISHED = 2; MISSION_STATUS_POINT_TAKEN = 3; } - - uint32 cur_progress = 4; // OK - uint32 total_progress = 5; // OK - - // ONLY 1 COUNT - uint32 reward_battle_pass_point = 6; // why 8 - uint32 mission_type = 7; - uint32 mission_id = 14; - - MissionStatus mission_status = 2; // OK + uint32 reward_battle_pass_point = 7; + MissionStatus mission_status = 9; + uint32 cur_progress = 10; + uint32 total_progress = 13; + uint32 mission_id = 14; + uint32 mission_type = 15; } diff --git a/proto/BattlePassMissionUpdateNotify.proto b/proto/BattlePassMissionUpdateNotify.proto index 0c60e085..6c6da20f 100644 --- a/proto/BattlePassMissionUpdateNotify.proto +++ b/proto/BattlePassMissionUpdateNotify.proto @@ -1,12 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 3190 import "BattlePassMission.proto"; -// CmdId: 21651 -// Version: 4.7.0 -// Obfs: JJFBBHHGGMD -message BattlePassMissionUpdateNotify { - repeated BattlePassMission mission_list = 5; -} +message BattlePassMissionUpdateNotify { + repeated BattlePassMission mission_list = 11; +} \ No newline at end of file diff --git a/proto/BattlePassProduct.proto b/proto/BattlePassProduct.proto index 3dfb74ca..41dd2b99 100644 --- a/proto/BattlePassProduct.proto +++ b/proto/BattlePassProduct.proto @@ -1,11 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 -// Version: 4.7.0 -// Obfs: ? -message BattlePassProduct { - string normal_product_id = 12; - string upgrade_product_id = 3; - string extra_product_id = 9; -} +message BattlePassProduct { + string normal_product_id = 2; + string extra_product_id = 10; + string upgrade_product_id = 15; +} \ No newline at end of file diff --git a/proto/BattlePassRewardPlanOption.proto b/proto/BattlePassRewardPlanOption.proto new file mode 100644 index 00000000..f99aa30a --- /dev/null +++ b/proto/BattlePassRewardPlanOption.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + +message BattlePassRewardPlanOption { + bool OCACCJODDDO = 4; + uint32 default_reward_type = 6; + uint32 IOIHAODNIKF = 14; +} \ No newline at end of file diff --git a/proto/BattlePassRewardTag.proto b/proto/BattlePassRewardTag.proto index 63328e89..ac21c92c 100644 --- a/proto/BattlePassRewardTag.proto +++ b/proto/BattlePassRewardTag.proto @@ -1,14 +1,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 import "BattlePassUnlockStatus.proto"; -// Version: 4.7.0 -// Obfs: ? -message BattlePassRewardTag { - uint32 reward_id = 4; - BattlePassUnlockStatus unlock_status = 12; - uint32 level = 2; - uint32 JHANOGEFHHG = 14; -} +message BattlePassRewardTag { + uint32 DJCKCHACLME = 1; + BattlePassUnlockStatus unlock_status = 5; + uint32 level = 10; + uint32 reward_id = 11; +} \ No newline at end of file diff --git a/proto/BattlePassSchedule.proto b/proto/BattlePassSchedule.proto index 9348d942..545b3c1b 100644 --- a/proto/BattlePassSchedule.proto +++ b/proto/BattlePassSchedule.proto @@ -1,26 +1,28 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 import "BattlePassCycle.proto"; -import "BattlePassRewardTag.proto"; +import "BattlePassRewardPlanOption.proto"; import "BattlePassProduct.proto"; +import "BattlePassRewardTag.proto"; import "BattlePassUnlockStatus.proto"; -// Version: 4.7.0 -// Obfs: ? -message BattlePassSchedule { - BattlePassCycle cur_cycle = 6; - uint32 schedule_id = 15; - uint32 point = 3; // sus - BattlePassUnlockStatus unlock_status = 5; - repeated BattlePassRewardTag reward_taken_list = 2; - uint32 begin_time = 9; - uint32 paid_platform_flags = 7; // sus - uint32 cur_cycle_points = 8; // sus - BattlePassProduct product_info = 12; - uint32 end_time = 14; - uint32 level = 13; // sus - bool is_extra_paid_reward_taken = 11; // sus - bool is_viewed = 10; // sus -} +message BattlePassSchedule { + BattlePassCycle cur_cycle = 1; + repeated BattlePassRewardPlanOption reward_plan_option_list = 2; + BattlePassProduct product_info = 3; + bool LOPPMEONNEG = 4; + repeated BattlePassRewardTag reward_taken_list = 5; + uint32 cur_cycle_points = 6; + uint32 begin_time = 7; + bool is_extra_paid_reward_taken = 8; + uint32 end_time = 9; + uint32 point = 10; + uint32 paid_platform_flags = 11; + uint32 schedule_id = 12; + bool is_viewed = 13; + BattlePassUnlockStatus unlock_status = 14; + uint32 level = 15; +} \ No newline at end of file diff --git a/proto/BattlePassUnlockStatus.proto b/proto/BattlePassUnlockStatus.proto index c9e60d0b..c9c1bbae 100644 --- a/proto/BattlePassUnlockStatus.proto +++ b/proto/BattlePassUnlockStatus.proto @@ -1,11 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 -// Version: 4.6.0 -// Obfs: LKNMHOGNENB enum BattlePassUnlockStatus { - BATTLE_PASS_UNLOCK_STATUS_INVALID = 0; + 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 2c057b53..7cc39861 100644 --- a/proto/Birthday.proto +++ b/proto/Birthday.proto @@ -1,7 +1,9 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// Obf: PJENMAMNPEI -message Birthday { - uint32 month = 1; - uint32 day = 2; -} +// Version: 5.0 + +message Birthday { + uint32 month = 1; + uint32 day = 2; +} \ No newline at end of file diff --git a/proto/BlockInfo.proto b/proto/BlockInfo.proto index 4011dccb..425bc454 100644 --- a/proto/BlockInfo.proto +++ b/proto/BlockInfo.proto @@ -5,7 +5,7 @@ option java_package = "emu.grasscutter.net.proto"; message BlockInfo { uint32 block_id = 1; - uint32 data_version = 2; - bytes bin_data = 3; - bool is_dirty = 4; + uint32 GFKFJJOADMH = 2; + bytes NEHMEMLKIPP = 3; + bool GLAFBCFFAEG = 4; } \ No newline at end of file diff --git a/proto/ChallengeBrief.proto b/proto/ChallengeBrief.proto index 1791757a..dd489574 100644 --- a/proto/ChallengeBrief.proto +++ b/proto/ChallengeBrief.proto @@ -1,10 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// IHPNNDNPAAP -message ChallengeBrief { - bool is_success = 1; - uint32 cur_progress = 4; - uint32 challenge_index = 3; - uint32 challenge_id = 14; -} \ No newline at end of file +// Version: 5.0 + +message ChallengeBrief { + uint32 challenge_index = 1; + bool is_success = 8; + uint32 challenge_id = 9; + uint32 cur_progress = 12; +} \ No newline at end of file diff --git a/proto/ChallengeDataNotify.proto b/proto/ChallengeDataNotify.proto index a5207df4..139fb9cc 100644 --- a/proto/ChallengeDataNotify.proto +++ b/proto/ChallengeDataNotify.proto @@ -1,9 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 6967 -message ChallengeDataNotify { - uint32 challenge_index = 13; - uint32 value = 1; - uint32 param_index = 10; -} \ No newline at end of file +// Version: 5.0 +// CmdId: 25295 + +message ChallengeDataNotify { + uint32 value = 2; + uint32 param_index = 7; + uint32 challenge_index = 13; +} \ No newline at end of file diff --git a/proto/ChallengeFinishType.proto b/proto/ChallengeFinishType.proto index 30f94384..dbc1b824 100644 --- a/proto/ChallengeFinishType.proto +++ b/proto/ChallengeFinishType.proto @@ -1,10 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// DILEFMOGENI -enum ChallengeFinishType { - CHALLENGE_FINISH_TYPE_NONE = 0; - CHALLENGE_FINISH_TYPE_FAIL = 1; - CHALLENGE_FINISH_TYPE_SUCC = 2; - CHALLENGE_FINISH_TYPE_PAUSE = 3; -} \ No newline at end of file +// Version: 5.0 + +enum ChallengeFinishType { + ChallengeFinishType_NONE = 0; + ChallengeFinishType_FAIL = 1; + ChallengeFinishType_SUCC = 2; + ChallengeFinishType_PAUSE = 3; +} \ No newline at end of file diff --git a/proto/ChangeAvatarReq.proto b/proto/ChangeAvatarReq.proto index ba227c15..18a32641 100644 --- a/proto/ChangeAvatarReq.proto +++ b/proto/ChangeAvatarReq.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 3470 +// CmdId: 3470 import "Vector.proto"; diff --git a/proto/ChangeAvatarRsp.proto b/proto/ChangeAvatarRsp.proto index 1d8e48ff..ed873a1f 100644 --- a/proto/ChangeAvatarRsp.proto +++ b/proto/ChangeAvatarRsp.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 2046 +// CmdId: 2046 message ChangeAvatarRsp { int32 retcode = 3; diff --git a/proto/ChangeEnergyReason.proto b/proto/ChangeEnergyReason.proto index 3f7d00d3..3d599fb6 100644 --- a/proto/ChangeEnergyReason.proto +++ b/proto/ChangeEnergyReason.proto @@ -1,13 +1,14 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + enum ChangeEnergyReason { - CHANGE_ENERGY_REASON_NONE = 0; + CHANGE_ENERGY_REASON_NONE = 0; CHANGE_ENERGY_REASON_SKILL_START = 1; CHANGE_ENERGY_REASON_BALL = 2; CHANGE_ENERGY_REASON_QUEST = 3; CHANGE_ENERGY_REASON_ABILITY = 4; CHANGE_ENERGY_REASON_DIE = 5; CHANGE_ENERGY_REASON_SKILL_DEPOT = 6; -} \ No newline at end of file +} diff --git a/proto/ChangeHpDebts.proto b/proto/ChangeHpDebts.proto deleted file mode 100644 index 44cbf7a8..00000000 --- a/proto/ChangeHpDebts.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -enum ChangeHpDebts { - CHANGE_HP_DEBTS_NONE = 0; - CHANGE_HP_DEBTS_PAY = 1; - CHANGE_HP_DEBTS_PAY_FINISH = 2; - CHANGE_HP_DEBTS_CLEAR = 21; - CHANGE_HP_DEBTS_REDUCE_ABILITY = 41; - CHANGE_HP_DEBTS_ADD_ABILITY = 51; -} diff --git a/proto/ChangeHpDebtsReason.proto b/proto/ChangeHpDebtsReason.proto new file mode 100644 index 00000000..71e8644a --- /dev/null +++ b/proto/ChangeHpDebtsReason.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + +enum ChangeHpDebtsReason { + CHANGE_HP_DEBTS_NONE = 0; + CHANGE_HP_DEBTS_PAY = 1; + CHANGE_HP_DEBTS_PAY_FINISH = 2; + CHANGE_HP_DEBTS_CLEAR = 21; + CHANGE_HP_DEBTS_REDUCE_ABILITY = 41; + CHANGE_HP_DEBTS_ADD_ABILITY = 51; +} \ No newline at end of file diff --git a/proto/ChangeHpReason.proto b/proto/ChangeHpReason.proto index 154e9824..632d057a 100644 --- a/proto/ChangeHpReason.proto +++ b/proto/ChangeHpReason.proto @@ -1,41 +1,43 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -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_SUB_UGC = 21; - CHANGE_HP_REASON_SUB_DIRTY_WATER_EROSION = 22; - CHANGE_HP_REASON_SUB_DESTROY_SELF = 23; - 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_ROUGUELIKE_SPRING = 109; - CHANGE_HP_REASON_ADD_EFFIGY_CHALLENGE_V5 = 110; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + +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_SUB_UGC = 21; + CHANGE_HP_REASON_SUB_DIRTY_WATER_EROSION = 22; + CHANGE_HP_REASON_SUB_DESTROY_SELF = 23; + CHANGE_HP_REASON_SUB_LIQUID_PHLOGISTON = 24; + 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_ROUGUELIKE_SPRING = 109; + CHANGE_HP_REASON_ADD_EFFIGY_CHALLENGE_V5 = 110; +} \ No newline at end of file diff --git a/proto/ChangeMailStarNotify.proto b/proto/ChangeMailStarNotify.proto index a796b7c8..d2852344 100644 --- a/proto/ChangeMailStarNotify.proto +++ b/proto/ChangeMailStarNotify.proto @@ -1,11 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 29855 -// CmdId: 22223 -// Version: 4.7.0 -// Obfs: ? -message ChangeMailStarNotify { - bool is_star = 11; - repeated uint32 mail_id_list = 4; -} \ No newline at end of file +message ChangeMailStarNotify { + repeated uint32 mail_id_list = 14; + bool is_star = 9; +} \ No newline at end of file diff --git a/proto/ChapterState.proto b/proto/ChapterState.proto index a3aa42f0..686a87d3 100644 --- a/proto/ChapterState.proto +++ b/proto/ChapterState.proto @@ -1,25 +1,11 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// Obf: IGBMFOLFJLJ -enum ChapterState { - CHAPTER_STATE_INVALID = 0; - CHAPTER_STATE_UNABLE_TO_BEGIN = 1; - CHAPTER_STATE_BEGIN = 2; - CHAPTER_STATE_END = 3; -} +// Version: 5.0 + +enum ChapterState { + CHAPTER_STATE_INVALID = 0; + CHAPTER_STATE_UNABLE_TO_BEGIN = 1; + CHAPTER_STATE_BEGIN = 2; + CHAPTER_STATE_END = 3; +} \ No newline at end of file diff --git a/proto/ChapterStateNotify.proto b/proto/ChapterStateNotify.proto index d72bced6..c13af4f9 100644 --- a/proto/ChapterStateNotify.proto +++ b/proto/ChapterStateNotify.proto @@ -1,39 +1,16 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 25075 + import "ChapterState.proto"; -// CmdId: 21508 -// Obf: MCCCGABFHBK -message ChapterStateNotify { - // Obf: MOEEEKPMIAO - message NeedPlayerLevel { - bool is_limit = 1; - uint32 configNeedPlayerLevel = 11; - } - - // Obf: GEFDHMJCBLD - message NeedBeginTime { - uint32 configNeedBeginTime = 5; - bool is_limit = 1; - } - - NeedBeginTime need_begin_time = 10; - NeedPlayerLevel need_player_level = 3; - ChapterState chapter_state = 7; - uint32 chapter_id = 4; -} +import "NeedPlayerLevel.proto"; +import "NeedBeginTime.proto"; + +message ChapterStateNotify { + uint32 chapter_id = 1; + ChapterState chapter_state = 2; + NeedPlayerLevel need_player_level = 8; + NeedBeginTime need_begin_time = 11; +} \ No newline at end of file diff --git a/proto/ChatInfo.proto b/proto/ChatInfo.proto index 2175b64b..1cbdf631 100644 --- a/proto/ChatInfo.proto +++ b/proto/ChatInfo.proto @@ -1,24 +1,26 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + + message ChatInfo { - message SystemHint { - uint32 type = 7; - } - enum SystemHintType { + enum SystemHintType { SYSTEM_HINT_TYPE_CHAT_NONE = 0; SYSTEM_HINT_TYPE_CHAT_ENTER_WORLD = 1; SYSTEM_HINT_TYPE_CHAT_LEAVE_WORLD = 2; } - uint32 time = 9; - uint32 to_uid = 8; - bool is_read = 12; - uint32 uid = 5; - uint32 sequence = 4; - oneof content { - string text = 1751; - uint32 icon = 1792; - SystemHint system_hint = 370; - } -} + message SystemHint { + uint32 type = 7; + } + bool is_read = 4; + uint32 time = 8; + uint32 to_uid = 5; + uint32 sequence = 7; + uint32 uid = 10; + oneof content { + uint32 icon = 21; + string text = 357; + SystemHint system_hint = 922; + } +} \ No newline at end of file diff --git a/proto/ChildQuest.proto b/proto/ChildQuest.proto index 19880b10..21cc04a0 100644 --- a/proto/ChildQuest.proto +++ b/proto/ChildQuest.proto @@ -1,10 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 -// 4.7.0 -message ChildQuest { - uint32 quest_config_id = 12; - uint32 quest_id = 11; - uint32 state = 4; -} \ No newline at end of file +message ChildQuest { + uint32 quest_config_id = 2; + uint32 quest_id = 11; + uint32 state = 14; +} \ No newline at end of file diff --git a/proto/CityInfo.proto b/proto/CityInfo.proto index c174bded..d4b6c5e9 100644 --- a/proto/CityInfo.proto +++ b/proto/CityInfo.proto @@ -1,9 +1,10 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message CityInfo { - uint32 level = 2; - uint32 city_id = 3; - uint32 crystal_num = 15; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + +message CityInfo { + uint32 crystal_num = 2; + uint32 city_id = 12; + uint32 level = 15; +} \ No newline at end of file diff --git a/proto/ClientAbilityChangeNotify.proto b/proto/ClientAbilityChangeNotify.proto index 62887d4f..2745d6ae 100644 --- a/proto/ClientAbilityChangeNotify.proto +++ b/proto/ClientAbilityChangeNotify.proto @@ -1,11 +1,13 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 27339 import "AbilityInvokeEntry.proto"; -// 4.7.0 ?? -message ClientAbilityChangeNotify { - bool is_init_hash = 5; - repeated AbilityInvokeEntry invokes = 6; - uint32 entity_id = 12; -} +message ClientAbilityChangeNotify { + uint32 entity_id = 1; + repeated AbilityInvokeEntry invokes = 3; + bool is_init_hash = 4; +} \ No newline at end of file diff --git a/proto/ClientAbilityInitFinishNotify.proto b/proto/ClientAbilityInitFinishNotify.proto index f0ff40c2..99e9e55d 100644 --- a/proto/ClientAbilityInitFinishNotify.proto +++ b/proto/ClientAbilityInitFinishNotify.proto @@ -1,10 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 28413 + import "AbilityInvokeEntry.proto"; -// 4.7.0 -// CmdId: 4679 -// ? -message ClientAbilityInitFinishNotify { - repeated AbilityInvokeEntry invokes = 11; - uint32 entity_id = 14; -} + +message ClientAbilityInitFinishNotify { + uint32 entity_id = 4; + repeated AbilityInvokeEntry invokes = 6; +} \ No newline at end of file diff --git a/proto/CodexDataUpdateNotify.proto b/proto/CodexDataUpdateNotify.proto index 4bf10e6f..a9a3d423 100644 --- a/proto/CodexDataUpdateNotify.proto +++ b/proto/CodexDataUpdateNotify.proto @@ -1,14 +1,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 27330 import "CodexType.proto"; -// CmdId: 26679 -// Version: 4.7.0 -// Obfs: BPLMKLJIGAL -message CodexDataUpdateNotify { - uint32 weapon_max_promote_level = 14; - uint32 id = 9; - CodexType type = 4; -} +message CodexDataUpdateNotify { + uint32 id = 1; + CodexType type = 2; + uint32 weapon_max_promote_level = 14; +} \ No newline at end of file diff --git a/proto/CodexType.proto b/proto/CodexType.proto index dede5b70..9e980ebc 100644 --- a/proto/CodexType.proto +++ b/proto/CodexType.proto @@ -1,15 +1,16 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.6.0 -enum CodexType { - 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; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + +enum CodexType { + 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; +} \ No newline at end of file diff --git a/proto/CombatInvocationsNotify.proto b/proto/CombatInvocationsNotify.proto index cca77f0b..99d560bf 100644 --- a/proto/CombatInvocationsNotify.proto +++ b/proto/CombatInvocationsNotify.proto @@ -1,9 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 5253 import "CombatInvokeEntry.proto"; -// 4.7.0 -message CombatInvocationsNotify { - repeated CombatInvokeEntry invoke_list = 14; -} \ No newline at end of file +message CombatInvocationsNotify { + repeated CombatInvokeEntry invoke_list = 1; +} \ No newline at end of file diff --git a/proto/CombatInvokeEntry.proto b/proto/CombatInvokeEntry.proto index ad687929..34a426fc 100644 --- a/proto/CombatInvokeEntry.proto +++ b/proto/CombatInvokeEntry.proto @@ -1,12 +1,13 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 import "ForwardType.proto"; import "CombatTypeArgument.proto"; -// 4.7.0 -message CombatInvokeEntry { - bytes combat_data = 11; - ForwardType forward_type = 13; - CombatTypeArgument argument_type = 15; -} \ No newline at end of file +message CombatInvokeEntry { + ForwardType forward_type = 4; + CombatTypeArgument argument_type = 8; + bytes combat_data = 14; +} \ No newline at end of file diff --git a/proto/CombatTypeArgument.proto b/proto/CombatTypeArgument.proto index a5060e3a..47531491 100644 --- a/proto/CombatTypeArgument.proto +++ b/proto/CombatTypeArgument.proto @@ -1,9 +1,10 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.6.0 +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + enum CombatTypeArgument { - COMBAT_TYPE_ARGUMENT_NONE = 0; + COMBAT_TYPE_ARGUMENT_NONE = 0; COMBAT_TYPE_ARGUMENT_EVT_BEING_HIT = 1; COMBAT_TYPE_ARGUMENT_ANIMATOR_STATE_CHANGED = 2; COMBAT_TYPE_ARGUMENT_FACE_TO_DIR = 3; @@ -26,4 +27,4 @@ enum CombatTypeArgument { COMBAT_TYPE_ARGUMENT_FIXED_AVATAR_FLASH_MOVE = 20; COMBAT_TYPE_ARGUMENT_MULTI_OVERRIDE_ANIM = 21; COMBAT_TYPE_ARGUMENT_DEBUG_SYNC_MOTION = 22; -} \ No newline at end of file +} diff --git a/proto/CreateVehicleReq.proto b/proto/CreateVehicleReq.proto index aed7e35b..d10fd9fc 100644 --- a/proto/CreateVehicleReq.proto +++ b/proto/CreateVehicleReq.proto @@ -1,12 +1,14 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 9915 + import "Vector.proto"; -// 4.7.0 -// CmdId: 26744 -// Obf: LMCAJLPNBAC -message CreateVehicleReq { - uint32 scene_point_id = 8; - Vector pos = 3; - uint32 vehicle_id = 1; - Vector rot = 11; -} + +message CreateVehicleReq { + Vector rot = 11; + Vector pos = 15; + uint32 vehicle_id = 7; + uint32 scene_point_id = 13; +} \ No newline at end of file diff --git a/proto/CreateVehicleRsp.proto b/proto/CreateVehicleRsp.proto index f2499b3c..225f1343 100644 --- a/proto/CreateVehicleRsp.proto +++ b/proto/CreateVehicleRsp.proto @@ -1,10 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 4740 -// Obf: NKPJDHIBIEA -message CreateVehicleRsp { - uint32 vehicle_id = 5; - uint32 entity_id = 2; - int32 retcode = 3; -} +// Version: 5.0 +// CmdId: 22592 + +message CreateVehicleRsp { + uint32 entity_id = 1; + int32 retcode = 8; + uint32 vehicle_id = 13; +} \ No newline at end of file diff --git a/proto/CurVehicleInfo.proto b/proto/CurVehicleInfo.proto index 916f0e45..8b954f6c 100644 --- a/proto/CurVehicleInfo.proto +++ b/proto/CurVehicleInfo.proto @@ -9,7 +9,7 @@ message CurVehicleInfo { uint32 entity_id = 1; uint32 pos = 2; uint32 gadget_id = 3; - Vector BNDOCLLEBEA = 4; + Vector vehicle_pos = 4; uint32 GIICKAOFKDB = 5; - Vector BELIOKMDLGB = 6; + Vector vehicle_rot = 6; } \ No newline at end of file diff --git a/proto/CustomDungeonFinishType.proto b/proto/CustomDungeonFinishType.proto index 6dd1d92c..1300412d 100644 --- a/proto/CustomDungeonFinishType.proto +++ b/proto/CustomDungeonFinishType.proto @@ -1,11 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 -// Version: 4.6.0 -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; -} +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; +} \ No newline at end of file diff --git a/proto/CustomDungeonResultInfo.proto b/proto/CustomDungeonResultInfo.proto index 8d440d69..65e918a9 100644 --- a/proto/CustomDungeonResultInfo.proto +++ b/proto/CustomDungeonResultInfo.proto @@ -1,18 +1,18 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 -import "CustomDungeonFinishType.proto"; import "ChallengeBrief.proto"; +import "CustomDungeonFinishType.proto"; -// Version: 4.6.0 -message CustomDungeonResultInfo { - CustomDungeonFinishType finish_type = 1; - bool AOFLEOKAPPE = 4; - uint32 get_coin_num = 5; - repeated ChallengeBrief child_challenge_list = 6; - uint32 time_cost = 8; - uint64 dungeon_guid = 11; - bool JLPAPANBLCE = 12; - bool PGEHHNIADBK = 14; -} +message CustomDungeonResultInfo { + repeated ChallengeBrief child_challenge_list = 2; + uint32 got_coin_num = 3; + bool FOLIKAAIKIE = 5; + bool GBLHFAEONKM = 6; + CustomDungeonFinishType finish_type = 10; + uint32 time_cost = 11; + bool LHNFIIEJBEM = 14; + uint64 dungeon_guid = 15; +} \ No newline at end of file diff --git a/proto/CutSceneBeginNotify.proto b/proto/CutSceneBeginNotify.proto index 1aec0740..077f9be5 100644 --- a/proto/CutSceneBeginNotify.proto +++ b/proto/CutSceneBeginNotify.proto @@ -1,10 +1,13 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 455 + import "CutSceneExtraParam.proto"; -// 4.7.0 -// CmdId: 305 -message CutSceneBeginNotify { - uint32 cutscene_id = 5; - bool is_wait_others = 3; - repeated CutSceneExtraParam extra_param_list = 15; -} \ No newline at end of file + +message CutSceneBeginNotify { + uint32 cutscene_id = 2; + bool is_wait_others = 7; + repeated CutSceneExtraParam extra_param_list = 14; +} \ No newline at end of file diff --git a/proto/CutSceneExtraParam.proto b/proto/CutSceneExtraParam.proto index 152896c6..9066c765 100644 --- a/proto/CutSceneExtraParam.proto +++ b/proto/CutSceneExtraParam.proto @@ -1,7 +1,8 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// ? -message CutSceneExtraParam { - repeated double detail_param_list = 1; -} +// Version: 5.0 + +message CutSceneExtraParam { + repeated double detail_param_list = 10; +} \ No newline at end of file diff --git a/proto/DailyDungeonEntryInfo.proto b/proto/DailyDungeonEntryInfo.proto index bdc4372c..0223f394 100644 --- a/proto/DailyDungeonEntryInfo.proto +++ b/proto/DailyDungeonEntryInfo.proto @@ -1,13 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -import "DungeonEntryInfo.proto"; -// Version: 4.7.0 -// Obfs: ? -message DailyDungeonEntryInfo { - DungeonEntryInfo recommend_dungeon_entry_info = 7; - uint32 recommend_dungeon_id = 13; - uint32 dungeon_entry_id = 9; - uint32 dungeon_entry_config_id = 5; - bool is_point_unlocked = 14; - bool is_quick_open = 1; -} \ No newline at end of file +// Version: 5.0 + +message DailyDungeonEntryInfo { + uint32 dungeon_entry_config_id = 9; + uint32 dungeon_entry_id = 11; + uint32 recommend_dungeon_id = 14; + fixed32 next_refresh_time = 15; +} \ No newline at end of file diff --git a/proto/DealAddFriendReq.proto b/proto/DealAddFriendReq.proto index f39f80b3..02bf8c68 100644 --- a/proto/DealAddFriendReq.proto +++ b/proto/DealAddFriendReq.proto @@ -1,9 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 21886 + import "DealAddFriendResultType.proto"; -// CmdId: 1458 -// Obf: MDIDNIHDCCK -message DealAddFriendReq { - DealAddFriendResultType deal_add_friend_result = 1; - uint32 target_uid = 7; -} + +message DealAddFriendReq { + DealAddFriendResultType deal_add_friend_result = 10; + uint32 target_uid = 5; +} \ No newline at end of file diff --git a/proto/DealAddFriendResultType.proto b/proto/DealAddFriendResultType.proto index fd97be05..30bb35c3 100644 --- a/proto/DealAddFriendResultType.proto +++ b/proto/DealAddFriendResultType.proto @@ -1,23 +1,9 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// Obf: AIMELHBOBLC +// Version: 5.0 + enum DealAddFriendResultType { - DEAL_ADD_FRIEND_RESULT_TYPE_REJECT = 0; + 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 13d7db51..455618f6 100644 --- a/proto/DealAddFriendRsp.proto +++ b/proto/DealAddFriendRsp.proto @@ -1,10 +1,13 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 29289 + import "DealAddFriendResultType.proto"; -// CmdId: 29333 -// Obf: BPBCKIEJHOO -message DealAddFriendRsp { - int32 retcode = 3; - uint32 target_uid = 8; - DealAddFriendResultType deal_add_friend_result = 4; -} + +message DealAddFriendRsp { + int32 retcode = 2; + uint32 target_uid = 10; + DealAddFriendResultType deal_add_friend_result = 12; +} \ No newline at end of file diff --git a/proto/DelMailReq.proto b/proto/DelMailReq.proto index 17b26683..4bcd2f3d 100644 --- a/proto/DelMailReq.proto +++ b/proto/DelMailReq.proto @@ -1,11 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 8496 -// CmdId: 3779 -// Version: 4.6.0 -// Obfs: MLNPMOILLJI -message DelMailReq { - repeated uint32 mail_id_list = 13; -} - +message DelMailReq { + repeated uint32 mail_id_list = 5; +} \ No newline at end of file diff --git a/proto/DelMailRsp.proto b/proto/DelMailRsp.proto index 3ce3554b..a7395172 100644 --- a/proto/DelMailRsp.proto +++ b/proto/DelMailRsp.proto @@ -1,11 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 26121 -// CmdId: 29251 -// Version: 4.6.0 -// Obfs: KEFLFPLHJOB -message DelMailRsp { - int32 retcode = 1; - repeated uint32 mail_id_list = 14; -} +message DelMailRsp { + repeated uint32 mail_id_list = 14; + int32 retcode = 15; +} \ No newline at end of file diff --git a/proto/DetailAbilityInfo.proto b/proto/DetailAbilityInfo.proto index e884571c..f2bec8e8 100644 --- a/proto/DetailAbilityInfo.proto +++ b/proto/DetailAbilityInfo.proto @@ -1,14 +1,15 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 import "AbilityString.proto"; -// 4.7.0 -message DetailAbilityInfo { - AbilityString parent_ability_name = 1; - uint32 instanced_ability_id = 2; - uint32 instanced_modifier_id = 4; - int32 modifier_local_id = 5; - int32 local_id = 10; - uint32 caster_id = 14; -} \ No newline at end of file +message DetailAbilityInfo { + uint32 instanced_ability_id = 1; + uint32 caster_id = 3; + int32 modifier_local_id = 6; + int32 local_id = 8; + AbilityString parent_ability_name = 10; + uint32 instanced_modifier_id = 12; +} \ No newline at end of file diff --git a/proto/DetailInfo.proto b/proto/DetailInfo.proto index 09f03cfc..c28c1450 100644 --- a/proto/DetailInfo.proto +++ b/proto/DetailInfo.proto @@ -1,9 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 import "DetailAbilityInfo.proto"; -// 4.7.0 message DetailInfo { - optional DetailAbilityInfo detail_ability_info = 15; + oneof CLBBKMNHFIO { + DetailAbilityInfo detail_ability_info = 1; + } } \ No newline at end of file diff --git a/proto/DoGachaReq.proto b/proto/DoGachaReq.proto index 9002ac26..95557674 100644 --- a/proto/DoGachaReq.proto +++ b/proto/DoGachaReq.proto @@ -1,11 +1,13 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 1018 -message DoGachaReq { - uint32 gacha_schedule_id = 4; - string gacha_tag = 6; - uint32 gacha_random = 8; - uint32 gacha_type = 13; - uint32 gacha_times = 15; -} +// Version: 5.0 +// CmdId: 22082 + +message DoGachaReq { + string gacha_tag = 13; + uint32 gacha_schedule_id = 1; + uint32 gacha_type = 6; + uint32 gacha_random = 14; + uint32 gacha_times = 10; +} \ No newline at end of file diff --git a/proto/DoGachaRsp.proto b/proto/DoGachaRsp.proto index b1c57d9f..f20ff84e 100644 --- a/proto/DoGachaRsp.proto +++ b/proto/DoGachaRsp.proto @@ -1,26 +1,31 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 20937 + import "GachaItem.proto"; -// 4.7.0 -// CmdId: 27578 -message DoGachaRsp { - uint32 gachaTimesLimit = 1; - uint32 wishMaxProgress = 2; - uint32 wishItemId = 3; - repeated GachaItem gacha_item_list = 4; - uint32 tenCostItemNum = 5; - uint32 gacha_type = 6; - int32 retcode = 7; - uint32 gacha_times = 8; - uint32 newGachaRandom = 9; - uint32 tenCostItemId = 10; - uint32 costItemId = 11; - uint32 leftGachaTimes = 12; - uint32 gacha_schedule_id = 13; - uint32 wishProgress = 14; - uint32 costItemNum = 15; - bool is_under_general_restrict = 713; - uint32 gachaSortId = 971; - uint32 daily_gacha_times = 1479; - bool is_under_minors_restrict = 1626; -} + +message DoGachaRsp { + uint32 wish_item_id = 1; + int32 retcode = 2; + uint32 gacha_schedule_id = 3; + uint32 ten_cost_item_num = 4; + uint32 cost_item_id = 5; + uint32 left_gacha_times = 6; + uint32 gacha_times_limit = 7; + uint32 ten_cost_item_id = 8; + uint32 gacha_sort_id = 9; + repeated GachaItem gacha_item_list = 10; + uint32 gacha_times = 11; + uint32 cost_item_num = 12; + uint32 wish_progress = 13; + uint32 gacha_type = 14; + uint32 wish_max_progress = 15; + uint32 new_gacha_random = 16; // custom field + uint32 cur_schedule_daily_gacha_times = 378; + bool DBNKDMFDCNG = 380; + bool is_under_minors_restrict = 1019; + uint32 daily_gacha_times = 1528; + bool is_under_general_restrict = 1604; +} \ No newline at end of file diff --git a/proto/DoSetPlayerBornDataNotify.proto b/proto/DoSetPlayerBornDataNotify.proto index 3ed505f0..d955e514 100644 --- a/proto/DoSetPlayerBornDataNotify.proto +++ b/proto/DoSetPlayerBornDataNotify.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 5351 +// CmdId: 5351 message DoSetPlayerBornDataNotify { } \ No newline at end of file diff --git a/proto/DungeonChallengeBeginNotify.proto b/proto/DungeonChallengeBeginNotify.proto index ae459c6d..36ca24cf 100644 --- a/proto/DungeonChallengeBeginNotify.proto +++ b/proto/DungeonChallengeBeginNotify.proto @@ -1,15 +1,14 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 28604 -// Version: 4.7.0 -// CmdId: 4649 -// FKHMPDHCAIK -message DungeonChallengeBeginNotify { - uint32 challenge_id = 2; - repeated uint32 param_list = 8; - uint32 group_id = 11; - uint32 father_index = 6; - uint32 challenge_index = 13; - repeated uint32 uid_list = 9; -} \ No newline at end of file +message DungeonChallengeBeginNotify { + repeated uint32 param_list = 3; + uint32 challenge_index = 5; + uint32 father_index = 7; + repeated uint32 uid_list = 8; + uint32 challenge_id = 9; + uint32 group_id = 10; +} \ No newline at end of file diff --git a/proto/DungeonChallengeFinishNotify.proto b/proto/DungeonChallengeFinishNotify.proto index 519c6783..ce801c98 100644 --- a/proto/DungeonChallengeFinishNotify.proto +++ b/proto/DungeonChallengeFinishNotify.proto @@ -1,25 +1,29 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 753 +import "StrengthenPointData.proto"; import "ChallengeFinishType.proto"; +//import "ChannellerSlabLoopDungeonResultInfo.proto"; import "CustomDungeonResultInfo.proto"; import "PotionDungeonResultInfo.proto"; -import "StrengthenPointData.proto"; -// Version: 4.7.0 -// CmdId: 25587 -// CEPEBFLLCLB +//import "EffigyChallengeDungeonResultInfo.proto"; + message DungeonChallengeFinishNotify { - ChallengeFinishType finish_type = 6; - uint32 time_cost = 5; - map strengthen_point_data_map = 7; // sus - uint32 challenge_index = 13; - bool is_success = 1; // sus - uint32 challenge_record_type = 4; - bool is_new_record = 2; // sus - uint32 current_value = 14; - oneof detail { - PotionDungeonResultInfo potion_dungeon_result_info = 1784; - CustomDungeonResultInfo custom_dungeon_result_info = 1317; - } + uint32 challenge_index = 2; + map strengthen_point_data_map = 4; + bool is_success = 5; + uint32 current_value = 6; + uint32 time_cost = 8; + uint32 challenge_record_type = 10; + bool is_new_record = 13; + ChallengeFinishType finish_type = 14; + oneof detail { + //ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 179; + CustomDungeonResultInfo custom_dungeon_result_info = 207; + PotionDungeonResultInfo potion_dungeon_result_info = 354; // proto + //EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1137; + } } \ No newline at end of file diff --git a/proto/DungeonDieOptionReq.proto b/proto/DungeonDieOptionReq.proto index a1d8474d..447725db 100644 --- a/proto/DungeonDieOptionReq.proto +++ b/proto/DungeonDieOptionReq.proto @@ -1,10 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 4398 + import "PlayerDieOption.proto"; -// 4.7.0 -//cmdid: 22244 -// BJIEMNHCLPK -message DungeonDieOptionReq { - PlayerDieOption die_option = 2; - bool is_quit_immediately = 3; -} + +message DungeonDieOptionReq { + bool is_quit_immediately = 5; + PlayerDieOption die_option = 2; +} \ No newline at end of file diff --git a/proto/DungeonEnterPosInfo.proto b/proto/DungeonEnterPosInfo.proto index abbfbbe1..d68fe53a 100644 --- a/proto/DungeonEnterPosInfo.proto +++ b/proto/DungeonEnterPosInfo.proto @@ -1,10 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 -// Version: 4.7.0 -// Obfs: ? -message DungeonEnterPosInfo { - uint32 point_id = 8; - uint32 quest_id = 9; -} \ No newline at end of file +message DungeonEnterPosInfo { + uint32 quest_id = 8; + uint32 point_id = 12; +} \ No newline at end of file diff --git a/proto/DungeonEntryInfo.proto b/proto/DungeonEntryInfo.proto index 89c3d982..289f70f5 100644 --- a/proto/DungeonEntryInfo.proto +++ b/proto/DungeonEntryInfo.proto @@ -1,15 +1,15 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 import "WeeklyBossResinDiscountInfo.proto"; -// 4.7.0 ? -message DungeonEntryInfo { - bool is_passed = 2; - uint32 dungeon_id = 4; - WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 7; - uint32 next_refresh_time = 10; - uint32 max_boss_chest_num = 12; - uint32 left_times = 14; -} +message DungeonEntryInfo { + bool is_passed = 1; + uint32 dungeon_id = 3; + WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 6; + uint32 boss_chest_num = 9; + uint32 next_refresh_time = 14; + uint32 max_boss_chest_num = 15; +} \ No newline at end of file diff --git a/proto/DungeonEntryInfoReq.proto b/proto/DungeonEntryInfoReq.proto index 037f75a1..bef103a4 100644 --- a/proto/DungeonEntryInfoReq.proto +++ b/proto/DungeonEntryInfoReq.proto @@ -1,12 +1,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 6446 import "Uint32Pair.proto"; -// 4.7.0 -message DungeonEntryInfoReq { - uint32 point_id = 3; - repeated Uint32Pair scene_point_id_list = 12; - uint32 scene_id = 14; -} \ No newline at end of file +message DungeonEntryInfoReq { + repeated Uint32Pair scene_point_id_list = 5; + uint32 scene_id = 10; + uint32 point_id = 4; +} \ No newline at end of file diff --git a/proto/DungeonEntryInfoRsp.proto b/proto/DungeonEntryInfoRsp.proto index c5a98cc5..d157d9e3 100644 --- a/proto/DungeonEntryInfoRsp.proto +++ b/proto/DungeonEntryInfoRsp.proto @@ -1,15 +1,16 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 27112 -import "DungeonEntryPointInfo.proto"; import "DungeonEntryInfo.proto"; +import "DungeonEntryPointInfo.proto"; -// 4.7.0 -message DungeonEntryInfoRsp { - int32 retcode = 2; - uint32 recommend_dungeon_id = 10; - repeated DungeonEntryPointInfo dungeon_entry_point_list = 11; - repeated DungeonEntryInfo dungeon_entry_list = 14; - uint32 point_id = 15; -} \ No newline at end of file +message DungeonEntryInfoRsp { + repeated DungeonEntryInfo dungeon_entry_list = 1; + repeated DungeonEntryPointInfo dungeon_entry_point_list = 9; + uint32 recommend_dungeon_id = 10; + uint32 point_id = 13; + int32 retcode = 15; +} \ No newline at end of file diff --git a/proto/DungeonEntryPointInfo.proto b/proto/DungeonEntryPointInfo.proto index 1a13a864..60cc1c97 100644 --- a/proto/DungeonEntryPointInfo.proto +++ b/proto/DungeonEntryPointInfo.proto @@ -1,13 +1,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 import "DungeonEntryInfo.proto"; -// 4.7.0 -message DungeonEntryPointInfo { - uint32 scene_id = 1; - uint32 point_id = 7; - uint32 recommend_dungeon_id = 13; - repeated DungeonEntryInfo dungeon_entry_list = 14; -} \ No newline at end of file +message DungeonEntryPointInfo { + repeated DungeonEntryInfo dungeon_entry_list = 1; + uint32 point_id = 6; + uint32 recommend_dungeon_id = 10; + uint32 scene_id = 12; +} \ No newline at end of file diff --git a/proto/DungeonPlayerDieNotify.proto b/proto/DungeonPlayerDieNotify.proto index 337c290c..72a2c199 100644 --- a/proto/DungeonPlayerDieNotify.proto +++ b/proto/DungeonPlayerDieNotify.proto @@ -1,19 +1,24 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -import "StrengthenPointData.proto"; +// Version: 5.0 +// CmdId: 28876 + import "PlayerDieType.proto"; -// 4.7.0 -// CmdId: 8234 -// Obf: ? +// import "AbilityString.proto"; +import "StrengthenPointData.proto"; + message DungeonPlayerDieNotify { - uint32 revive_count = 7; // sus - map strengthen_point_data_map = 14; - PlayerDieType die_type = 9; - uint32 wait_time = 11; - uint32 dungeon_id = 8; - oneof entity { - uint32 monster_id = 13; - uint32 gadget_id = 1; - } - uint32 murderer_entity_id = 15; + PlayerDieType die_type = 1; + uint32 revive_count = 3; + uint32 wait_time = 7; + uint32 dungeon_id = 9; + // AbilityString GOEACHAMIAF = 10; + uint32 murderer_entity_id = 11; // 13 + map strengthen_point_data_map = 12; + uint32 GKHNLKAADNG = 13; + oneof entity { + uint32 monster_id = 2; + uint32 gadget_id = 8; + } } diff --git a/proto/DungeonSettleNotify.proto b/proto/DungeonSettleNotify.proto index ff137e0c..ffd1767c 100644 --- a/proto/DungeonSettleNotify.proto +++ b/proto/DungeonSettleNotify.proto @@ -1,27 +1,27 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 8007 import "StrengthenPointData.proto"; import "ParamList.proto"; import "TowerLevelEndNotify.proto"; import "TrialAvatarFirstPassDungeonNotify.proto"; -// Version: 4.7.0 -// CmdId: 3857 -// CEPEBFLLCLB message DungeonSettleNotify { - uint32 result = 14; // sus - uint32 close_time = 13; // OK - uint32 use_time = 9; // OK - map strengthen_point_data_map = 1; // OK - bool is_success = 4; // OK - uint32 create_player_uid = 7; // OK - map settle_show = 10; // OK - repeated uint32 fail_cond_list = 11; // OK - uint32 dungeon_id = 6; // OK - oneof detail { - TowerLevelEndNotify tower_level_end_notify = 1190; - TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 1546; - } + map strengthen_point_data_map = 1; + bool is_success = 4; + repeated uint32 fail_cond_list = 5; + //repeated LOAAKAKFEEJ EDDJNBFBDHN = 6; + uint32 dungeon_id = 8; + uint32 FJHHIKOIHKA = 9; + uint32 PDLMKFLEKDL = 10; + map settle_show = 11; + uint32 create_player_uid = 12; + uint32 MHHCOEDMPDP = 14; + oneof detail { + TowerLevelEndNotify tower_level_end_notify = 682; + TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 1922; + } } \ No newline at end of file diff --git a/proto/EnterSceneDoneReq.proto b/proto/EnterSceneDoneReq.proto index 1ae91ae2..43d813f6 100644 --- a/proto/EnterSceneDoneReq.proto +++ b/proto/EnterSceneDoneReq.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 4561 +// CmdId: 4561 message EnterSceneDoneReq { uint32 enter_scene_token = 8; diff --git a/proto/EnterSceneDoneRsp.proto b/proto/EnterSceneDoneRsp.proto index 5e9d4ef0..f9bcdc10 100644 --- a/proto/EnterSceneDoneRsp.proto +++ b/proto/EnterSceneDoneRsp.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 793 +// CmdId: 793 message EnterSceneDoneRsp { int32 retcode = 10; diff --git a/proto/EnterScenePeerNotify.proto b/proto/EnterScenePeerNotify.proto index 4c846e94..1d1d5a4f 100644 --- a/proto/EnterScenePeerNotify.proto +++ b/proto/EnterScenePeerNotify.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 9626 +// CmdId: 9626 message EnterScenePeerNotify { uint32 enter_scene_token = 1; diff --git a/proto/EnterSceneReadyReq.proto b/proto/EnterSceneReadyReq.proto index 2e21755f..f6f19d0c 100644 --- a/proto/EnterSceneReadyReq.proto +++ b/proto/EnterSceneReadyReq.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 20524 +// CmdId: 20524 message EnterSceneReadyReq { uint32 enter_scene_token = 7; diff --git a/proto/EnterSceneReadyRsp.proto b/proto/EnterSceneReadyRsp.proto index e6647b73..7beb0aba 100644 --- a/proto/EnterSceneReadyRsp.proto +++ b/proto/EnterSceneReadyRsp.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 7914 +// CmdId: 7914 message EnterSceneReadyRsp { int32 retcode = 9; diff --git a/proto/EnterType.proto b/proto/EnterType.proto index 9589b597..7c924cfe 100644 --- a/proto/EnterType.proto +++ b/proto/EnterType.proto @@ -3,18 +3,18 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -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_GOTO_BY_TPL = 12; -} \ No newline at end of file +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_GOTO_BY_TPL = 12; +} diff --git a/proto/EnterWorldAreaReq.proto b/proto/EnterWorldAreaReq.proto index b8f8adbe..e704efdd 100644 --- a/proto/EnterWorldAreaReq.proto +++ b/proto/EnterWorldAreaReq.proto @@ -1,10 +1,10 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 6675 -// OJNKEODJCJG -message EnterWorldAreaReq { - uint32 area_id = 7; - uint32 area_type = 6; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 479 + +message EnterWorldAreaReq { + uint32 area_type = 8; + uint32 area_id = 2; +} \ No newline at end of file diff --git a/proto/EnterWorldAreaRsp.proto b/proto/EnterWorldAreaRsp.proto index 384f2a1d..263a4b87 100644 --- a/proto/EnterWorldAreaRsp.proto +++ b/proto/EnterWorldAreaRsp.proto @@ -1,11 +1,11 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 8436 -// FMPOBCLPIGO -message EnterWorldAreaRsp { - uint32 area_type = 12; - uint32 area_id = 3; - int32 retcode = 5; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 7481 + +message EnterWorldAreaRsp { + uint32 area_type = 7; + uint32 area_id = 11; + int32 retcode = 15; +} \ No newline at end of file diff --git a/proto/EntityClientExtraInfo.proto b/proto/EntityClientExtraInfo.proto index 39fdd21f..a14c64e8 100644 --- a/proto/EntityClientExtraInfo.proto +++ b/proto/EntityClientExtraInfo.proto @@ -6,5 +6,5 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; message EntityClientExtraInfo { - Vector skill_anchor_position = 1; + Vector FFIOLDKCHCK = 1; } \ No newline at end of file diff --git a/proto/EntityFightPropChangeReasonNotify.proto b/proto/EntityFightPropChangeReasonNotify.proto index d2af4c79..ac724650 100644 --- a/proto/EntityFightPropChangeReasonNotify.proto +++ b/proto/EntityFightPropChangeReasonNotify.proto @@ -1,23 +1,24 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 7107 import "DetailInfo.proto"; -import "ChangeHpDebts.proto"; +import "PropChangeReason.proto"; +import "ChangeHpDebtsReason.proto"; import "ChangeHpReason.proto"; import "ChangeEnergyReason.proto"; -import "PropChangeReason.proto"; -// 4.7.0 -// CmdId: 26911 ? -message EntityFightPropChangeReasonNotify { - float HFDLKKBJNMI = 1; - uint32 entity_id = 3; - DetailInfo detail_info = 4; - ChangeHpDebts change_hp_debts = 6; - uint32 prop_type = 7; - ChangeHpReason change_hp_reason = 8; - ChangeEnergyReason change_energy_reason = 11; - float prop_delta = 12; - repeated uint32 param_list = 13; - PropChangeReason reason = 14; -} \ No newline at end of file +message EntityFightPropChangeReasonNotify { + DetailInfo detail_info = 1; + uint32 entity_id = 2; + PropChangeReason reason = 3; + ChangeHpDebtsReason change_hp_debts_reason = 7; + repeated uint32 param_list = 8; + float prop_delta = 10; + uint32 prop_type = 11; + float NNFONEOHGHE = 12; + ChangeHpReason change_hp_reason = 13; + ChangeEnergyReason change_energy_reason = 15; +} \ No newline at end of file diff --git a/proto/EntityFightPropUpdateNotify.proto b/proto/EntityFightPropUpdateNotify.proto index 4bd3fe39..b859a82e 100644 --- a/proto/EntityFightPropUpdateNotify.proto +++ b/proto/EntityFightPropUpdateNotify.proto @@ -1,10 +1,10 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// cmdid: 24691(ok) or 20736(x) -// JCEKOEKBLGJ or OKKBKHIGKAF? -message EntityFightPropUpdateNotify { - uint32 entity_id = 2; - map fight_prop_map = 12; -} +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 6590 + +message EntityFightPropUpdateNotify { + map fight_prop_map = 13; + uint32 entity_id = 14; +} \ No newline at end of file diff --git a/proto/EquipParam.proto b/proto/EquipParam.proto index f63989a6..27da51c0 100644 --- a/proto/EquipParam.proto +++ b/proto/EquipParam.proto @@ -1,9 +1,11 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -message EquipParam { - uint32 item_id = 1; - uint32 item_num = 2; - uint32 item_level = 3; - uint32 promote_level = 4; -} +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + +message EquipParam { + uint32 item_id = 1; + uint32 item_num = 2; + uint32 item_level = 3; + uint32 promote_level = 4; +} \ No newline at end of file diff --git a/proto/EvtAiSyncSkillCdNotify.proto b/proto/EvtAiSyncSkillCdNotify.proto index 2ce07956..88e8988d 100644 --- a/proto/EvtAiSyncSkillCdNotify.proto +++ b/proto/EvtAiSyncSkillCdNotify.proto @@ -1,10 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 28128 import "AiSkillCdInfo.proto"; -// CmdId: 23435 -message EvtAiSyncSkillCdNotify { - map ai_cd_map = 3; -} \ No newline at end of file +message EvtAiSyncSkillCdNotify { + map ai_cd_map = 11; +} \ No newline at end of file diff --git a/proto/EvtAvatarLockChairReq.proto b/proto/EvtAvatarLockChairReq.proto index 0e802684..7e9ddeb5 100644 --- a/proto/EvtAvatarLockChairReq.proto +++ b/proto/EvtAvatarLockChairReq.proto @@ -1,10 +1,13 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 8990 + import "Vector.proto"; -// 4.7.0 -message EvtAvatarLockChairReq { - Vector position = 3; - uint64 chair_id = 5; - int32 direction = 13; -} +message EvtAvatarLockChairReq { + Vector position = 13; + uint64 chair_id = 3; + int32 direction = 14; +} \ No newline at end of file diff --git a/proto/EvtAvatarLockChairRsp.proto b/proto/EvtAvatarLockChairRsp.proto index 35871d02..24b9d76b 100644 --- a/proto/EvtAvatarLockChairRsp.proto +++ b/proto/EvtAvatarLockChairRsp.proto @@ -1,12 +1,15 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 5831 + import "Vector.proto"; -// 4.7.0 -message EvtAvatarLockChairRsp { - uint64 chair_id = 2; - int32 retcode = 4; - int32 direction = 9; - uint32 entity_id = 11; - Vector position = 15; -} +message EvtAvatarLockChairRsp { + uint32 entity_id = 1; + int32 direction = 4; + int32 retcode = 5; + uint64 chair_id = 8; + Vector position = 12; +} \ No newline at end of file diff --git a/proto/EvtAvatarStandUpNotify.proto b/proto/EvtAvatarStandUpNotify.proto index 90bcf054..96ec3e76 100644 --- a/proto/EvtAvatarStandUpNotify.proto +++ b/proto/EvtAvatarStandUpNotify.proto @@ -1,10 +1,12 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message EvtAvatarStandUpNotify { - uint32 entity_id = 1; - uint64 chair_id = 2; - int32 perform_id = 11; - int32 direction = 12; -} +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 28594 + +message EvtAvatarStandUpNotify { + uint64 chair_id = 3; + int32 perform_id = 7; + uint32 entity_id = 13; + int32 direction = 14; +} \ No newline at end of file diff --git a/proto/EvtBeingHitInfo.proto b/proto/EvtBeingHitInfo.proto index 9daaf80a..a8237f96 100644 --- a/proto/EvtBeingHitInfo.proto +++ b/proto/EvtBeingHitInfo.proto @@ -1,11 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 import "AttackResult.proto"; -// 4.7.0 -message EvtBeingHitInfo { - uint32 frame_num = 8; - AttackResult attack_result = 11; - uint32 peer_id = 13; -} +message EvtBeingHitInfo { + uint32 frame_num = 4; + uint32 peer_id = 9; + AttackResult attack_result = 12; +} \ No newline at end of file diff --git a/proto/EvtBulletHitNotify.proto b/proto/EvtBulletHitNotify.proto index fccb2611..fd96d763 100644 --- a/proto/EvtBulletHitNotify.proto +++ b/proto/EvtBulletHitNotify.proto @@ -1,19 +1,21 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -import "ForwardType.proto"; +// Version: 5.0 +// CmdId: 2465 + import "HitColliderType.proto"; +import "ForwardType.proto"; import "Vector.proto"; -// 4.7.0 -// CmdId: 5735 -// Obf: ?? -message EvtBulletHitNotify { - ForwardType forward_type = 1; - HitColliderType hit_collider_type = 7; - Vector hit_point = 11; // sus - Vector hit_normal = 5; // sus - uint32 entity_id = 6; - int32 hit_box_index = 14; - uint32 forward_peer = 9; - uint32 uk1 = 8; - uint32 uk2 = 15; -} + +message EvtBulletHitNotify { + uint32 single_bullet_id = 4; + uint32 forward_peer = 5; + int32 hit_box_index = 7; + HitColliderType hit_collider_type = 9; + uint32 entity_id = 10; + ForwardType forward_type = 11; + Vector hit_point = 13; + uint32 hit_entity_id = 14; + Vector hit_pointhit_normal = 15; +} \ No newline at end of file diff --git a/proto/EvtCreateGadgetNotify.proto b/proto/EvtCreateGadgetNotify.proto index 0625eec4..f005c6e6 100644 --- a/proto/EvtCreateGadgetNotify.proto +++ b/proto/EvtCreateGadgetNotify.proto @@ -1,35 +1,35 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 21187 import "Vector.proto"; -import "ForwardType.proto"; import "AbilityString.proto"; +import "ForwardType.proto"; -// CmdId: 25223 -// Version: 4.7.0 -message EvtCreateGadgetNotify { - Vector init_euler_angles = 1; - bool is_async_load = 2; // JAENJMGNGNC sus - uint32 config_id = 3; - uint32 camp_type = 4; - uint32 target_entity_id = 5; - uint32 FGPFOMCEKME = 6; - uint32 entity_id = 7; - Vector init_pos = 8; - bool LAJKLOJMPNG = 9; - uint32 camp_id = 10; - uint64 guid = 11; - uint32 prop_owner_entity_id = 12; - uint32 room_id = 13; - ForwardType forward_type = 14; - uint32 owner_entity_id = 15; - AbilityString ability_name = 240; - uint32 init_pose_id = 378; - bool MMHLCBHJLAJ = 680; - uint32 born_slot_index = 930; - repeated uint32 target_entity_id_list = 1105; - repeated uint32 target_lock_point_index_list = 1115; - int32 local_id = 1444; - bool is_peer_id_from_player = 1463; -} \ No newline at end of file +message EvtCreateGadgetNotify { + repeated uint32 target_lock_point_index_list = 261; + Vector init_pos = 13; + Vector init_euler_angles = 4; + repeated uint32 target_entity_id_list = 809; + AbilityString ability_name = 426; + uint32 target_lock_point_index = 8; + ForwardType forward_type = 6; + bool is_peer_id_from_player = 637; + bool is_async_load = 354; + bool sight_group_with_owner = 9; // 10 + bool is_true_life_time_by_owner = 10; // 9 + uint32 entity_id = 5; + uint32 room_id = 2; + uint32 init_pose_id = 328; + uint32 prop_owner_entity_id = 3; + int32 local_id = 19; + uint32 target_entity_id = 12; + uint32 camp_type = 7; + uint32 camp_id = 1; + uint32 LKHKMKMKMJC = 1898; + uint32 owner_entity_id = 15; + uint32 config_id = 14; + uint64 guid = 11; +} \ No newline at end of file diff --git a/proto/EvtDoSkillSuccNotify.proto b/proto/EvtDoSkillSuccNotify.proto index 8a61348a..3133a9e7 100644 --- a/proto/EvtDoSkillSuccNotify.proto +++ b/proto/EvtDoSkillSuccNotify.proto @@ -1,14 +1,15 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 1941 import "Vector.proto"; import "ForwardType.proto"; -// 4.7.0 -message EvtDoSkillSuccNotify { - Vector forward = 1; - uint32 skill_id = 8; - ForwardType forward_type = 9; - uint32 caster_id = 10; -} +message EvtDoSkillSuccNotify { + Vector forward = 4; + uint32 skill_id = 11; + ForwardType forward_type = 6; + uint32 caster_id = 9; +} \ No newline at end of file diff --git a/proto/FinishedParentQuestNotify.proto b/proto/FinishedParentQuestNotify.proto index 971393de..a5884d58 100644 --- a/proto/FinishedParentQuestNotify.proto +++ b/proto/FinishedParentQuestNotify.proto @@ -1,10 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 25902 import "ParentQuest.proto"; -// 4.7.0 -message FinishedParentQuestNotify { - repeated ParentQuest parent_quest_list = 8; -} +message FinishedParentQuestNotify { + repeated ParentQuest parent_quest_list = 14; +} \ No newline at end of file diff --git a/proto/FinishedParentQuestUpdateNotify.proto b/proto/FinishedParentQuestUpdateNotify.proto index b67bb536..bf8a88f0 100644 --- a/proto/FinishedParentQuestUpdateNotify.proto +++ b/proto/FinishedParentQuestUpdateNotify.proto @@ -1,10 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 28362 import "ParentQuest.proto"; -// 4.7.0 -message FinishedParentQuestUpdateNotify { - repeated ParentQuest parent_quest_list = 7; -} +message FinishedParentQuestUpdateNotify { + repeated ParentQuest parent_quest_list = 11; +} \ No newline at end of file diff --git a/proto/ForwardType.proto b/proto/ForwardType.proto index adfa0252..1f2f3535 100644 --- a/proto/ForwardType.proto +++ b/proto/ForwardType.proto @@ -1,9 +1,10 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.6.0 +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + enum ForwardType { - FORWARD_TYPE_LOCAL = 0; + FORWARD_TYPE_LOCAL = 0; FORWARD_TYPE_TO_ALL = 1; FORWARD_TYPE_TO_ALL_EXCEPT_CUR = 2; FORWARD_TYPE_TO_HOST = 3; @@ -12,4 +13,4 @@ enum ForwardType { FORWARD_TYPE_TO_PEERS = 6; FORWARD_TYPE_ONLY_SERVER = 7; FORWARD_TYPE_TO_ALL_EXIST_EXCEPT_CUR = 8; -} \ No newline at end of file +} diff --git a/proto/FriendBrief.proto b/proto/FriendBrief.proto index ec3c72f3..bed435de 100644 --- a/proto/FriendBrief.proto +++ b/proto/FriendBrief.proto @@ -1,5 +1,7 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 import "FriendOnlineState.proto"; import "SocialShowAvatarInfo.proto"; @@ -7,30 +9,29 @@ import "FriendEnterHomeOption.proto"; import "ProfilePicture.proto"; import "PlatformType.proto"; -// 4.6.0 -message FriendBrief { - uint32 uid = 1; - string nickname = 2; - uint32 level = 3; - uint32 avatar_id = 4; - uint32 world_level = 5; - string signature = 6; - FriendOnlineState online_state = 7; - uint32 param = 8; - bool is_mp_mode_available = 10; - string online_id = 11; - uint32 last_active_time = 12; - uint32 name_card_id = 13; - uint32 mp_player_num = 14; - bool is_chat_no_disturb = 15; - uint32 chat_sequence = 16; - string remark_name = 17; - repeated SocialShowAvatarInfo show_avatar_info_list = 22; - FriendEnterHomeOption friend_enter_home_option = 23; - ProfilePicture profile_picture = 24; - bool is_game_source = 25; - bool is_psn_source = 26; - PlatformType platform_type = 27; - bool is_in_duel = 28; - bool is_duel_observable = 29; -} \ No newline at end of file +message FriendBrief { + uint32 uid = 1; + string nickname = 2; + uint32 level = 3; + uint32 avatar_id = 4; + uint32 world_level = 5; + string signature = 6; + FriendOnlineState online_state = 7; + uint32 param = 8; + bool is_mp_mode_available = 10; + string online_id = 11; + uint32 last_active_time = 12; + uint32 name_card_id = 13; + uint32 mp_player_num = 14; + bool is_chat_no_disturb = 15; + uint32 chat_sequence = 16; + string remark_name = 17; + repeated SocialShowAvatarInfo show_avatar_info_list = 22; + FriendEnterHomeOption friend_enter_home_option = 23; + ProfilePicture profile_picture = 24; + bool is_game_source = 25; + bool is_psn_source = 26; + PlatformType platform_type = 27; + bool is_in_duel = 28; + bool is_duel_observable = 29; +} \ No newline at end of file diff --git a/proto/FriendEnterHomeOption.proto b/proto/FriendEnterHomeOption.proto index 5d3ea0ca..9c5c2aa6 100644 --- a/proto/FriendEnterHomeOption.proto +++ b/proto/FriendEnterHomeOption.proto @@ -1,8 +1,10 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// Obf: LDBJAIDJNMO +// Version: 5.0 + 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 23a10a29..0c82836f 100644 --- a/proto/FriendOnlineState.proto +++ b/proto/FriendOnlineState.proto @@ -1,7 +1,9 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// Obf: NALGAFDLMDG +// Version: 5.0 + enum FriendOnlineState { - FRIEND_ONLINE_STATE_DISCONNECT = 0; + FRIEND_ONLINE_STATE_DISCONNECT = 0; FRIEND_ONLINE_STATE_ONLINE = 1; } diff --git a/proto/FurnitureCurModuleArrangeCountNotify.proto b/proto/FurnitureCurModuleArrangeCountNotify.proto index 530a1ba6..1ee96d31 100644 --- a/proto/FurnitureCurModuleArrangeCountNotify.proto +++ b/proto/FurnitureCurModuleArrangeCountNotify.proto @@ -1,24 +1,11 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 21517 + import "Uint32Pair.proto"; -// CmdId: 2948 -// Obf: FGLMMAMBPBP -message FurnitureCurModuleArrangeCountNotify { - repeated Uint32Pair furniture_arrange_count_list = 1; -} + +message FurnitureCurModuleArrangeCountNotify { + repeated Uint32Pair furniture_arrange_count_list = 15; +} \ No newline at end of file diff --git a/proto/FurnitureMakeReq.proto b/proto/FurnitureMakeReq.proto index 25ea29e4..19bdfaee 100644 --- a/proto/FurnitureMakeReq.proto +++ b/proto/FurnitureMakeReq.proto @@ -1,22 +1,8 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// CmdId: 23349 -// Obf: OBBOIIBGLPH -message FurnitureMakeReq { -} +// Version: 5.0 +// CmdId: 25118 + +message FurnitureMakeReq { +} \ No newline at end of file diff --git a/proto/GachaInfo.proto b/proto/GachaInfo.proto index 98fbfddf..33e9411c 100644 --- a/proto/GachaInfo.proto +++ b/proto/GachaInfo.proto @@ -1,45 +1,37 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + import "GachaUpInfo.proto"; -// 4.7.0 -// PKGNKDGHLOF -message GachaInfo { - uint32 end_time = 5; // OK - uint32 schedule_id = 10; // OK - uint32 gacha_type = 11; // OK - uint32 begin_time = 12; // OK - bool is_new_wish = 778; // OK - repeated GachaUpInfo gacha_up_info_list = 802; // OK - repeated uint32 displayUp4ItemList = 1152; // OK - repeated uint32 displayUp5ItemList = 1046; // OK - - // string sus - string gachaPreviewPrefabPath = 7; // OK - string titleTextmap = 3; // OK? - string gachaPrefabPath = 1; // OK - - string gachaRecordUrlOversea = 1355; // LOCK - // string gachaRecordUrl = 1355; // XCN, 14x - string gachaProbUrlOversea = 784; // LOCK - // string gachaProbUrl = 1926; // XCN - - // int32 sus - uint32 tenCostItemNum = 4; // OK LOCK - uint32 tenCostItemId = 8; // OK LOCK - uint32 costItemNum = 9; // OK LOCK - uint32 costItemId = 15; // OK LOCK - - // LOCK - uint32 wishMaxProgress = 1274; // ONMDPPDFMEL T1 - uint32 wishProgress = 1954; // NJMNJNNPFPL T2 - uint32 wishItemId = 1106; // EMFBCNGMLJJ T3 - - // 1 STUFF - uint32 curScheduleDailyGachaTimes = 6; // OK - - // 2 STUFF - uint32 gachaSortId = 1869; - uint32 leftGachaTimes = 2; // LOCK - uint32 gachaTimesLimit = 13; // LOCK -} \ No newline at end of file +message GachaInfo { + uint32 end_time = 1; + uint32 wish_progress = 2; + uint32 ten_cost_item_num = 3; + string gacha_preview_prefab_path = 4; + uint32 begin_time = 5; + string gacha_record_url = 6; + uint32 cost_item_num = 7; + uint32 schedule_id = 8; + string gacha_prob_url = 9; + uint32 gacha_type = 10; + string gacha_prefab_path = 11; + uint32 cost_item_id = 12; + uint32 wish_max_progress = 13; + uint32 left_gacha_times = 14; + uint32 gacha_times_limit = 15; + repeated uint32 display_up5_item_list = 99; + uint32 ten_cost_item_id = 243; + bool is_new_wish = 251; + uint32 wish_item_id = 599; + string title_textmap = 782; + string gacha_prob_url_oversea = 798; + uint32 cur_schedule_daily_gacha_times = 1087; + repeated uint32 EFPBICLMCGG = 1448; + bool LAGAHPEKLHM = 1509; + repeated GachaUpInfo gacha_up_info_list = 1711; + repeated uint32 display_up4_item_list = 1882; + uint32 gacha_sort_id = 1938; + string gacha_record_url_oversea = 1984; +} \ No newline at end of file diff --git a/proto/GachaItem.proto b/proto/GachaItem.proto index 8a612988..ac9af82f 100644 --- a/proto/GachaItem.proto +++ b/proto/GachaItem.proto @@ -1,13 +1,15 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + import "ItemParam.proto"; import "GachaTransferItem.proto"; -// Version: 4.7.0 -// Obfs: ? -message GachaItem { - ItemParam gacha_item = 9; - repeated ItemParam token_item_list = 14; - bool is_gacha_item_new = 11; - repeated GachaTransferItem transfer_items = 1; - bool is_flash_card = 12; -} + +message GachaItem { + ItemParam gacha_item = 1; + bool is_flash_card = 4; + bool is_gacha_item_new = 8; + repeated ItemParam token_item_list = 14; + repeated GachaTransferItem transfer_items = 15; +} \ No newline at end of file diff --git a/proto/GachaTransferItem.proto b/proto/GachaTransferItem.proto index 9d0982cc..ee95bb2e 100644 --- a/proto/GachaTransferItem.proto +++ b/proto/GachaTransferItem.proto @@ -1,9 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + import "ItemParam.proto"; -// Version: 4.7.0 -// Obfs: ? -message GachaTransferItem { - ItemParam item = 9; - bool is_transfer_item_new = 14; -} + +message GachaTransferItem { + ItemParam item = 5; + bool is_transfer_item_new = 15; +} \ No newline at end of file diff --git a/proto/GachaUpInfo.proto b/proto/GachaUpInfo.proto index 25186364..ffa8d797 100644 --- a/proto/GachaUpInfo.proto +++ b/proto/GachaUpInfo.proto @@ -1,8 +1,9 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// Version: 4.7.0 -// Obfs: JEJNMHJKEPK -message GachaUpInfo { - uint32 item_parent_type = 5; - repeated uint32 item_id_list = 15; -} \ No newline at end of file +// Version: 5.0 + +message GachaUpInfo { + repeated uint32 item_id_list = 8; + uint32 item_parent_type = 11; +} \ No newline at end of file diff --git a/proto/GadgetBornType.proto b/proto/GadgetBornType.proto index a777822d..994cb1b0 100644 --- a/proto/GadgetBornType.proto +++ b/proto/GadgetBornType.proto @@ -3,12 +3,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -enum GadgetBornType { - GADGET_BORN_TYPE_NONE = 0; - GADGET_BORN_TYPE_IN_AIR = 1; - GADGET_BORN_TYPE_PLAYER = 2; - GADGET_BORN_TYPE_MONSTER_HIT = 3; - GADGET_BORN_TYPE_MONSTER_DIE = 4; - GADGET_BORN_TYPE_GADGET = 5; - GADGET_BORN_TYPE_GROUND = 6; -} \ No newline at end of file +enum GadgetBornType { + GADGET_BORN_TYPE_NONE = 0; + GADGET_BORN_TYPE_IN_AIR = 1; + GADGET_BORN_TYPE_PLAYER = 2; + GADGET_BORN_TYPE_MONSTER_HIT = 3; + GADGET_BORN_TYPE_MONSTER_DIE = 4; + GADGET_BORN_TYPE_GADGET = 5; + GADGET_BORN_TYPE_GROUND = 6; +} diff --git a/proto/GadgetInteractReq.proto b/proto/GadgetInteractReq.proto index e5577c76..11dfc4e1 100644 --- a/proto/GadgetInteractReq.proto +++ b/proto/GadgetInteractReq.proto @@ -1,15 +1,18 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 26009 import "InterOpType.proto"; import "ResinCostType.proto"; -// 4.7.0 -message GadgetInteractReq { - InterOpType op_type = 1; - uint32 ui_interact_id = 3; - bool is_use_condense_resin = 7; - uint32 gadget_id = 8; - ResinCostType resin_cost_type = 13; - uint32 gadget_entity_id = 15; -} +message GadgetInteractReq { + uint32 ui_interact_id = 5; + InterOpType op_type = 4; + bool is_use_condense_resin = 15; + uint32 gadget_id = 3; + ResinCostType resin_cost_type = 11; + uint32 CHDDOFMLBLM = 9; + uint32 gadget_entity_id = 12; +} \ No newline at end of file diff --git a/proto/GadgetInteractRsp.proto b/proto/GadgetInteractRsp.proto index 1ef79b23..7326c869 100644 --- a/proto/GadgetInteractRsp.proto +++ b/proto/GadgetInteractRsp.proto @@ -1,14 +1,17 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 28160 -import "InteractType.proto"; import "InterOpType.proto"; +import "InteractType.proto"; -// 4.7.0 -message GadgetInteractRsp { - InteractType interact_type = 3; - InterOpType op_type = 4; - int32 retcode = 6; - uint32 gadget_id = 8; - uint32 gadget_entity_id = 10; -} \ No newline at end of file +message GadgetInteractRsp { + InterOpType op_type = 1; + int32 retcode = 5; + uint32 gadget_entity_id = 6; + InteractType interact_type = 8; + uint32 gadget_id = 9; + uint32 CHDDOFMLBLM = 11; +} \ No newline at end of file diff --git a/proto/GadgetStateNotify.proto b/proto/GadgetStateNotify.proto index 3c3c4a64..be636877 100644 --- a/proto/GadgetStateNotify.proto +++ b/proto/GadgetStateNotify.proto @@ -1,12 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 21201 -// CmdId: 22100 -// Version: 4.7.0 -// Obfs: DJHFBECHIJK -message GadgetStateNotify { - uint32 gadget_entity_id = 12; - uint32 gadget_state = 15; - bool is_enable_interact = 14; -} \ No newline at end of file +message GadgetStateNotify { + bool is_enable_interact = 1; + uint32 gadget_state = 13; + uint32 gadget_entity_id = 14; +} \ No newline at end of file diff --git a/proto/GetActivityInfoReq.proto b/proto/GetActivityInfoReq.proto index d97b7ce5..315038c5 100644 --- a/proto/GetActivityInfoReq.proto +++ b/proto/GetActivityInfoReq.proto @@ -1,8 +1,9 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 25360 -// Obf: ? -message GetActivityInfoReq { - repeated uint32 activity_id_list = 9; -} +// Version: 5.0 +// CmdId: 9710 + +message GetActivityInfoReq { + repeated uint32 activity_id_list = 7; +} \ No newline at end of file diff --git a/proto/GetActivityInfoRsp.proto b/proto/GetActivityInfoRsp.proto index fe4ab7ce..4275d4ac 100644 --- a/proto/GetActivityInfoRsp.proto +++ b/proto/GetActivityInfoRsp.proto @@ -1,13 +1,15 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 7719 + import "ActivityInfo.proto"; import "Uint32Pair.proto"; -// 4.7.0 -// cmdid: 27972 -message GetActivityInfoRsp { - int32 retcode = 2; - repeated ActivityInfo activity_info_list = 7; - repeated uint32 activated_sale_id_list = 8; - repeated Uint32Pair disable_transfer_point_interaction_list = 11; -} +message GetActivityInfoRsp { + repeated ActivityInfo activity_info_list = 2; + repeated Uint32Pair disable_transfer_point_interaction_list = 5; + repeated uint32 activated_sale_id_list = 7; + int32 retcode = 14; +} \ No newline at end of file diff --git a/proto/GetAllMailNotify.proto b/proto/GetAllMailNotify.proto index 8c47fddd..48054e4f 100644 --- a/proto/GetAllMailNotify.proto +++ b/proto/GetAllMailNotify.proto @@ -1,10 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 7646 -// CmdId: 8385 -// Version: 4.7.0 -// Obfs: ? -message GetAllMailNotify { - bool is_collected = 1; -} +message GetAllMailNotify { + bool is_collected = 8; +} \ No newline at end of file diff --git a/proto/GetAllMailResultNotify.proto b/proto/GetAllMailResultNotify.proto index 545312fd..3966265e 100644 --- a/proto/GetAllMailResultNotify.proto +++ b/proto/GetAllMailResultNotify.proto @@ -1,17 +1,16 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 20649 import "MailData.proto"; -// CmdId: 20380 -// Version: 4.7.0 -// Obfs: ? -message GetAllMailResultNotify { - int32 retcode = 12; - repeated MailData mail_list = 2; - string transaction = 7; - uint32 packet_num = 6; - bool is_collected = 3; - uint32 packet_be_sent_num = 14; -} +message GetAllMailResultNotify { + uint32 total_page_count = 4; + uint32 page_index = 6; + string transaction = 8; + bool is_collected = 10; + int32 retcode = 11; + repeated MailData mail_list = 13; +} \ No newline at end of file diff --git a/proto/GetAllUnlockNameCardReq.proto b/proto/GetAllUnlockNameCardReq.proto index 775fac3e..bf52abd5 100644 --- a/proto/GetAllUnlockNameCardReq.proto +++ b/proto/GetAllUnlockNameCardReq.proto @@ -1,6 +1,8 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.6.0 -message GetAllUnlockNameCardReq { -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 5009 + +message GetAllUnlockNameCardReq { +} \ No newline at end of file diff --git a/proto/GetAllUnlockNameCardRsp.proto b/proto/GetAllUnlockNameCardRsp.proto index 25b5c1bb..a3ea6e63 100644 --- a/proto/GetAllUnlockNameCardRsp.proto +++ b/proto/GetAllUnlockNameCardRsp.proto @@ -1,8 +1,10 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message GetAllUnlockNameCardRsp { - repeated uint32 name_card_list = 15; - int32 retcode = 12; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 2632 + +message GetAllUnlockNameCardRsp { + int32 retcode = 10; + repeated uint32 name_card_list = 11; +} \ No newline at end of file diff --git a/proto/GetDailyDungeonEntryInfoRsp.proto b/proto/GetDailyDungeonEntryInfoRsp.proto index 6f913804..6b640605 100644 --- a/proto/GetDailyDungeonEntryInfoRsp.proto +++ b/proto/GetDailyDungeonEntryInfoRsp.proto @@ -1,10 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 3265 + import "DailyDungeonEntryInfo.proto"; -// CmdId: 6323 -// Version: 4.7.0 -// Obfs: ? -message GetDailyDungeonEntryInfoRsp { - repeated DailyDungeonEntryInfo daily_dungeon_info_list = 5; - int32 retcode = 2; -} \ No newline at end of file + +message GetDailyDungeonEntryInfoRsp { + repeated DailyDungeonEntryInfo daily_dungeon_info_list = 4; + int32 retcode = 6; +} \ No newline at end of file diff --git a/proto/GetFriendShowAvatarInfoReq.proto b/proto/GetFriendShowAvatarInfoReq.proto index 6df32edb..477fcad1 100644 --- a/proto/GetFriendShowAvatarInfoReq.proto +++ b/proto/GetFriendShowAvatarInfoReq.proto @@ -1,8 +1,9 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 22460 -// Obf: HCLGHFLOHPN -message GetFriendShowAvatarInfoReq { - uint32 uid = 8; -} +// Version: 5.0 +// CmdId: 20766 + +message GetFriendShowAvatarInfoReq { + uint32 uid = 13; +} \ No newline at end of file diff --git a/proto/GetFriendShowAvatarInfoRsp.proto b/proto/GetFriendShowAvatarInfoRsp.proto index f8cfc7fe..43210c6c 100644 --- a/proto/GetFriendShowAvatarInfoRsp.proto +++ b/proto/GetFriendShowAvatarInfoRsp.proto @@ -1,26 +1,13 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 27251 + import "ShowAvatarInfo.proto"; -// CmdId: 26299 -// Obf: GKKBKHLCING -message GetFriendShowAvatarInfoRsp { - uint32 uid = 8; - int32 retcode = 6; - repeated ShowAvatarInfo show_avatar_info_list = 14; -} + +message GetFriendShowAvatarInfoRsp { + int32 retcode = 1; + repeated ShowAvatarInfo show_avatar_info_list = 9; + uint32 uid = 11; +} \ No newline at end of file diff --git a/proto/GetFriendShowNameCardInfoRsp.proto b/proto/GetFriendShowNameCardInfoRsp.proto index 8f35d5d0..fb04f30d 100644 --- a/proto/GetFriendShowNameCardInfoRsp.proto +++ b/proto/GetFriendShowNameCardInfoRsp.proto @@ -1,10 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// cmdid: 4963 -// BEOHCCALCPI -message GetFriendShowNameCardInfoRsp { - repeated uint32 show_name_card_id_list = 13; - int32 retcode = 3; - uint32 uid = 14; -} +// Version: 5.0 +// CmdId: 1685 + +message GetFriendShowNameCardInfoRsp { + uint32 uid = 6; + repeated uint32 show_name_card_id_list = 7; + int32 retcode = 10; +} \ No newline at end of file diff --git a/proto/GetFurnitureCurModuleArrangeCountReq.proto b/proto/GetFurnitureCurModuleArrangeCountReq.proto index fda9d185..f3cc2acc 100644 --- a/proto/GetFurnitureCurModuleArrangeCountReq.proto +++ b/proto/GetFurnitureCurModuleArrangeCountReq.proto @@ -1,22 +1,8 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// CmdId: 27516 -// Obf: KPANNNCEOKM -message GetFurnitureCurModuleArrangeCountReq { -} +// Version: 5.0 +// CmdId: 22795 + +message GetFurnitureCurModuleArrangeCountReq { +} \ No newline at end of file diff --git a/proto/GetGachaInfoReq.proto b/proto/GetGachaInfoReq.proto index 86aa199c..d983d887 100644 --- a/proto/GetGachaInfoReq.proto +++ b/proto/GetGachaInfoReq.proto @@ -1,9 +1,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 7728 -// CmdId: 2098 -// Version: 4.7.0 -// Obfs: CAGMMOKPNJH -message GetGachaInfoReq { -} +message GetGachaInfoReq { +} \ No newline at end of file diff --git a/proto/GetGachaInfoRsp.proto b/proto/GetGachaInfoRsp.proto index 15784335..85dd78c5 100644 --- a/proto/GetGachaInfoRsp.proto +++ b/proto/GetGachaInfoRsp.proto @@ -1,14 +1,16 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 9090 + import "GachaInfo.proto"; -// 4.7.0 -// cmdid: 26742 -// AKCGBLHGPED -message GetGachaInfoRsp { - uint32 gacha_random = 6; - bool is_under_minors_restrict = 10; - int32 retcode = 11; - uint32 daily_gacha_times = 12; - repeated GachaInfo gacha_info_list = 13; - bool is_under_general_restrict = 14; -} + +message GetGachaInfoRsp { + uint32 gacha_random = 1; + int32 retcode = 2; + repeated GachaInfo gacha_info_list = 4; + bool is_under_minors_restrict = 10; + bool is_under_general_restrict = 12; + uint32 daily_gacha_times = 15; +} \ No newline at end of file diff --git a/proto/GetInvestigationMonsterRsp.proto b/proto/GetInvestigationMonsterRsp.proto index 7b965760..d2fb33f7 100644 --- a/proto/GetInvestigationMonsterRsp.proto +++ b/proto/GetInvestigationMonsterRsp.proto @@ -1,14 +1,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 21253 import "InvestigationMonster.proto"; -// CmdId: 25460 -// Version: 4.7.0 -// Obfs: BMKAHHPHDGG -message GetInvestigationMonsterRsp { - int32 retcode = 12; - repeated InvestigationMonster monster_list = 5; - bool is_for_mark = 1; -} \ No newline at end of file +message GetInvestigationMonsterRsp { + repeated InvestigationMonster monster_list = 4; + bool kis_for_mark = 13; + int32 retcode = 15; +} \ No newline at end of file diff --git a/proto/GetMailItemReq.proto b/proto/GetMailItemReq.proto index f56d9f8b..c93fa3cd 100644 --- a/proto/GetMailItemReq.proto +++ b/proto/GetMailItemReq.proto @@ -1,10 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 8354 -// CmdId: 7230 -// Version: 4.6.0 -// Obfs: OFALDGJHMKE -message GetMailItemReq { - repeated uint32 mail_id_list = 8; -} +message GetMailItemReq { + repeated uint32 mail_id_list = 1; +} \ No newline at end of file diff --git a/proto/GetMailItemRsp.proto b/proto/GetMailItemRsp.proto index cb5ffdc1..ce14d248 100644 --- a/proto/GetMailItemRsp.proto +++ b/proto/GetMailItemRsp.proto @@ -1,14 +1,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 9691 import "EquipParam.proto"; -// CmdId: 940 -// Version: 4.7.0 -// Obfs: ? -message GetMailItemRsp { - int32 retcode = 6; - repeated uint32 mail_id_list = 4; - repeated EquipParam item_list = 15; -} +message GetMailItemRsp { + repeated uint32 mail_id_list = 4; + repeated EquipParam item_list = 9; + int32 retcode = 14; +} \ No newline at end of file diff --git a/proto/GetMapAreaRsp.proto b/proto/GetMapAreaRsp.proto index c9cf6432..27c0323d 100644 --- a/proto/GetMapAreaRsp.proto +++ b/proto/GetMapAreaRsp.proto @@ -1,9 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 22235 + import "MapAreaInfo.proto"; -// CmdId: 26944 -// Obf: OOAPOAEHAAM -message GetMapAreaRsp { - repeated MapAreaInfo map_area_info_list = 8; - int32 retcode = 13; -} + +message GetMapAreaRsp { + int32 retcode = 14; + repeated MapAreaInfo map_area_info_list = 15; +} \ No newline at end of file diff --git a/proto/GetOnlinePlayerListReq.proto b/proto/GetOnlinePlayerListReq.proto index 09f57aae..f432b797 100644 --- a/proto/GetOnlinePlayerListReq.proto +++ b/proto/GetOnlinePlayerListReq.proto @@ -1,6 +1,8 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// CmdId: 22525 (4.7.0) -// Obf: DBNCNMAKDMK -message GetOnlinePlayerListReq { -} +// Version: 5.0 +// CmdId: 27044 + +message GetOnlinePlayerListReq { +} \ No newline at end of file diff --git a/proto/GetOnlinePlayerListRsp.proto b/proto/GetOnlinePlayerListRsp.proto index d4e47cb8..c1072db5 100644 --- a/proto/GetOnlinePlayerListRsp.proto +++ b/proto/GetOnlinePlayerListRsp.proto @@ -1,11 +1,13 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 9049 + import "OnlinePlayerInfo.proto"; -// CmdId: 6813 (4.7.0) -// Obf: LFIPLDDDOMC -message GetOnlinePlayerListRsp { - uint32 param = 5; - repeated OnlinePlayerInfo player_info_list = 7; - int32 retcode = 12; -} +message GetOnlinePlayerListRsp { + uint32 param = 4; + repeated OnlinePlayerInfo player_info_list = 11; + int32 retcode = 14; +} \ No newline at end of file diff --git a/proto/GetPlayerAskFriendListReq.proto b/proto/GetPlayerAskFriendListReq.proto index 09be3404..423b6146 100644 --- a/proto/GetPlayerAskFriendListReq.proto +++ b/proto/GetPlayerAskFriendListReq.proto @@ -1,7 +1,8 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 23308 -// Obf: ? -message GetPlayerAskFriendListReq { -} +// Version: 5.0 +// CmdId: 1813 + +message GetPlayerAskFriendListReq { +} \ No newline at end of file diff --git a/proto/GetPlayerAskFriendListRsp.proto b/proto/GetPlayerAskFriendListRsp.proto index 45f353f4..839e2d5d 100644 --- a/proto/GetPlayerAskFriendListRsp.proto +++ b/proto/GetPlayerAskFriendListRsp.proto @@ -1,9 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 3915 + import "FriendBrief.proto"; -// CmdId: 8429 -// Obf: ? -message GetPlayerAskFriendListRsp { - repeated FriendBrief ask_friend_list = 6; - int32 retcode = 12; -} + +message GetPlayerAskFriendListRsp { + int32 retcode = 5; + repeated FriendBrief ask_friend_list = 10; +} \ No newline at end of file diff --git a/proto/GetPlayerBlacklistRsp.proto b/proto/GetPlayerBlacklistRsp.proto index 56143816..a8c0e26c 100644 --- a/proto/GetPlayerBlacklistRsp.proto +++ b/proto/GetPlayerBlacklistRsp.proto @@ -1,25 +1,12 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 23797 + import "FriendBrief.proto"; -// CmdId: 20310 -// Obf: NFLFLEHNLAJ -message GetPlayerBlacklistRsp { - repeated FriendBrief blacklist = 4; - int32 retcode = 10; -} + +message GetPlayerBlacklistRsp { + int32 retcode = 7; + repeated FriendBrief blacklist = 15; +} \ No newline at end of file diff --git a/proto/GetPlayerFriendListReq.proto b/proto/GetPlayerFriendListReq.proto index dca7dd1d..35e5214e 100644 --- a/proto/GetPlayerFriendListReq.proto +++ b/proto/GetPlayerFriendListReq.proto @@ -1,5 +1,8 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 ? -message GetPlayerFriendListReq { -} \ No newline at end of file +// Version: 5.0 +// CmdId: 21607 + +message GetPlayerFriendListReq { +} \ No newline at end of file diff --git a/proto/GetPlayerFriendListRsp.proto b/proto/GetPlayerFriendListRsp.proto index 9d364cc3..d6db2711 100644 --- a/proto/GetPlayerFriendListRsp.proto +++ b/proto/GetPlayerFriendListRsp.proto @@ -1,8 +1,13 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 893 + import "FriendBrief.proto"; -// 4.7.0 -message GetPlayerFriendListRsp { - repeated FriendBrief friend_list = 1; - repeated FriendBrief ask_friend_list = 2; -} \ No newline at end of file + +message GetPlayerFriendListRsp { + int32 retcode = 1; + repeated FriendBrief friend_list = 4; + repeated FriendBrief ask_friend_list = 7; +} \ No newline at end of file diff --git a/proto/GetPlayerHomeCompInfoReq.proto b/proto/GetPlayerHomeCompInfoReq.proto index d403eec0..a6efc849 100644 --- a/proto/GetPlayerHomeCompInfoReq.proto +++ b/proto/GetPlayerHomeCompInfoReq.proto @@ -1,22 +1,8 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// CmdId: 3709 -// Obf: DCHBFDKENHG -message GetPlayerHomeCompInfoReq { -} +// Version: 5.0 +// CmdId: 23660 + +message GetPlayerHomeCompInfoReq { +} \ No newline at end of file diff --git a/proto/GetPlayerSocialDetailReq.proto b/proto/GetPlayerSocialDetailReq.proto index 8413e1d2..a1775a27 100644 --- a/proto/GetPlayerSocialDetailReq.proto +++ b/proto/GetPlayerSocialDetailReq.proto @@ -1,8 +1,9 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 3597 - -// 4.7.0 -message GetPlayerSocialDetailReq { - uint32 uid = 4; -} \ No newline at end of file +message GetPlayerSocialDetailReq { + uint32 uid = 14; +} \ No newline at end of file diff --git a/proto/GetPlayerSocialDetailRsp.proto b/proto/GetPlayerSocialDetailRsp.proto index 0555469c..7d562d9f 100644 --- a/proto/GetPlayerSocialDetailRsp.proto +++ b/proto/GetPlayerSocialDetailRsp.proto @@ -1,11 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 1771 import "SocialDetail.proto"; -// 4.7.0 -// CmdId: 1804 -message GetPlayerSocialDetailRsp { - int32 retcode = 1; - SocialDetail detail_data = 13; -} \ No newline at end of file +message GetPlayerSocialDetailRsp { + int32 retcode = 5; + SocialDetail detail_data = 12; +} \ No newline at end of file diff --git a/proto/GetPlayerTokenReq.proto b/proto/GetPlayerTokenReq.proto index 15cba15b..c679e736 100644 --- a/proto/GetPlayerTokenReq.proto +++ b/proto/GetPlayerTokenReq.proto @@ -2,26 +2,26 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 6013 +// CmdId: 6013 message GetPlayerTokenReq { string HCJGLLHFCMA = 1304; - string KAMJIJOLFKJ = 13; + string online_id = 13; string BPFIMEKJANE = 9; string country_code = 1; string account_token = 4; - string MMDPDOOCOCO = 10; + string psn_id = 10; string JLCDDOJGKKG = 1528; string account_uid = 3; string client_rand_key = 94; string BDGFMEIEHOD = 5; string CEMENPADOPP = 7; - string JCIMGDHMMLN = 594; - string ADFHNBPGAGM = 1804; + string birthday = 594; + string gate_ticket = 1804; uint32 platform_type = 2; uint32 IKKKLHICPMF = 12; uint32 account_type = 8; - uint32 OCINFHOJCEA = 15; + uint32 channel_id = 15; uint32 CIJPMGMCJBA = 1776; uint32 uid = 6; uint32 MPGMOFLCEOF = 1730; diff --git a/proto/GetPlayerTokenRsp.proto b/proto/GetPlayerTokenRsp.proto index 13b4be0b..e4c924c6 100644 --- a/proto/GetPlayerTokenRsp.proto +++ b/proto/GetPlayerTokenRsp.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 24174 +// CmdId: 24174 import "StopServerInfo.proto"; @@ -25,7 +25,7 @@ message GetPlayerTokenRsp { string server_rand_key = 68; bool AKODFAIGJCE = 206; uint32 MPGMOFLCEOF = 267; - uint32 OCINFHOJCEA = 290; + uint32 channel_id = 290; uint32 key_id = 398; bool GCDGEKAONGD = 440; string KNCFLPGOMNI = 496; @@ -40,9 +40,9 @@ message GetPlayerTokenRsp { string country_code = 1269; string game_biz = 1670; repeated uint32 finish_collection_id_list = 1684; - string JCIMGDHMMLN = 1735; + string birthday = 1735; string CEMENPADOPP = 1871; string sign = 1885; - string MMDPDOOCOCO = 1954; + string psn_id = 1954; string JLCDDOJGKKG = 2042; } \ No newline at end of file diff --git a/proto/GetProfilePictureDataReq.proto b/proto/GetProfilePictureDataReq.proto index 8cb47f3e..242f072d 100644 --- a/proto/GetProfilePictureDataReq.proto +++ b/proto/GetProfilePictureDataReq.proto @@ -1,6 +1,8 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message GetProfilePictureDataReq { -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 22511 + +message GetProfilePictureDataReq { +} \ No newline at end of file diff --git a/proto/GetProfilePictureDataRsp.proto b/proto/GetProfilePictureDataRsp.proto index d3db8fd2..93f96266 100644 --- a/proto/GetProfilePictureDataRsp.proto +++ b/proto/GetProfilePictureDataRsp.proto @@ -1,8 +1,10 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message GetProfilePictureDataRsp { - repeated uint32 special_profile_picture_list = 7; - int32 retcode = 13; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 1846 + +message GetProfilePictureDataRsp { + repeated uint32 special_profile_picture_list = 3; + int32 retcode = 11; +} \ No newline at end of file diff --git a/proto/GetRegionSearchReq.proto b/proto/GetRegionSearchReq.proto index bc20ef82..345ba0c2 100644 --- a/proto/GetRegionSearchReq.proto +++ b/proto/GetRegionSearchReq.proto @@ -1,22 +1,8 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// CmdId: 2030 -// Obf: BHEPKPEBEGB -message GetRegionSearchReq { -} +// Version: 5.0 +// CmdId: 27191 + +message GetRegionSearchReq { +} \ No newline at end of file diff --git a/proto/GetSceneAreaReq.proto b/proto/GetSceneAreaReq.proto index 11faa4fe..640a0286 100644 --- a/proto/GetSceneAreaReq.proto +++ b/proto/GetSceneAreaReq.proto @@ -1,8 +1,10 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message GetSceneAreaReq { - uint32 scene_id = 7; - uint32 belong_uid = 9; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 8189 + +message GetSceneAreaReq { + uint32 scene_id = 13; + uint32 belong_uid = 11; +} \ No newline at end of file diff --git a/proto/GetSceneAreaRsp.proto b/proto/GetSceneAreaRsp.proto index 9fb4d3e6..87f8334d 100644 --- a/proto/GetSceneAreaRsp.proto +++ b/proto/GetSceneAreaRsp.proto @@ -1,12 +1,14 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 27301 import "CityInfo.proto"; -// 4.7.0 -message GetSceneAreaRsp { - repeated CityInfo city_info_list = 15; - repeated uint32 area_id_list = 3; - uint32 scene_id = 5; - int32 retcode = 6; -} \ No newline at end of file +message GetSceneAreaRsp { + uint32 scene_id = 1; + repeated CityInfo city_info_list = 6; + int32 retcode = 7; + repeated uint32 area_id_list = 10; +} \ No newline at end of file diff --git a/proto/GetScenePointReq.proto b/proto/GetScenePointReq.proto index a476da4c..cdba4261 100644 --- a/proto/GetScenePointReq.proto +++ b/proto/GetScenePointReq.proto @@ -1,9 +1,11 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message GetScenePointReq { - uint32 belong_uid = 10; - uint32 scene_id = 1; - bool is_relogin = 3; -} +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 23449 + +message GetScenePointReq { + bool is_new_player = 12; + uint32 belong_uid = 11; + uint32 scene_id = 8; +} \ No newline at end of file diff --git a/proto/GetScenePointRsp.proto b/proto/GetScenePointRsp.proto index 01b33d83..55200f43 100644 --- a/proto/GetScenePointRsp.proto +++ b/proto/GetScenePointRsp.proto @@ -1,20 +1,21 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 7225 -message GetScenePointRsp { - uint32 scene_id = 1; - int32 retcode = 2; - repeated uint32 MLNFAFFPPOP = 3; - repeated uint32 GLPBJFLCKCL = 4; - repeated uint32 unlock_area_list = 6; - bool LEPDAGALLND = 7; - repeated uint32 FJNNNLIJJBL = 8; - uint32 belong_uid = 9; - repeated uint32 unhide_point_list = 10; - repeated uint32 NEAHFHGMEKK = 11; - repeated uint32 DGFPDBCEBHH = 12; - repeated uint32 CKNEJGMGCKL = 13; - repeated uint32 unlocked_point_list = 14; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 29349 + +message GetScenePointRsp { + repeated uint32 unlocked_point_list = 1; + repeated uint32 FELMBEACBLB = 2; + repeated uint32 locked_point_list = 4; + repeated uint32 point_list = 5; + uint32 belong_uid = 6; + int32 retcode = 8; + uint32 scene_id = 9; + repeated uint32 unhide_point_list = 10; + repeated uint32 BEOCPMCPHJH = 11; + repeated uint32 DOGJLOBEEPC = 12; + repeated uint32 unlock_area_list = 13; + repeated uint32 OGLOLEOEAGD = 14; + bool is_new_player = 15; +} \ No newline at end of file diff --git a/proto/GetShopReq.proto b/proto/GetShopReq.proto index 6cd69ec7..7e9e305b 100644 --- a/proto/GetShopReq.proto +++ b/proto/GetShopReq.proto @@ -1,8 +1,9 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 5877 -// ? -message GetShopReq { - uint32 shop_type = 14; -} \ No newline at end of file +// Version: 5.0 +// CmdId: 4619 + +message GetShopReq { + uint32 shop_type = 14; +} \ No newline at end of file diff --git a/proto/GetShopRsp.proto b/proto/GetShopRsp.proto index d99ca376..d6138e3f 100644 --- a/proto/GetShopRsp.proto +++ b/proto/GetShopRsp.proto @@ -1,9 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 5665 + import "Shop.proto"; -// 4.7.0 -// CmdId: 27397 -message GetShopRsp { - Shop shop = 11; - int32 retcode = 14; -} \ No newline at end of file + +message GetShopRsp { + Shop shop = 1; + int32 retcode = 12; +} \ No newline at end of file diff --git a/proto/GetWidgetSlotReq.proto b/proto/GetWidgetSlotReq.proto index 38a95fb6..3a578067 100644 --- a/proto/GetWidgetSlotReq.proto +++ b/proto/GetWidgetSlotReq.proto @@ -1,7 +1,8 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 21085 ? -// Obf: LNKPLMHMKAP -message GetWidgetSlotReq { -} +// Version: 5.0 +// CmdId: 9388 + +message GetWidgetSlotReq { +} \ No newline at end of file diff --git a/proto/GetWidgetSlotRsp.proto b/proto/GetWidgetSlotRsp.proto index 6fd0d59a..015c51de 100644 --- a/proto/GetWidgetSlotRsp.proto +++ b/proto/GetWidgetSlotRsp.proto @@ -1,10 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 5441 + import "WidgetSlotData.proto"; -// 4.7.0 -// CmdId: 5626 -// Obf: AKECNEMFPMJ -message GetWidgetSlotRsp { - repeated WidgetSlotData slot_list = 2; - int32 retcode = 14; -} + +message GetWidgetSlotRsp { + int32 retcode = 9; + repeated WidgetSlotData slot_list = 10; +} \ No newline at end of file diff --git a/proto/HitColliderType.proto b/proto/HitColliderType.proto index 53704934..354cf9e9 100644 --- a/proto/HitColliderType.proto +++ b/proto/HitColliderType.proto @@ -1,10 +1,11 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -//obf: LPNDGGEHLED -enum HitColliderType { - HIT_COLLIDER_INVALID = 0; - HIT_COLLIDER_HIT_BOX = 1; - HIT_COLLIDER_WET_HIT_BOX = 2; - HIT_COLLIDER_HEAD_BOX = 3; -} +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + +enum HitColliderType { + HIT_COLLIDER_INVALID = 0; + HIT_COLLIDER_HIT_BOX = 1; + HIT_COLLIDER_WET_HIT_BOX = 2; + HIT_COLLIDER_HEAD_BOX = 3; +} \ No newline at end of file diff --git a/proto/HitCollision.proto b/proto/HitCollision.proto index 11c53a7f..1e84b3c9 100644 --- a/proto/HitCollision.proto +++ b/proto/HitCollision.proto @@ -1,15 +1,16 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 import "Vector.proto"; import "HitColliderType.proto"; -// 4.7.0 -message HitCollision { - int32 hit_box_index = 1; - float NAKEAILPMBJ = 5; - Vector JBCEFHPEKFB = 7; - Vector CGKAKMHHOOD = 9; - HitColliderType hit_collider_type = 13; - float COCGHGIACNL = 14; -} +message HitCollision { + float DDLIENJBAKB = 3; + Vector hit_point = 5; + HitColliderType hit_collider_type = 6; + float GGHMAHBOMKE = 7; + Vector EDOEECEACHH = 10; + int32 hit_box_index = 12; +} \ No newline at end of file diff --git a/proto/HitTreeNotify.proto b/proto/HitTreeNotify.proto index 95bdccd4..df1dad5c 100644 --- a/proto/HitTreeNotify.proto +++ b/proto/HitTreeNotify.proto @@ -1,12 +1,13 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 20542 + import "Vector.proto"; -// 4.7.0 -// CmdId: 2178 -// PGGDFNLKJPC -message HitTreeNotify { - Vector drop_pos = 9; - Vector tree_pos = 11; - uint32 tree_type = 4; -} +message HitTreeNotify { + Vector drop_pos = 7; + Vector tree_pos = 3; + uint32 tree_type = 4; +} \ No newline at end of file diff --git a/proto/HomeAllUnlockedBgmIdListNotify.proto b/proto/HomeAllUnlockedBgmIdListNotify.proto index 58fa5808..24e75cef 100644 --- a/proto/HomeAllUnlockedBgmIdListNotify.proto +++ b/proto/HomeAllUnlockedBgmIdListNotify.proto @@ -1,9 +1,10 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.6.0 -// Obf: JCFCMHLOEAE -// CmdId: 4053 -message HomeAllUnlockedBgmIdListNotify { - repeated uint32 all_unlocked_bgm_id_list = 4; -} +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 22324 + +message HomeAllUnlockedBgmIdListNotify { + repeated uint32 all_unlocked_bgm_id_list = 6; + bool PFOKFHLOKEJ = 7; +} \ No newline at end of file diff --git a/proto/HomeAnimalData.proto b/proto/HomeAnimalData.proto index 5994e670..24656fec 100644 --- a/proto/HomeAnimalData.proto +++ b/proto/HomeAnimalData.proto @@ -1,10 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + import "Vector.proto"; -// 4.7.0 -//obf: KGGLMIJGNOH -message HomeAnimalData { - Vector spawn_rot = 3; - uint32 furniture_id = 13; - Vector spawn_pos = 8; -} + +message HomeAnimalData { + uint32 furniture_id = 5; + Vector spawn_pos = 12; + Vector spawn_rot = 15; +} \ No newline at end of file diff --git a/proto/HomeAvatarAllFinishRewardNotify.proto b/proto/HomeAvatarAllFinishRewardNotify.proto index 90ea6711..cec49f6c 100644 --- a/proto/HomeAvatarAllFinishRewardNotify.proto +++ b/proto/HomeAvatarAllFinishRewardNotify.proto @@ -1,23 +1,10 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// CmdId: 9497 -// Obf: PLHINAALPPO -message HomeAvatarAllFinishRewardNotify { - repeated uint32 event_id_list = 12; -} +// Version: 5.0 +// CmdId: 9322 + +message HomeAvatarAllFinishRewardNotify { + repeated uint32 event_id_list = 1; + bool PFOKFHLOKEJ = 11; +} \ No newline at end of file diff --git a/proto/HomeAvatarCostumeChangeNotify.proto b/proto/HomeAvatarCostumeChangeNotify.proto index 3844b537..f0255560 100644 --- a/proto/HomeAvatarCostumeChangeNotify.proto +++ b/proto/HomeAvatarCostumeChangeNotify.proto @@ -1,24 +1,10 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// CmdId: 28208 -// Obf: BKMJMAFFLFP -message HomeAvatarCostumeChangeNotify { - uint32 costume_id = 7; - uint32 avatar_id = 11; -} +// Version: 5.0 +// CmdId: 7004 + +message HomeAvatarCostumeChangeNotify { + uint32 costume_id = 13; + uint32 avatar_id = 15; +} \ No newline at end of file diff --git a/proto/HomeAvatarRewardEventGetReq.proto b/proto/HomeAvatarRewardEventGetReq.proto index ceb2205b..5a531fdd 100644 --- a/proto/HomeAvatarRewardEventGetReq.proto +++ b/proto/HomeAvatarRewardEventGetReq.proto @@ -1,24 +1,10 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// CmdId: 26566 -// Obf: BKHPKONPAPN -message HomeAvatarRewardEventGetReq { - uint32 avatar_id = 9; - uint32 event_id = 10; -} +// Version: 5.0 +// CmdId: 7571 + +message HomeAvatarRewardEventGetReq { + uint32 event_id = 13; + uint32 avatar_id = 10; +} \ No newline at end of file diff --git a/proto/HomeAvatarRewardEventGetRsp.proto b/proto/HomeAvatarRewardEventGetRsp.proto index 26acac02..f63fb335 100644 --- a/proto/HomeAvatarRewardEventGetRsp.proto +++ b/proto/HomeAvatarRewardEventGetRsp.proto @@ -1,26 +1,13 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 5969 + import "ItemParam.proto"; -// CmdId: 25571 -// Obf: BDMGFBJLCFC -message HomeAvatarRewardEventGetRsp { - repeated ItemParam item_list = 15; - int32 retcode = 10; - uint32 event_id = 13; -} + +message HomeAvatarRewardEventGetRsp { + uint32 event_id = 2; + repeated ItemParam item_list = 10; + int32 retcode = 11; +} \ No newline at end of file diff --git a/proto/HomeAvatarRewardEventInfo.proto b/proto/HomeAvatarRewardEventInfo.proto index 505c9b9f..4d1f01fb 100644 --- a/proto/HomeAvatarRewardEventInfo.proto +++ b/proto/HomeAvatarRewardEventInfo.proto @@ -1,26 +1,12 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// Obf: HOLFHPKHFLL -message HomeAvatarRewardEventInfo { - uint32 guid = 11; - uint32 event_id = 8; - uint32 avatar_id = 5; - uint32 random_position = 1; - uint32 suite_id = 3; -} +// Version: 5.0 + +message HomeAvatarRewardEventInfo { + uint32 avatar_id = 1; + uint32 suite_id = 7; + uint32 guid = 8; + uint32 random_position = 12; + uint32 event_id = 15; +} \ No newline at end of file diff --git a/proto/HomeAvatarRewardEventNotify.proto b/proto/HomeAvatarRewardEventNotify.proto index 2cf49897..33c09b51 100644 --- a/proto/HomeAvatarRewardEventNotify.proto +++ b/proto/HomeAvatarRewardEventNotify.proto @@ -1,26 +1,13 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 1329 + import "HomeAvatarRewardEventInfo.proto"; -// CmdId: 2640 -// Obf: DCCPJJPIGAB -message HomeAvatarRewardEventNotify { - HomeAvatarRewardEventInfo reward_event = 4; - repeated HomeAvatarRewardEventInfo pending_list = 12; - bool is_event_trigger = 7; -} + +message HomeAvatarRewardEventNotify { + bool is_event_trigger = 1; + HomeAvatarRewardEventInfo reward_event = 4; + repeated HomeAvatarRewardEventInfo pending_list = 6; +} \ No newline at end of file diff --git a/proto/HomeAvatarSummonAllEventNotify.proto b/proto/HomeAvatarSummonAllEventNotify.proto index fd73aa12..2133ac0f 100644 --- a/proto/HomeAvatarSummonAllEventNotify.proto +++ b/proto/HomeAvatarSummonAllEventNotify.proto @@ -1,24 +1,11 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 22990 + import "HomeAvatarSummonEventInfo.proto"; -// CmdId: 6401 -// Obf: BPCEHNJGDLB -message HomeAvatarSummonAllEventNotify { - repeated HomeAvatarSummonEventInfo summon_event_list = 15; -} + +message HomeAvatarSummonAllEventNotify { + repeated HomeAvatarSummonEventInfo summon_event_list = 12; +} \ No newline at end of file diff --git a/proto/HomeAvatarSummonEventInfo.proto b/proto/HomeAvatarSummonEventInfo.proto index b64807b2..1d89eb4a 100644 --- a/proto/HomeAvatarSummonEventInfo.proto +++ b/proto/HomeAvatarSummonEventInfo.proto @@ -1,27 +1,13 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// Obf: JMKEALMLNEH -message HomeAvatarSummonEventInfo { - uint32 guid = 2; - uint32 event_over_time = 4; - uint32 event_id = 6; - uint32 suit_id = 9; - uint32 avatar_id = 14; - uint32 random_position = 12; -} +// Version: 5.0 + +message HomeAvatarSummonEventInfo { + uint32 event_id = 2; + uint32 guid = 4; + uint32 event_over_time = 7; + uint32 suit_id = 9; + uint32 random_position = 11; + uint32 avatar_id = 14; +} \ No newline at end of file diff --git a/proto/HomeAvatarSummonEventReq.proto b/proto/HomeAvatarSummonEventReq.proto index 2f0e01f2..e985e21a 100644 --- a/proto/HomeAvatarSummonEventReq.proto +++ b/proto/HomeAvatarSummonEventReq.proto @@ -1,25 +1,11 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// CmdId: 9238 -// Obf: JIJKLANOOHE -message HomeAvatarSummonEventReq { - uint32 avatar_id = 4; - uint32 suit_id = 1; - uint32 guid = 5; -} +// Version: 5.0 +// CmdId: 27629 + +message HomeAvatarSummonEventReq { + uint32 guid = 6; + uint32 suit_id = 14; + uint32 avatar_id = 3; +} \ No newline at end of file diff --git a/proto/HomeAvatarTalkFinishInfo.proto b/proto/HomeAvatarTalkFinishInfo.proto index 7e4b09ce..7a2f7b16 100644 --- a/proto/HomeAvatarTalkFinishInfo.proto +++ b/proto/HomeAvatarTalkFinishInfo.proto @@ -1,8 +1,9 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 ? -// Obf: ?? -message HomeAvatarTalkFinishInfo { - uint32 avatar_id = 11; - repeated uint32 finish_talk_id_list = 13; -} +// Version: 5.0 + +message HomeAvatarTalkFinishInfo { + repeated uint32 finish_talk_id_list = 1; + uint32 avatar_id = 2; +} \ No newline at end of file diff --git a/proto/HomeAvatarTalkFinishInfoNotify.proto b/proto/HomeAvatarTalkFinishInfoNotify.proto index 1f69a1a6..db74c39c 100644 --- a/proto/HomeAvatarTalkFinishInfoNotify.proto +++ b/proto/HomeAvatarTalkFinishInfoNotify.proto @@ -1,11 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 20880 import "HomeAvatarTalkFinishInfo.proto"; -// 4.6.0 -// Obf: DJPAKLKHNIM -// CmdId: 20101 -message HomeAvatarTalkFinishInfoNotify { - repeated HomeAvatarTalkFinishInfo avatar_talk_info_list = 14; -} +message HomeAvatarTalkFinishInfoNotify { + repeated HomeAvatarTalkFinishInfo avatar_talk_info_list = 12; +} \ No newline at end of file diff --git a/proto/HomeAvatarTalkRsp.proto b/proto/HomeAvatarTalkRsp.proto index 70ebde09..7ffc9c90 100644 --- a/proto/HomeAvatarTalkRsp.proto +++ b/proto/HomeAvatarTalkRsp.proto @@ -1,12 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 213 import "HomeAvatarTalkFinishInfo.proto"; -// 4.6.0 -// Obf: OCCCHPCLAMM -// CmdId: 23974 -message HomeAvatarTalkRsp { - HomeAvatarTalkFinishInfo avatar_talk_info = 5; - int32 retcode = 12; -} +message HomeAvatarTalkRsp { + int32 retcode = 3; + HomeAvatarTalkFinishInfo avatar_talk_info = 8; +} \ No newline at end of file diff --git a/proto/HomeBasicInfo.proto b/proto/HomeBasicInfo.proto index 76f02d12..4f6ff9c4 100644 --- a/proto/HomeBasicInfo.proto +++ b/proto/HomeBasicInfo.proto @@ -1,16 +1,18 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + import "HomeLimitedShopInfo.proto"; -// 4.7.0 -// ? -message HomeBasicInfo { - uint32 cur_room_scene_id = 12; - uint32 level = 2; - HomeLimitedShopInfo limited_shop_info = 10; - uint32 cur_module_id = 4; - bool is_in_edit_mode = 5; - uint64 exp = 11; - uint32 uk1 = 3; - uint32 home_owner_uid = 14; - string owner_nick_name = 15; -} + +message HomeBasicInfo { + string owner_nick_name = 2; + uint64 exp = 4; + uint32 cur_module_id = 7; // 13 + HomeLimitedShopInfo limited_shop_info = 9; + uint32 level = 11; + uint32 home_owner_uid = 12; + uint32 FCMIKLCEAKA = 13; + bool is_in_edit_mode = 14; + uint32 cur_room_scene_id = 15; +} \ No newline at end of file diff --git a/proto/HomeBasicInfoNotify.proto b/proto/HomeBasicInfoNotify.proto index c54bc3e6..bcb13f0f 100644 --- a/proto/HomeBasicInfoNotify.proto +++ b/proto/HomeBasicInfoNotify.proto @@ -1,8 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 20840 + import "HomeBasicInfo.proto"; -// 4.7.0 -// CmdId: 2810 -message HomeBasicInfoNotify { - HomeBasicInfo basic_info = 3; -} + +message HomeBasicInfoNotify { + HomeBasicInfo basic_info = 8; +} \ No newline at end of file diff --git a/proto/HomeBlockArrangementInfo.proto b/proto/HomeBlockArrangementInfo.proto index f8ae486d..7adc3b43 100644 --- a/proto/HomeBlockArrangementInfo.proto +++ b/proto/HomeBlockArrangementInfo.proto @@ -1,29 +1,30 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 import "HomeFurnitureData.proto"; +import "HomeBlockDotPattern.proto"; import "HomeFurnitureGroupData.proto"; +import "HomeNpcData.proto"; import "HomeAnimalData.proto"; import "HomeFurnitureCustomSuiteData.proto"; -import "HomeNpcData.proto"; -import "HomeBlockFieldData.proto"; -import "HomeBlockDotPattern.proto"; import "HomeFurnitureSuiteData.proto"; import "WeekendDjinnInfo.proto"; -// 4.7.0 -// PHDDAJFBBNH -message HomeBlockArrangementInfo { - repeated HomeFurnitureGroupData furniture_group_list = 9; - bool is_unlocked = 7; - uint32 block_id = 4; // ok - repeated HomeFurnitureData deployFurniureList = 8; - repeated HomeAnimalData deploy_animal_list = 14; - repeated HomeFurnitureCustomSuiteData furniture_custom_suite_list = 12; - repeated HomeNpcData deploy_npc_list = 1; - uint32 comfort_value = 15; - repeated HomeBlockFieldData field_list = 10; // ok - repeated HomeBlockDotPattern dot_pattern_list = 5; - repeated HomeFurnitureData persistentFurnitureList = 13; //? - repeated HomeFurnitureSuiteData furniture_suite_list = 11; - repeated WeekendDjinnInfo weekend_djinn_info_list = 2; -} +import "HomeBlockFieldData.proto"; + +message HomeBlockArrangementInfo { + uint32 comfort_value = 1; + repeated HomeFurnitureData deploy_furniure_list = 2; + repeated HomeBlockDotPattern dot_pattern_list = 3; + repeated HomeFurnitureData persistent_furniture_list = 4; + repeated HomeFurnitureGroupData furniture_group_list = 6; + repeated HomeNpcData deploy_npc_list = 8; + repeated HomeAnimalData deploy_animal_list = 9; + repeated HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10; + repeated HomeFurnitureSuiteData furniture_suite_list = 11; + uint32 block_id = 12; + bool is_unlocked = 13; + repeated WeekendDjinnInfo weekend_djinn_info_list = 14; + repeated HomeBlockFieldData field_list = 15; +} \ No newline at end of file diff --git a/proto/HomeBlockDotPattern.proto b/proto/HomeBlockDotPattern.proto index dd2ce748..a4fa3485 100644 --- a/proto/HomeBlockDotPattern.proto +++ b/proto/HomeBlockDotPattern.proto @@ -1,9 +1,10 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -//obf: MGDMEIFPLON -message HomeBlockDotPattern { - bytes data = 12; - uint32 height = 7; - uint32 width = 5; -} +// Version: 5.0 + +message HomeBlockDotPattern { + uint32 height = 8; + bytes data = 14; + uint32 width = 15; +} \ No newline at end of file diff --git a/proto/HomeBlockFieldData.proto b/proto/HomeBlockFieldData.proto index 5c5b59fc..31242f9e 100644 --- a/proto/HomeBlockFieldData.proto +++ b/proto/HomeBlockFieldData.proto @@ -1,13 +1,15 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -import "Vector.proto"; +// Version: 5.0 + import "HomeBlockSubFieldData.proto"; -// 4.7.0 -//obf: CGGMBENMCFB -message HomeBlockFieldData { - uint32 guid = 2; - repeated HomeBlockSubFieldData sub_field_list = 13; - uint32 furniture_id = 14; - Vector rot = 5; - Vector pos = 10; -} +import "Vector.proto"; + +message HomeBlockFieldData { + repeated HomeBlockSubFieldData sub_field_list = 5; + uint32 furniture_id = 6; + uint32 guid = 7; + Vector rot = 12; + Vector pos = 14; +} \ No newline at end of file diff --git a/proto/HomeBlockSubFieldData.proto b/proto/HomeBlockSubFieldData.proto index 6a7d7d81..9b6f72dd 100644 --- a/proto/HomeBlockSubFieldData.proto +++ b/proto/HomeBlockSubFieldData.proto @@ -1,9 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + import "Vector.proto"; -// 4.7.0 -//obf: ? -message HomeBlockSubFieldData { - Vector pos = 8; - Vector rot = 4; -} + +message HomeBlockSubFieldData { + Vector rot = 1; + Vector pos = 5; +} \ No newline at end of file diff --git a/proto/HomeChangeBgmNotify.proto b/proto/HomeChangeBgmNotify.proto index deab8ee8..93d082a9 100644 --- a/proto/HomeChangeBgmNotify.proto +++ b/proto/HomeChangeBgmNotify.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.6.0 -// Obf: GCCDDDLMHBJ -// CmdId: 4213 -message HomeChangeBgmNotify { - uint32 bgm_id = 5; -} +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 29481 + +message HomeChangeBgmNotify { + uint32 bgm_id = 4; +} \ No newline at end of file diff --git a/proto/HomeChangeBgmReq.proto b/proto/HomeChangeBgmReq.proto index 670da8a0..70a51402 100644 --- a/proto/HomeChangeBgmReq.proto +++ b/proto/HomeChangeBgmReq.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.6.0 -// Obf: JLPKIHPFKEI -// CmdId: 26137 -message HomeChangeBgmReq { - uint32 bgm_id = 15; -} +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 4543 + +message HomeChangeBgmReq { + uint32 bgm_id = 13; +} \ No newline at end of file diff --git a/proto/HomeChangeEditModeReq.proto b/proto/HomeChangeEditModeReq.proto index 24079012..09ef6583 100644 --- a/proto/HomeChangeEditModeReq.proto +++ b/proto/HomeChangeEditModeReq.proto @@ -1,8 +1,9 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 23294 -// Obf: KNLANFFCNBA -message HomeChangeEditModeReq { - bool is_enter_edit_mode = 14; -} +// Version: 5.0 +// CmdId: 22458 + +message HomeChangeEditModeReq { + bool is_enter_edit_mode = 7; +} \ No newline at end of file diff --git a/proto/HomeChangeEditModeRsp.proto b/proto/HomeChangeEditModeRsp.proto index 33a9d315..c16617e6 100644 --- a/proto/HomeChangeEditModeRsp.proto +++ b/proto/HomeChangeEditModeRsp.proto @@ -1,9 +1,10 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 25696 -// Obf: NEAPAGMKHLL -message HomeChangeEditModeRsp { - int32 retcode = 10; - bool is_enter_edit_mode = 8; -} +// Version: 5.0 +// CmdId: 2916 + +message HomeChangeEditModeRsp { + bool is_enter_edit_mode = 9; + int32 retcode = 10; +} \ No newline at end of file diff --git a/proto/HomeChooseModuleReq.proto b/proto/HomeChooseModuleReq.proto index 06990f72..0616c667 100644 --- a/proto/HomeChooseModuleReq.proto +++ b/proto/HomeChooseModuleReq.proto @@ -1,8 +1,9 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 3660 -// BKGMDIIPJNJ -message HomeChooseModuleReq { - uint32 module_id = 7; -} +// Version: 5.0 +// CmdId: 8855 + +message HomeChooseModuleReq { + uint32 module_id = 13; +} \ No newline at end of file diff --git a/proto/HomeChooseModuleRsp.proto b/proto/HomeChooseModuleRsp.proto index 073b1ae9..75c4db96 100644 --- a/proto/HomeChooseModuleRsp.proto +++ b/proto/HomeChooseModuleRsp.proto @@ -1,9 +1,10 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 9238 -// EFJBIGCODCE -message HomeChooseModuleRsp { - uint32 module_id = 14; - int32 retcode = 11; -} +// Version: 5.0 +// CmdId: 2292 + +message HomeChooseModuleRsp { + int32 retcode = 1; + uint32 module_id = 12; +} \ No newline at end of file diff --git a/proto/HomeComfortInfoNotify.proto b/proto/HomeComfortInfoNotify.proto index 1505da91..8603d8b1 100644 --- a/proto/HomeComfortInfoNotify.proto +++ b/proto/HomeComfortInfoNotify.proto @@ -1,9 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 279 + import "HomeModuleComfortInfo.proto"; -// 4.7.0 -// cmdid: 7484 -// PHHFIFBIIHD -message HomeComfortInfoNotify { - repeated HomeModuleComfortInfo module_info_list = 11; -} + +message HomeComfortInfoNotify { + repeated HomeModuleComfortInfo module_info_list = 12; +} \ No newline at end of file diff --git a/proto/HomeEnterEditModeFinishReq.proto b/proto/HomeEnterEditModeFinishReq.proto index 151278f7..103d5474 100644 --- a/proto/HomeEnterEditModeFinishReq.proto +++ b/proto/HomeEnterEditModeFinishReq.proto @@ -1,22 +1,8 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// CmdId: 4149 -// Obf: NCEKAKPOPHC -message HomeEnterEditModeFinishReq { -} +// Version: 5.0 +// CmdId: 9796 + +message HomeEnterEditModeFinishReq { +} \ No newline at end of file diff --git a/proto/HomeEnterEditModeFinishRsp.proto b/proto/HomeEnterEditModeFinishRsp.proto index 25f15d2f..b1bf0199 100644 --- a/proto/HomeEnterEditModeFinishRsp.proto +++ b/proto/HomeEnterEditModeFinishRsp.proto @@ -1,23 +1,9 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// CmdId: 21433 -// Obf: CFJKONMEIIG -message HomeEnterEditModeFinishRsp { - int32 retcode = 1; -} +// Version: 5.0 +// CmdId: 28448 + +message HomeEnterEditModeFinishRsp { + int32 retcode = 12; +} \ No newline at end of file diff --git a/proto/HomeFurnitureCustomSuiteData.proto b/proto/HomeFurnitureCustomSuiteData.proto index e1e1ef50..e2278210 100644 --- a/proto/HomeFurnitureCustomSuiteData.proto +++ b/proto/HomeFurnitureCustomSuiteData.proto @@ -1,10 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + import "Vector.proto"; -// 4.7.0 -//obf: JOOLHBAEOAL? -message HomeFurnitureCustomSuiteData { - uint32 guid = 7; - repeated int32 included_furniture_index_list = 8; - Vector spawn_pos = 1; -} + +message HomeFurnitureCustomSuiteData { + Vector spawn_pos = 2; + repeated int32 included_furniture_index_list = 3; + uint32 guid = 12; +} \ No newline at end of file diff --git a/proto/HomeFurnitureData.proto b/proto/HomeFurnitureData.proto index 2ab97fc6..ad5f6b29 100644 --- a/proto/HomeFurnitureData.proto +++ b/proto/HomeFurnitureData.proto @@ -1,14 +1,15 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 import "Vector.proto"; -//obf: DJKBKLKPFML -message HomeFurnitureData { - uint32 version = 9; - int32 parent_furniture_index = 12; - Vector spawn_pos = 2; // 5 - Vector spawn_rot = 11; // 2 - uint32 furniture_id = 10; - uint32 guid = 5; -} +message HomeFurnitureData { + uint32 guid = 3; + Vector spawn_pos = 4; + uint32 furniture_id = 6; + uint32 version = 8; + int32 parent_furniture_index = 9; + Vector spawn_rot = 10; +} \ No newline at end of file diff --git a/proto/HomeFurnitureGroupData.proto b/proto/HomeFurnitureGroupData.proto index 1aa3d62c..351ecd6f 100644 --- a/proto/HomeFurnitureGroupData.proto +++ b/proto/HomeFurnitureGroupData.proto @@ -1,9 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + import "HomeFurnitureData.proto"; -// 4.7.0 -//obf: EMFNHCMLIGF -message HomeFurnitureGroupData { - repeated HomeFurnitureData virtual_furniure_list = 9; - uint32 group_furniture_index = 11; -} + +message HomeFurnitureGroupData { + repeated HomeFurnitureData virtual_furniure_list = 9; + uint32 group_furniture_index = 14; +} \ No newline at end of file diff --git a/proto/HomeFurnitureSuiteData.proto b/proto/HomeFurnitureSuiteData.proto index 4706ab14..d0551236 100644 --- a/proto/HomeFurnitureSuiteData.proto +++ b/proto/HomeFurnitureSuiteData.proto @@ -1,12 +1,14 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + import "Vector.proto"; -// 4.7.0 -//obf: GJMLNOHGMDG -message HomeFurnitureSuiteData { - repeated int32 included_furniture_index_list = 1; - uint32 guid = 2; - uint32 suite_id = 7; - bool is_allow_summon = 13; - Vector spawn_pos = 12; -} + +message HomeFurnitureSuiteData { + bool is_allow_summon = 4; + uint32 guid = 9; + uint32 suite_id = 11; + Vector spawn_pos = 12; + repeated int32 included_furniture_index_list = 15; +} \ No newline at end of file diff --git a/proto/HomeGetArrangementInfoReq.proto b/proto/HomeGetArrangementInfoReq.proto index d880e266..edb24749 100644 --- a/proto/HomeGetArrangementInfoReq.proto +++ b/proto/HomeGetArrangementInfoReq.proto @@ -1,23 +1,9 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// CmdId: 22421 -// Obf: NLOCIBLJBAO -message HomeGetArrangementInfoReq { - repeated uint32 scene_id_list = 15; -} +// Version: 5.0 +// CmdId: 24996 + +message HomeGetArrangementInfoReq { + repeated uint32 scene_id_list = 9; +} \ No newline at end of file diff --git a/proto/HomeGetArrangementInfoRsp.proto b/proto/HomeGetArrangementInfoRsp.proto index 3766db27..ab529330 100644 --- a/proto/HomeGetArrangementInfoRsp.proto +++ b/proto/HomeGetArrangementInfoRsp.proto @@ -1,10 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 9688 + import "HomeSceneArrangementInfo.proto"; -// 4.7.0 -// CmdId: 5806 -// Obf: DNMDGOBMGGN -message HomeGetArrangementInfoRsp { - repeated HomeSceneArrangementInfo scene_arrangement_info_list = 4; - int32 retcode = 7; -} + +message HomeGetArrangementInfoRsp { + int32 retcode = 4; + repeated HomeSceneArrangementInfo scene_arrangement_info_list = 11; +} \ No newline at end of file diff --git a/proto/HomeGetBasicInfoReq.proto b/proto/HomeGetBasicInfoReq.proto index f1381ec6..9a34857a 100644 --- a/proto/HomeGetBasicInfoReq.proto +++ b/proto/HomeGetBasicInfoReq.proto @@ -1,22 +1,8 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// CmdId: 27734 -// Obf: IEPBGIKMJFE -message HomeGetBasicInfoReq { -} +// Version: 5.0 +// CmdId: 9267 + +message HomeGetBasicInfoReq { +} \ No newline at end of file diff --git a/proto/HomeLimitedShopInfo.proto b/proto/HomeLimitedShopInfo.proto index aa854cef..abf449ee 100644 --- a/proto/HomeLimitedShopInfo.proto +++ b/proto/HomeLimitedShopInfo.proto @@ -1,12 +1,15 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + import "Vector.proto"; -// 4.7.0 -message HomeLimitedShopInfo { - fixed32 end_time = 3; // sus - Vector djinn_rot = 10; // ? - fixed32 start_time = 6; // sus - fixed32 CPOCMEGMECF = 13; // sus - uint32 uid = 5; - Vector djinn_pos = 14; -} + +message HomeLimitedShopInfo { + uint32 uid = 2; + Vector djinn_rot = 3; + fixed32 next_guest_open_time = 5; + Vector djinn_pos = 7; + fixed32 next_close_time = 10; + fixed32 next_open_time = 12; +} \ No newline at end of file diff --git a/proto/HomeMarkPointFurnitureData.proto b/proto/HomeMarkPointFurnitureData.proto index a7f72c5a..0c2b5136 100644 --- a/proto/HomeMarkPointFurnitureData.proto +++ b/proto/HomeMarkPointFurnitureData.proto @@ -1,17 +1,19 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 import "Vector.proto"; import "HomeMarkPointNPCData.proto"; import "HomeMarkPointSuiteData.proto"; -// 4.7.0 + message HomeMarkPointFurnitureData { - uint32 guid = 1; - uint32 furniture_id = 2; - uint32 furniture_type = 3; - Vector pos = 4; - oneof data { - HomeMarkPointNPCData npc_data = 6; - HomeMarkPointSuiteData suite_data = 7; - } -} + uint32 guid = 1; + uint32 furniture_id = 2; + uint32 furniture_type = 3; + Vector pos = 4; + oneof extra { + HomeMarkPointNPCData npc_data = 6; + HomeMarkPointSuiteData suite_data = 7; + } +} \ No newline at end of file diff --git a/proto/HomeMarkPointNPCData.proto b/proto/HomeMarkPointNPCData.proto index a621acb6..27146c46 100644 --- a/proto/HomeMarkPointNPCData.proto +++ b/proto/HomeMarkPointNPCData.proto @@ -1,7 +1,9 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message HomeMarkPointNPCData { - uint32 avatar_id = 1; - uint32 costume_id = 2; -} +// Version: 5.0 + +message HomeMarkPointNPCData { + uint32 avatar_id = 1; + uint32 costume_id = 2; +} \ No newline at end of file diff --git a/proto/HomeMarkPointNotify.proto b/proto/HomeMarkPointNotify.proto index bcc09c46..cf80000f 100644 --- a/proto/HomeMarkPointNotify.proto +++ b/proto/HomeMarkPointNotify.proto @@ -1,8 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 22396 + import "HomeMarkPointSceneData.proto"; -// 4.7.0 -// CmdId: 7657 -message HomeMarkPointNotify { - repeated HomeMarkPointSceneData mark_point_data_list = 6; // ok -} + +message HomeMarkPointNotify { + repeated HomeMarkPointSceneData mark_point_data_list = 2; +} \ No newline at end of file diff --git a/proto/HomeMarkPointSceneData.proto b/proto/HomeMarkPointSceneData.proto index 3d5cd500..cb9c4230 100644 --- a/proto/HomeMarkPointSceneData.proto +++ b/proto/HomeMarkPointSceneData.proto @@ -1,13 +1,15 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -import "Vector.proto"; +// Version: 5.0 + import "HomeMarkPointFurnitureData.proto"; -// 4.7.0 -// ? -message HomeMarkPointSceneData { - Vector teapot_spirit_pos = 2; - Vector safe_point_pos = 3; - uint32 module_id = 10; - uint32 scene_id = 9; - repeated HomeMarkPointFurnitureData furniture_list = 7; -} +import "Vector.proto"; + +message HomeMarkPointSceneData { + uint32 scene_id = 2; + repeated HomeMarkPointFurnitureData furniture_list = 4; + Vector teapot_spirit_pos = 5; + Vector safe_point_pos = 7; + uint32 module_id = 13; +} \ No newline at end of file diff --git a/proto/HomeMarkPointSuiteData.proto b/proto/HomeMarkPointSuiteData.proto index 61008393..8373ffed 100644 --- a/proto/HomeMarkPointSuiteData.proto +++ b/proto/HomeMarkPointSuiteData.proto @@ -1,6 +1,8 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message HomeMarkPointSuiteData { - uint32 suite_id = 1; -} +// Version: 5.0 + +message HomeMarkPointSuiteData { + uint32 suite_id = 1; +} \ No newline at end of file diff --git a/proto/HomeModuleComfortInfo.proto b/proto/HomeModuleComfortInfo.proto index af2718a1..852cf9c2 100644 --- a/proto/HomeModuleComfortInfo.proto +++ b/proto/HomeModuleComfortInfo.proto @@ -1,9 +1,10 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// OHNKBFAMOHA -message HomeModuleComfortInfo { - repeated uint32 world_scene_block_comfort_value_list = 4; - uint32 room_scene_comfort_value = 12; - uint32 module_id = 11; -} \ No newline at end of file +// Version: 5.0 + +message HomeModuleComfortInfo { + repeated uint32 world_scene_block_comfort_value_list = 9; + uint32 room_scene_comfort_value = 10; + uint32 module_id = 12; +} \ No newline at end of file diff --git a/proto/HomeModuleSeenReq.proto b/proto/HomeModuleSeenReq.proto index 2802cd88..d928ac64 100644 --- a/proto/HomeModuleSeenReq.proto +++ b/proto/HomeModuleSeenReq.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.6.0 -// Obf: LEHAIFPOFJI -// CmdId: 4142 -message HomeModuleSeenReq { - repeated uint32 seen_module_id_list = 14; -} +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 24019 + +message HomeModuleSeenReq { + repeated uint32 seen_module_id_list = 5; +} \ No newline at end of file diff --git a/proto/HomeModuleSeenRsp.proto b/proto/HomeModuleSeenRsp.proto index 14060502..6a02738b 100644 --- a/proto/HomeModuleSeenRsp.proto +++ b/proto/HomeModuleSeenRsp.proto @@ -1,10 +1,10 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.6.0 -// Obf: BMAJEDLDBNC -// CmdId: 24843 -message HomeModuleSeenRsp { - int32 retcode = 5; - repeated uint32 seen_module_id_list = 13; -} +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 5790 + +message HomeModuleSeenRsp { + int32 retcode = 1; + repeated uint32 seen_module_id_list = 5; +} \ No newline at end of file diff --git a/proto/HomeModuleUnlockNotify.proto b/proto/HomeModuleUnlockNotify.proto index a429b9ce..42c71607 100644 --- a/proto/HomeModuleUnlockNotify.proto +++ b/proto/HomeModuleUnlockNotify.proto @@ -1,8 +1,9 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -//obf: HGGIEPGKANG -// CmdId: 768 -message HomeModuleUnlockNotify { - uint32 module_id = 8; -} +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 27507 + +message HomeModuleUnlockNotify { + uint32 module_id = 8; +} \ No newline at end of file diff --git a/proto/HomeNpcData.proto b/proto/HomeNpcData.proto index 47092bd7..ea90a47f 100644 --- a/proto/HomeNpcData.proto +++ b/proto/HomeNpcData.proto @@ -1,11 +1,13 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + import "Vector.proto"; -// 4.7.0 -//obf: GBLBKCIOCLM? -message HomeNpcData { - Vector spawn_rot = 11; - uint32 costume_id = 10; - Vector spawn_pos = 12; - uint32 avatar_id = 6; -} + +message HomeNpcData { + uint32 avatar_id = 5; + Vector spawn_pos = 6; + uint32 costume_id = 12; + Vector spawn_rot = 13; +} \ No newline at end of file diff --git a/proto/HomePreChangeEditModeNotify.proto b/proto/HomePreChangeEditModeNotify.proto index c26df7ae..6378cb35 100644 --- a/proto/HomePreChangeEditModeNotify.proto +++ b/proto/HomePreChangeEditModeNotify.proto @@ -1,8 +1,9 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 25837 -// Obf: FAGGAOOAPGI -message HomePreChangeEditModeNotify { - bool is_enter_edit_mode = 2; -} +// Version: 5.0 +// CmdId: 3607 + +message HomePreChangeEditModeNotify { + bool is_enter_edit_mode = 4; +} \ No newline at end of file diff --git a/proto/HomeSceneArrangementInfo.proto b/proto/HomeSceneArrangementInfo.proto index 663b5781..c6176953 100644 --- a/proto/HomeSceneArrangementInfo.proto +++ b/proto/HomeSceneArrangementInfo.proto @@ -1,21 +1,26 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -import "HomeBlockArrangementInfo.proto"; -import "HomeFurnitureData.proto"; +// Version: 5.0 + import "Vector.proto"; -// 4.7.0 -// Obf: KDCBFHPPKGF -message HomeSceneArrangementInfo { - repeated HomeBlockArrangementInfo block_arrangement_info_list = 8; - repeated HomeFurnitureData uk1 = 1; - repeated HomeFurnitureData uk2 = 6; - Vector born_rot = 1751; // or 5,4 - uint32 scene_id = 11; - uint32 bgm_id = 3; // 3 - uint32 comfort_value = 2; // 2 - HomeFurnitureData main_house = 12; - uint32 tmp_version = 9; - bool is_set_born_pos = 10; // or 14 - Vector djinn_pos = 13; // 2 - Vector born_pos = 15; -} +import "HomeFurnitureData.proto"; +import "HomeBlockArrangementInfo.proto"; + +message HomeSceneArrangementInfo { + Vector born_rot = 1; + bool BMAEDEOKOHL = 2; + uint32 comfort_value = 3; + Vector djinn_pos = 4; + Vector born_pos = 5; + repeated HomeFurnitureData door_list = 6; + uint32 tmp_version = 8; + uint32 scene_id = 9; + HomeFurnitureData main_house = 10; + bool is_set_born_pos = 11; + repeated HomeBlockArrangementInfo block_arrangement_info_list = 12; + repeated HomeFurnitureData stair_list = 13; + Vector DFCFKJBCCAH = 14; + uint32 bgm_id = 15; + Vector EJAPJLENOGL = 885; +} \ No newline at end of file diff --git a/proto/HomeSceneJumpReq.proto b/proto/HomeSceneJumpReq.proto index 1c2756e3..1e827e98 100644 --- a/proto/HomeSceneJumpReq.proto +++ b/proto/HomeSceneJumpReq.proto @@ -1,8 +1,9 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// Obf: MLKLNEJBIBK -// CmdId: 7730 -message HomeSceneJumpReq { - bool is_enter_room_scene = 11; -} +// Version: 5.0 +// CmdId: 5317 + +message HomeSceneJumpReq { + bool is_enter_room_scene = 15; +} \ No newline at end of file diff --git a/proto/HomeSceneJumpRsp.proto b/proto/HomeSceneJumpRsp.proto index 775a1c06..5daea510 100644 --- a/proto/HomeSceneJumpRsp.proto +++ b/proto/HomeSceneJumpRsp.proto @@ -1,10 +1,10 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.6.0 -// Obf: NPOEELOKDIC -// CmdId: 8266 -message HomeSceneJumpRsp { - bool is_enter_room_scene = 5; - int32 retcode = 10; -} +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 28622 + +message HomeSceneJumpRsp { + bool is_enter_room_scene = 7; + int32 retcode = 13; +} \ No newline at end of file diff --git a/proto/HomeTransferReq.proto b/proto/HomeTransferReq.proto index 07011522..e7173785 100644 --- a/proto/HomeTransferReq.proto +++ b/proto/HomeTransferReq.proto @@ -1,10 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 6539 -// NFKIMKIHCAE -message HomeTransferReq { - bool is_transfer_to_safe_point = 4; - bool is_transfer_to_main_house_point = 13; - uint32 guid = 12; -} +// Version: 5.0 +// CmdId: 2203 + +message HomeTransferReq { + bool is_transfer_to_main_house_point = 1; + bool is_transfer_to_safe_point = 14; + uint32 guid = 6; +} \ No newline at end of file diff --git a/proto/HomeUpdateArrangementInfoReq.proto b/proto/HomeUpdateArrangementInfoReq.proto index e13660ec..ed20b017 100644 --- a/proto/HomeUpdateArrangementInfoReq.proto +++ b/proto/HomeUpdateArrangementInfoReq.proto @@ -1,8 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 344 + import "HomeSceneArrangementInfo.proto"; -// CmdId: 25486 -// Obf: ABILAIBDALL -message HomeUpdateArrangementInfoReq { - HomeSceneArrangementInfo scene_arrangement_info = 5; -} + +message HomeUpdateArrangementInfoReq { + HomeSceneArrangementInfo scene_arrangement_info = 8; +} \ No newline at end of file diff --git a/proto/HomeUpdateArrangementInfoRsp.proto b/proto/HomeUpdateArrangementInfoRsp.proto index e09a372d..64f49519 100644 --- a/proto/HomeUpdateArrangementInfoRsp.proto +++ b/proto/HomeUpdateArrangementInfoRsp.proto @@ -1,23 +1,9 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// CmdId: 28545 -// Obf: MILPFBIHKIJ -message HomeUpdateArrangementInfoRsp { - int32 retcode = 2; -} +// Version: 5.0 +// CmdId: 25852 + +message HomeUpdateArrangementInfoRsp { + int32 retcode = 3; +} \ No newline at end of file diff --git a/proto/HostPlayerNotify.proto b/proto/HostPlayerNotify.proto index 974062b6..e9f1493d 100644 --- a/proto/HostPlayerNotify.proto +++ b/proto/HostPlayerNotify.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 2109 +// CmdId: 2109 message HostPlayerNotify { uint32 host_uid = 1; diff --git a/proto/InferencePageInfo.proto b/proto/InferencePageInfo.proto index 5dcfe7d3..cc50158e 100644 --- a/proto/InferencePageInfo.proto +++ b/proto/InferencePageInfo.proto @@ -1,11 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 import "InferenceWordInfo.proto"; -// 4.7.0 -message InferencePageInfo { - repeated InferenceWordInfo unlock_word_list = 11; - uint32 page_id = 6; -} \ No newline at end of file +message InferencePageInfo { + uint32 page_id = 6; + repeated InferenceWordInfo unlock_word_list = 11; +} \ No newline at end of file diff --git a/proto/InferenceWordInfo.proto b/proto/InferenceWordInfo.proto index d176ef17..63614a66 100644 --- a/proto/InferenceWordInfo.proto +++ b/proto/InferenceWordInfo.proto @@ -1,12 +1,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 -// 4.7.0 -message InferenceWordInfo { - uint32 word_id = 3; - bool AAOCFCGKKHC = 7; - bool DMBPILCCFNK = 10; - uint32 unlock_by_word_id = 13; - bool HJLIADLKJOP = 14; -} \ No newline at end of file +message InferenceWordInfo { + bool DHBPEBDBMNK = 1; + bool CAJHCPIPBOO = 2; + uint32 word_id = 4; + uint32 unlock_by_word_id = 5; + bool ENFPKOPNHKK = 11; +} \ No newline at end of file diff --git a/proto/InterOpType.proto b/proto/InterOpType.proto index c70363e4..d558f89f 100644 --- a/proto/InterOpType.proto +++ b/proto/InterOpType.proto @@ -1,8 +1,9 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.6.0 +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + enum InterOpType { - INTER_OP_TYPE_FINISH = 0; + INTER_OP_TYPE_FINISH = 0; INTER_OP_TYPE_START = 1; -} \ No newline at end of file +} diff --git a/proto/InteractType.proto b/proto/InteractType.proto index e2cb07ac..2e322341 100644 --- a/proto/InteractType.proto +++ b/proto/InteractType.proto @@ -1,9 +1,10 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.6.0 +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + enum InteractType { - INTERACT_TYPE_NONE = 0; + INTERACT_TYPE_NONE = 0; INTERACT_TYPE_PICK_ITEM = 1; INTERACT_TYPE_GATHER = 2; INTERACT_TYPE_OPEN_CHEST = 3; @@ -20,4 +21,4 @@ enum InteractType { INTERACT_TYPE_QUEST_GADGET = 14; INTERACT_TYPE_UI_INTERACT = 15; INTERACT_TYPE_DESHRET_OBELISK = 16; -} \ No newline at end of file +} diff --git a/proto/Investigation.proto b/proto/Investigation.proto index 4e91f249..e97b189f 100644 --- a/proto/Investigation.proto +++ b/proto/Investigation.proto @@ -1,19 +1,18 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + -// Version: 4.7.0 -// Obfs: KMDDNLBJLJJ message Investigation { - enum State { + enum State { INVALID = 0; IN_PROGRESS = 1; COMPLETE = 2; REWARD_TAKEN = 3; } - - uint32 id = 13; - uint32 total_progress = 7; - State state = 1; - uint32 progress = 15; -} \ No newline at end of file + uint32 id = 1; + State state = 8; + uint32 total_progress = 9; + uint32 progress = 12; +} diff --git a/proto/InvestigationMonster.proto b/proto/InvestigationMonster.proto index aa40cd3e..c9b2daa8 100644 --- a/proto/InvestigationMonster.proto +++ b/proto/InvestigationMonster.proto @@ -1,35 +1,30 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 -import "WeeklyBossResinDiscountInfo.proto"; import "Vector.proto"; +import "LockState.proto"; +import "WeeklyBossResinDiscountInfo.proto"; -// Version: 4.7.0 -// Obfs: HNOMCMKENBA -message InvestigationMonster { - enum LockState { - LOCK_NONE = 0; - LOCK_QUEST = 1; - } - - uint32 left_times = 3; - uint32 next_refresh_time = 11; - LockState lock_state = 6; - bool is_alive = 13; // sus 13,15,1559 - bool KCJLDICGONA = 15; - bool GKPDPFNNKJH = 1559; - WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 1; - uint32 level = 2; - uint32 resin = 5; - uint32 refresh_interval = 7; // sus - uint32 id = 4; - uint32 scene_id = 14; - uint32 city_id = 9; - uint32 max_boss_chest_num = 10; - Vector pos = 8; - uint32 group_id = 1997; - uint32 monster_id = 289; - uint32 circle_camp_id = 767; - uint32 BILKCPNIMAA = 12; // 1 -} \ No newline at end of file +message InvestigationMonster { + uint32 id = 1; + bool is_alive = 2; + uint32 boss_chest_num = 3; // 6 + uint32 resin = 4; + bool is_area_locked = 5; + uint32 max_boss_chest_num = 6; // 3 + uint32 next_refresh_time = 7; + uint32 city_id = 8; + uint32 next_boss_chest_refresh_time = 9; // 12 + uint32 scene_id = 10; + Vector pos = 11; + uint32 refresh_interval = 12; // 9 + LockState lock_state = 13; + WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 14; + uint32 level = 15; + bool IDNKJEEDOGC = 533; + uint32 monster_id = 1129; + uint32 group_id = 1335; + uint32 AGIENJJKPBE = 1612; +} \ No newline at end of file diff --git a/proto/InvestigationTarget.proto b/proto/InvestigationTarget.proto index 87b145e4..36ae913e 100644 --- a/proto/InvestigationTarget.proto +++ b/proto/InvestigationTarget.proto @@ -1,20 +1,19 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + -// Version: 4.7.0 -// Obfs: ? message InvestigationTarget { - enum State { + enum State { INVALID = 0; IN_PROGRESS = 1; COMPLETE = 2; REWARD_TAKEN = 3; } - - uint32 quest_id = 12; - uint32 progress = 7; - uint32 investigation_id = 4; - State state = 9; - uint32 total_progress = 13; -} \ No newline at end of file + uint32 progress = 1; + uint32 total_progress = 4; + uint32 investigation_id = 10; + uint32 quest_id = 11; + State state = 13; +} diff --git a/proto/ItemAddHintNotify.proto b/proto/ItemAddHintNotify.proto index 427d19b4..f164e5de 100644 --- a/proto/ItemAddHintNotify.proto +++ b/proto/ItemAddHintNotify.proto @@ -1,17 +1,19 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 26599 import "ItemHint.proto"; import "Vector.proto"; -// 4.7.0 -message ItemAddHintNotify { - bool FMLDPGOOCPG = 1; - repeated ItemHint overflow_transformed_item_list = 2; - uint32 reason = 3; - Vector position = 4; - uint32 quest_id = 8; - repeated ItemHint item_list = 10; - bool BJFIEHFPADD = 12; - bool DAKGABMHAHP = 14; -} \ No newline at end of file +message ItemAddHintNotify { + repeated ItemHint item_list = 2; + repeated ItemHint overflow_transformed_item_list = 3; + bool is_transfered_from_avatar_card = 5; + Vector position = 6; + uint32 reason = 9; + bool is_position_valid = 11; + bool is_general_reward_hiden = 12; + uint32 quest_id = 13; +} \ No newline at end of file diff --git a/proto/ItemHint.proto b/proto/ItemHint.proto index c1a16754..2b975a07 100644 --- a/proto/ItemHint.proto +++ b/proto/ItemHint.proto @@ -1,10 +1,11 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message ItemHint { - uint32 count = 1; - uint64 guid = 3; - uint32 item_id = 7; - bool is_new = 15; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + +message ItemHint { + uint32 count = 1; + bool is_new = 2; + uint32 item_id = 10; + uint64 guid = 15; +} \ No newline at end of file diff --git a/proto/LackingResourceInfo.proto b/proto/LackingResourceInfo.proto index 05173ce5..0a2bc1f7 100644 --- a/proto/LackingResourceInfo.proto +++ b/proto/LackingResourceInfo.proto @@ -1,16 +1,16 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 -// 4.7.0 -message LackingResourceInfo { - repeated uint32 PDFBJCPKGAD = 1; - map JHOJDJGELLK = 2; - repeated uint32 GEPBOPLIEMB = 3; - map KBEAGMAGFPD = 4; - repeated uint32 NGBJMLNHLBB = 5; - map GJBFBFOCLJL = 6; - repeated uint32 IFLMBHBHLMC = 7; - repeated uint32 PLGICBELJNB = 8; - repeated uint32 FOIHNLFBPFI = 9; -} \ No newline at end of file +message LackingResourceInfo { + repeated uint32 JAODPKILOHD = 1; + map IGIDHGKOODO = 2; + repeated uint32 OBAKLGMMOEO = 3; + map LELGNGJOJAI = 4; + repeated uint32 AOECKDLECIJ = 5; + map ACAAJJBNCDM = 6; + repeated uint32 LHEGFHKBMKF = 7; + repeated uint32 HIIHFCBJLDI = 8; + repeated uint32 HCPKDCNKPGD = 9; +} \ No newline at end of file diff --git a/proto/LifeStateChangeNotify.proto b/proto/LifeStateChangeNotify.proto index aa5652f0..d25bf687 100644 --- a/proto/LifeStateChangeNotify.proto +++ b/proto/LifeStateChangeNotify.proto @@ -1,16 +1,19 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 29321 -import "ServerBuff.proto"; import "PlayerDieType.proto"; +import "ServerBuff.proto"; -// 4.7.0 -message LifeStateChangeNotify { - uint32 life_state = 2; - uint32 source_entity_id = 4; - string attack_tag = 6; - repeated ServerBuff server_buff_list = 7; - PlayerDieType die_type = 11; - uint32 entity_id = 14; - uint32 move_reliable_seq = 15; -} \ No newline at end of file +message LifeStateChangeNotify { + string attack_tag = 2; + uint32 move_reliable_seq = 3; + repeated string EPGOBHIEDOI = 5; + uint32 entity_id = 6; + uint32 life_state = 8; + PlayerDieType die_type = 10; + repeated ServerBuff server_buff_list = 13; + uint32 source_entity_id = 14; +} \ No newline at end of file diff --git a/unimplemented/LockState.proto b/proto/LockState.proto similarity index 100% rename from unimplemented/LockState.proto rename to proto/LockState.proto diff --git a/proto/MailChangeNotify.proto b/proto/MailChangeNotify.proto index 8f7873e5..867af97b 100644 --- a/proto/MailChangeNotify.proto +++ b/proto/MailChangeNotify.proto @@ -1,11 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 27744 import "MailData.proto"; -// 4.7.0 -// cmdid: 29033 ? -message MailChangeNotify { - repeated uint32 del_mail_id_list = 6; - repeated MailData mail_list = 14; -} +message MailChangeNotify { + repeated uint32 del_mail_id_list = 13; + repeated MailData mail_list = 14; +} \ No newline at end of file diff --git a/proto/MailCollectState.proto b/proto/MailCollectState.proto index dbff27fc..da3a5813 100644 --- a/proto/MailCollectState.proto +++ b/proto/MailCollectState.proto @@ -1,8 +1,10 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 enum MailCollectState { - MAIL_COLLECT_STATE_COLLECTIBLE_UNKNOWN = 0; + 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 7bdf2823..f03641d6 100644 --- a/proto/MailData.proto +++ b/proto/MailData.proto @@ -1,20 +1,22 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 import "MailTextContent.proto"; import "MailItem.proto"; import "MailCollectState.proto"; -message MailData { - uint32 mailId = 1; - MailTextContent mail_text_content = 4; - repeated MailItem item_list = 7; - uint32 send_time = 8; - uint32 expire_time = 9; - uint32 importance = 10; - bool is_read = 11; - bool is_attachment_got = 12; - uint32 config_id = 13; - repeated string argument_list = 14; - MailCollectState collect_state = 15; -} +message MailData { + uint32 mail_id = 1; + MailTextContent mail_text_content = 4; + repeated MailItem item_list = 7; + uint32 send_time = 8; + uint32 expire_time = 9; + uint32 importance = 10; + bool is_read = 11; + bool is_attachment_got = 12; + uint32 config_id = 13; + repeated string argument_list = 14; + MailCollectState collect_state = 15; +} \ No newline at end of file diff --git a/proto/MailItem.proto b/proto/MailItem.proto index deadad0d..4c7e7e7a 100644 --- a/proto/MailItem.proto +++ b/proto/MailItem.proto @@ -1,10 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 import "EquipParam.proto"; import "MaterialDeleteInfo.proto"; -message MailItem { - EquipParam equip_param = 1; - MaterialDeleteInfo delete_info = 2; -} +message MailItem { + EquipParam equip_param = 1; + MaterialDeleteInfo delete_info = 2; +} \ No newline at end of file diff --git a/proto/MailTextContent.proto b/proto/MailTextContent.proto index c1d419cd..8143558a 100644 --- a/proto/MailTextContent.proto +++ b/proto/MailTextContent.proto @@ -1,8 +1,10 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -message MailTextContent { - string title = 1; - string content = 2; - string sender = 3; -} +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + +message MailTextContent { + string title = 1; + string content = 2; + string sender = 3; +} \ No newline at end of file diff --git a/proto/MainCoop.proto b/proto/MainCoop.proto index aa0d5e78..682cd156 100644 --- a/proto/MainCoop.proto +++ b/proto/MainCoop.proto @@ -1,30 +1,12 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Obf: CIGMGGBFGNB -message MainCoop { - // Obf: HECGIMLHAJH + +message MainCoop { enum Status { INVALID = 0; RUNNING = 1; FINISHED = 2; } - uint32 self_confidence = 5; Status status = 1; repeated uint32 save_point_id_list = 9; diff --git a/proto/MapAreaInfo.proto b/proto/MapAreaInfo.proto index 5acec809..08273bfb 100644 --- a/proto/MapAreaInfo.proto +++ b/proto/MapAreaInfo.proto @@ -1,8 +1,9 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// Obf: HKBPJNKGGCC -message MapAreaInfo { - uint32 map_area_id = 1; - bool is_open = 2; -} +// Version: 5.0 + +message MapAreaInfo { + uint32 map_area_id = 1; + bool is_open = 2; +} \ No newline at end of file diff --git a/proto/MapLayerInfo.proto b/proto/MapLayerInfo.proto index 1e40d87d..fd2f29ca 100644 --- a/proto/MapLayerInfo.proto +++ b/proto/MapLayerInfo.proto @@ -3,8 +3,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -message MapLayerInfo { - repeated uint32 unlocked_map_layer_id_list = 2; - repeated uint32 unlocked_map_layer_floor_id_list = 3; - repeated uint32 unlocked_map_layer_group_id_list = 12; -} +message MapLayerInfo { + repeated uint32 unlocked_map_layer_group_id_list = 2; + repeated uint32 unlocked_map_layer_id_list = 3; + repeated uint32 unlocked_map_layer_floor_id_list = 12; +} \ No newline at end of file diff --git a/proto/MapMarkFromType.proto b/proto/MapMarkFromType.proto index 98d1eefd..11da6cb3 100644 --- a/proto/MapMarkFromType.proto +++ b/proto/MapMarkFromType.proto @@ -1,9 +1,10 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.6.0 -enum MapMarkFromType { - MAP_MARK_FROM_TYPE_NONE = 0; - MAP_MARK_FROM_TYPE_MONSTER = 1; - MAP_MARK_FROM_TYPE_QUEST = 2; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + +enum MapMarkFromType { + MAP_MARK_FROM_TYPE_NONE = 0; + MAP_MARK_FROM_TYPE_MONSTER = 1; + MAP_MARK_FROM_TYPE_QUEST = 2; +} \ No newline at end of file diff --git a/proto/MapMarkPoint.proto b/proto/MapMarkPoint.proto index 72d77bf4..883a3608 100644 --- a/proto/MapMarkPoint.proto +++ b/proto/MapMarkPoint.proto @@ -1,18 +1,19 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 import "Vector.proto"; import "MapMarkPointType.proto"; import "MapMarkFromType.proto"; -// 4.7.0 -message MapMarkPoint { - uint32 scene_id = 1; - string name = 2; - Vector pos = 3; - MapMarkPointType point_type = 4; - uint32 monster_id = 5; - MapMarkFromType from_type = 6; - uint32 quest_id = 7; - uint32 AAOGCHADHPL = 8; -} \ No newline at end of file +message MapMarkPoint { + uint32 scene_id = 1; + string name = 2; + Vector pos = 3; + MapMarkPointType point_type = 4; + uint32 monster_id = 5; + MapMarkFromType from_type = 6; + uint32 quest_id = 7; + uint32 AGIENJJKPBE = 8; +} \ No newline at end of file diff --git a/proto/MapMarkPointType.proto b/proto/MapMarkPointType.proto index e0d8a7ac..11593144 100644 --- a/proto/MapMarkPointType.proto +++ b/proto/MapMarkPointType.proto @@ -1,13 +1,14 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.6.0 +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + enum MapMarkPointType { - MAP_MARK_POINT_TYPE_NPC = 0; + 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; -} \ No newline at end of file +} diff --git a/proto/MarkMapReq.proto b/proto/MarkMapReq.proto index f3d03411..1fd0fcd0 100644 --- a/proto/MarkMapReq.proto +++ b/proto/MarkMapReq.proto @@ -1,17 +1,19 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 9550 import "MapMarkPoint.proto"; -//4.7.0 message MarkMapReq { - enum Operation { - OPERATION_ADD = 0; - OPERATION_MOD = 1; - OPERATION_DEL = 2; - OPERATION_GET = 3; - } - MapMarkPoint mark = 8; - MapMarkPoint old = 6; - Operation op = 14; + enum Operation { + OPERATION_ADD = 0; + OPERATION_MOD = 1; + OPERATION_DEL = 2; + OPERATION_GET = 3; + } + MapMarkPoint mark = 9; + MapMarkPoint old = 3; + Operation op = 15; } diff --git a/proto/MarkMapRsp.proto b/proto/MarkMapRsp.proto index 500d41de..1b9dd0a3 100644 --- a/proto/MarkMapRsp.proto +++ b/proto/MarkMapRsp.proto @@ -1,11 +1,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 21436 import "MapMarkPoint.proto"; -// 4.7.0 -message MarkMapRsp { - int32 retcode = 14; - repeated MapMarkPoint mark_list = 13; -} +message MarkMapRsp { + repeated MapMarkPoint mark_list = 11; + int32 retcode = 12; +} \ No newline at end of file diff --git a/proto/MissionStatus.proto b/proto/MissionStatus.proto new file mode 100644 index 00000000..b8b2863d --- /dev/null +++ b/proto/MissionStatus.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + +enum MissionStatus { + MISSION_INVALID = 0; + MISSION_UNFINISHED = 1; + MISSION_FINISHED = 2; + MISSION_POINT_TAKEN = 3; +} \ No newline at end of file diff --git a/proto/MonsterBornType.proto b/proto/MonsterBornType.proto index 2cf743cb..7bf0b32e 100644 --- a/proto/MonsterBornType.proto +++ b/proto/MonsterBornType.proto @@ -3,8 +3,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -enum MonsterBornType { - MONSTER_BORN_TYPE_NONE = 0; - MONSTER_BORN_TYPE_DEFAULT = 1; - MONSTER_BORN_TYPE_RANDOM = 2; -} \ No newline at end of file +enum MonsterBornType { + MONSTER_BORN_TYPE_NONE = 0; + MONSTER_BORN_TYPE_DEFAULT = 1; + MONSTER_BORN_TYPE_RANDOM = 2; +} diff --git a/proto/MotionState.proto b/proto/MotionState.proto index 09b29960..372be2b8 100644 --- a/proto/MotionState.proto +++ b/proto/MotionState.proto @@ -3,114 +3,114 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -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_ROLLER_COASTER = 57; - MOTION_STATE_DIVE_IDLE = 58; - MOTION_STATE_DIVE_MOVE = 59; - MOTION_STATE_DIVE_DASH = 60; - MOTION_STATE_DIVE_DOLPHINE = 61; - MOTION_STATE_DEBUG = 62; - MOTION_STATE_OCEAN_CURRENT = 63; - MOTION_STATE_DIVE_SWIM_MOVE = 64; - MOTION_STATE_DIVE_SWIM_IDLE = 65; - MOTION_STATE_DIVE_SWIM_DASH = 66; - MOTION_STATE_ARC_LIGHT = 67; - MOTION_STATE_ARC_LIGHT_SAFE = 68; - MOTION_STATE_VEHICLE_STANDBY = 69; - MOTION_STATE_VEHICLE_RUN = 70; - MOTION_STATE_VEHICLE_DASH = 71; - MOTION_STATE_VEHICLE_CLIMB = 72; - MOTION_STATE_VEHICLE_CLIMB_JUMP = 73; - MOTION_STATE_VEHICLE_STANDBY_TO_CLIMB = 74; - MOTION_STATE_VEHICLE_FIGHT = 75; - MOTION_STATE_VEHICLE_JUMP = 76; - MOTION_STATE_VEHICLE_DROP = 77; - MOTION_STATE_VEHICLE_FLY = 78; - MOTION_STATE_VEHICLE_SWIM_MOVE = 79; - MOTION_STATE_VEHICLE_SWIM_IDLE = 80; - MOTION_STATE_VEHICLE_SWIM_DASH = 81; - MOTION_STATE_VEHICLE_SLIP = 82; - MOTION_STATE_VEHICLE_GO_UPSTAIRS = 83; - MOTION_STATE_VEHICLE_FALL_ON_GROUND = 84; - MOTION_STATE_VEHICLE_JUMP_OFF_WALL = 85; - MOTION_STATE_VEHICLE_POWERED_FLY = 86; - MOTION_STATE_VEHICLE_DANGER_STANDBY = 87; - MOTION_STATE_VEHICLE_DANGER_RUN = 88; - MOTION_STATE_VEHICLE_DANGER_DASH = 89; - MOTION_STATE_VEHICLE_NOTIFY = 90; - MOTION_STATE_VEHICLE_LAND_SPEED = 91; - MOTION_STATE_VEHICLE_DASH_BEFORE_SHAKE = 92; - MOTION_STATE_VEHICLE_QUEST_FORCE_DRAG = 93; - MOTION_STATE_VEHICLE_FOLLOW_ROUTE = 94; - MOTION_STATE_VEHICLE_FLY_IDLE = 95; - MOTION_STATE_VEHICLE_FLY_SLOW = 96; - MOTION_STATE_VEHICLE_FLY_FAST = 97; - MOTION_STATE_VEHICLE_AIR_COMPENSATION = 98; - MOTION_STATE_VEHICLE_ARC_LIGHT = 99; - MOTION_STATE_VEHICLE_ARC_LIGHT_SAFE = 100; - MOTION_STATE_VEHICLE_DANGER_SWIM_MOVE = 101; - MOTION_STATE_VEHICLE_DANGER_SWIM_IDLE = 102; - MOTION_STATE_VEHICLE_DANGER_SWIM_DASH = 103; - MOTION_STATE_FOLLOW_CURVE_ROUTE = 104; - MOTION_STATE_VEHICLE_FOLLOW_CURVE_ROUTE = 105; - MOTION_STATE_NATSAURUS_NORMAL = 106; - MOTION_STATE_NATSAURUS_ENTERING = 107; - MOTION_STATE_NUM = 108; -} \ No newline at end of file +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_ROLLER_COASTER = 57; + MOTION_STATE_DIVE_IDLE = 58; + MOTION_STATE_DIVE_MOVE = 59; + MOTION_STATE_DIVE_DASH = 60; + MOTION_STATE_DIVE_DOLPHINE = 61; + MOTION_STATE_DEBUG = 62; + MOTION_STATE_OCEAN_CURRENT = 63; + MOTION_STATE_DIVE_SWIM_MOVE = 64; + MOTION_STATE_DIVE_SWIM_IDLE = 65; + MOTION_STATE_DIVE_SWIM_DASH = 66; + MOTION_STATE_ARC_LIGHT = 67; + MOTION_STATE_ARC_LIGHT_SAFE = 68; + MOTION_STATE_VEHICLE_STANDBY = 69; + MOTION_STATE_VEHICLE_RUN = 70; + MOTION_STATE_VEHICLE_DASH = 71; + MOTION_STATE_VEHICLE_CLIMB = 72; + MOTION_STATE_VEHICLE_CLIMB_JUMP = 73; + MOTION_STATE_VEHICLE_STANDBY_TO_CLIMB = 74; + MOTION_STATE_VEHICLE_FIGHT = 75; + MOTION_STATE_VEHICLE_JUMP = 76; + MOTION_STATE_VEHICLE_DROP = 77; + MOTION_STATE_VEHICLE_FLY = 78; + MOTION_STATE_VEHICLE_SWIM_MOVE = 79; + MOTION_STATE_VEHICLE_SWIM_IDLE = 80; + MOTION_STATE_VEHICLE_SWIM_DASH = 81; + MOTION_STATE_VEHICLE_SLIP = 82; + MOTION_STATE_VEHICLE_GO_UPSTAIRS = 83; + MOTION_STATE_VEHICLE_FALL_ON_GROUND = 84; + MOTION_STATE_VEHICLE_JUMP_OFF_WALL = 85; + MOTION_STATE_VEHICLE_POWERED_FLY = 86; + MOTION_STATE_VEHICLE_DANGER_STANDBY = 87; + MOTION_STATE_VEHICLE_DANGER_RUN = 88; + MOTION_STATE_VEHICLE_DANGER_DASH = 89; + MOTION_STATE_VEHICLE_NOTIFY = 90; + MOTION_STATE_VEHICLE_LAND_SPEED = 91; + MOTION_STATE_VEHICLE_DASH_BEFORE_SHAKE = 92; + MOTION_STATE_VEHICLE_QUEST_FORCE_DRAG = 93; + MOTION_STATE_VEHICLE_FOLLOW_ROUTE = 94; + MOTION_STATE_VEHICLE_FLY_IDLE = 95; + MOTION_STATE_VEHICLE_FLY_SLOW = 96; + MOTION_STATE_VEHICLE_FLY_FAST = 97; + MOTION_STATE_VEHICLE_AIR_COMPENSATION = 98; + MOTION_STATE_VEHICLE_ARC_LIGHT = 99; + MOTION_STATE_VEHICLE_ARC_LIGHT_SAFE = 100; + MOTION_STATE_VEHICLE_DANGER_SWIM_MOVE = 101; + MOTION_STATE_VEHICLE_DANGER_SWIM_IDLE = 102; + MOTION_STATE_VEHICLE_DANGER_SWIM_DASH = 103; + MOTION_STATE_FOLLOW_CURVE_ROUTE = 104; + MOTION_STATE_VEHICLE_FOLLOW_CURVE_ROUTE = 105; + MOTION_STATE_NATSAURUS_NORMAL = 106; + MOTION_STATE_NATSAURUS_ENTERING = 107; + MOTION_STATE_NUM = 108; +} diff --git a/proto/MovingPlatformType.proto b/proto/MovingPlatformType.proto index 7a4dbf3f..e9692ad2 100644 --- a/proto/MovingPlatformType.proto +++ b/proto/MovingPlatformType.proto @@ -3,9 +3,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -enum MovingPlatformType { - MOVING_PLATFORM_TYPE_NONE = 0; - MOVING_PLATFORM_TYPE_USE_CONFIG = 1; - MOVING_PLATFORM_TYPE_ABILITY = 2; - MOVING_PLATFORM_TYPE_ROUTE = 3; -} \ No newline at end of file +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/MpSettingType.proto b/proto/MpSettingType.proto index 2bcf9277..086290de 100644 --- a/proto/MpSettingType.proto +++ b/proto/MpSettingType.proto @@ -1,8 +1,10 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// Obf: BICPJCKHOPA +// Version: 5.0 + enum MpSettingType { - MP_SETTING_TYPE_NO_ENTER = 0; + MP_SETTING_TYPE_NO_ENTER = 0; MP_SETTING_TYPE_ENTER_FREELY = 1; MP_SETTING_TYPE_ENTER_AFTER_APPLY = 2; } diff --git a/proto/NeedBeginTime.proto b/proto/NeedBeginTime.proto new file mode 100644 index 00000000..37d83800 --- /dev/null +++ b/proto/NeedBeginTime.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + +message NeedBeginTime { + uint32 config_need_begin_time = 4; + bool is_limit = 9; +} \ No newline at end of file diff --git a/unimplemented/NeedPlayerLevel.proto b/proto/NeedPlayerLevel.proto similarity index 100% rename from unimplemented/NeedPlayerLevel.proto rename to proto/NeedPlayerLevel.proto diff --git a/proto/NpcTalkReq.proto b/proto/NpcTalkReq.proto index 281f1722..0b5cf439 100644 --- a/proto/NpcTalkReq.proto +++ b/proto/NpcTalkReq.proto @@ -1,10 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 24255 -// 4.7.0 -message NpcTalkReq { - uint32 talk_id = 1; - uint32 npc_entity_id = 5; - uint32 entity_id = 8; -} \ No newline at end of file +message NpcTalkReq { + uint32 entity_id = 8; + uint32 talk_id = 14; + uint32 npc_entity_id = 2; +} \ No newline at end of file diff --git a/proto/NpcTalkRsp.proto b/proto/NpcTalkRsp.proto index 384f6aa8..014ad279 100644 --- a/proto/NpcTalkRsp.proto +++ b/proto/NpcTalkRsp.proto @@ -1,10 +1,12 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message NpcTalkRsp { - uint32 entity_id = 1; - uint32 cur_talk_id = 3; - uint32 npc_entity_id = 7; - int32 retcode = 15; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 23865 + +message NpcTalkRsp { + int32 retcode = 1; + uint32 npc_entity_id = 3; + uint32 cur_talk_id = 5; + uint32 entity_id = 15; +} \ No newline at end of file diff --git a/proto/ObstacleInfo.proto b/proto/ObstacleInfo.proto index 0b004c3b..83a10673 100644 --- a/proto/ObstacleInfo.proto +++ b/proto/ObstacleInfo.proto @@ -1,20 +1,17 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +import "ShapeType.proto"; import "MathQuaternion.proto"; -import "Vector.proto"; import "Vector3Int.proto"; +import "Vector.proto"; -// 4.7.0 -message ObstacleInfo { - enum ShapeType { - OBSTACLE_SHAPE_CAPSULE = 0; - OBSTACLE_SHAPE_BOX = 1; - } - MathQuaternion rotation = 12; - Vector3Int extents = 10; - Vector center = 6; - ShapeType shape = 7; - int32 obstacle_id = 11; -} +message ObstacleInfo { + ShapeType shape = 4; + MathQuaternion rotation = 5; + Vector3Int extents = 6; + int32 obstacle_id = 12; + Vector center = 13; +} \ No newline at end of file diff --git a/proto/ObstacleModifyNotify.proto b/proto/ObstacleModifyNotify.proto index 4d059ded..e8ed68be 100644 --- a/proto/ObstacleModifyNotify.proto +++ b/proto/ObstacleModifyNotify.proto @@ -1,14 +1,15 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 2384 + import "ObstacleInfo.proto"; -// 4.7.0 -// CmdId: 2375 -// GPPPFELACIN -message ObstacleModifyNotify { - repeated int32 DGJANCNNNCP = 3; // ? - repeated int32 MAAACDMLALJ = 4; // ? - repeated int32 remove_obstacle_ids = 7; - repeated ObstacleInfo add_obstacles = 9; - uint32 scene_id = 13; -} +message ObstacleModifyNotify { + repeated ObstacleInfo add_obstacles = 2; + repeated int32 PBGEEKLDIKE = 5; + repeated int32 remove_obstacle_ids = 9; + repeated int32 EHFGKOLBOMK = 12; + uint32 scene_id = 14; +} \ No newline at end of file diff --git a/proto/OnlinePlayerInfo.proto b/proto/OnlinePlayerInfo.proto index 8ae2ce81..7ab14281 100644 --- a/proto/OnlinePlayerInfo.proto +++ b/proto/OnlinePlayerInfo.proto @@ -1,22 +1,23 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 import "MpSettingType.proto"; import "ProfilePicture.proto"; -// 4.7.0 -message OnlinePlayerInfo { - uint32 uid = 1; - string nickname = 2; - uint32 cur_player_num_in_world = 6; - uint32 avatar_id = 4; - MpSettingType mp_setting_type = 5; - uint32 player_level = 3; - uint32 world_level = 7; - string online_id = 8; - uint32 name_card_id = 9; - repeated uint32 blacklist_uid_list = 10; - string signature = 11; - ProfilePicture profile_picture = 12; - string psn_id = 13; -} \ No newline at end of file +message OnlinePlayerInfo { + uint32 uid = 1; + string nickname = 2; + uint32 cur_player_num_in_world = 3; + uint32 avatar_id = 4; + MpSettingType mp_setting_type = 5; + uint32 player_level = 6; + uint32 world_level = 7; + string online_id = 8; + uint32 name_card_id = 9; + repeated uint32 blacklist_uid_list = 10; + string signature = 11; + ProfilePicture profile_picture = 12; + string psn_id = 13; +} \ No newline at end of file diff --git a/proto/OpenStateChangeNotify.proto b/proto/OpenStateChangeNotify.proto index a0ca9794..3d862385 100644 --- a/proto/OpenStateChangeNotify.proto +++ b/proto/OpenStateChangeNotify.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 26658 +// CmdId: 26658 message OpenStateChangeNotify { map open_state_map = 7; diff --git a/proto/OpenStateUpdateNotify.proto b/proto/OpenStateUpdateNotify.proto index 69bd11ab..ec342e12 100644 --- a/proto/OpenStateUpdateNotify.proto +++ b/proto/OpenStateUpdateNotify.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 29093 +// CmdId: 29093 message OpenStateUpdateNotify { map open_state_map = 11; diff --git a/proto/OtherPlayerEnterHomeNotify.proto b/proto/OtherPlayerEnterHomeNotify.proto index 43089b5f..d981c20e 100644 --- a/proto/OtherPlayerEnterHomeNotify.proto +++ b/proto/OtherPlayerEnterHomeNotify.proto @@ -1,14 +1,15 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 28932 -// DLLMKEHEAKF +// Version: 5.0 +// CmdId: 22683 + message OtherPlayerEnterHomeNotify { - enum Reason { + enum Reason { INVALID = 0; ENTER = 1; LEAVE = 2; } - Reason reason = 6; - string nickname = 8; + string nickname = 3; + Reason reason = 7; } diff --git a/proto/ParamList.proto b/proto/ParamList.proto index 6ad7a9e4..c0bb0668 100644 --- a/proto/ParamList.proto +++ b/proto/ParamList.proto @@ -1,6 +1,8 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// Version: 4.7.0 -message ParamList { - repeated uint32 param_list = 1; -} \ No newline at end of file +// Version: 5.0 + +message ParamList { + repeated uint32 param_list = 1; +} \ No newline at end of file diff --git a/proto/ParentQuest.proto b/proto/ParentQuest.proto index 7fb10154..4d20d240 100644 --- a/proto/ParentQuest.proto +++ b/proto/ParentQuest.proto @@ -1,24 +1,27 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 -import "ChildQuest.proto"; import "ParentQuestRandomInfo.proto"; +import "ChildQuest.proto"; import "InferencePageInfo.proto"; +//import "DJJEGLDMNAG.proto"; -// 4.7.0 message ParentQuest { - bool is_random = 1; - repeated ChildQuest child_quest_list = 2; - uint32 quest_var_seq = 3; - repeated int32 quest_var = 4; - uint64 video_key = 7; - bool is_finished = 8; - ParentQuestRandomInfo random_info = 9; - uint32 parent_quest_state = 10; - uint32 parent_quest_id = 11; - map time_var_map = 12; - uint32 accept_time = 13; - bool JHIHBMEAJPO = 14; - repeated InferencePageInfo inference_page_list = 15; -} \ No newline at end of file + ParentQuestRandomInfo random_info = 1; + repeated ChildQuest child_quest_list = 2; + uint32 quest_var_seq = 3; + uint32 parent_quest_state = 4; + bool is_random = 5; + bool MGIJFMCBJKE = 6; + uint32 accept_time = 7; + repeated InferencePageInfo inference_page_list = 8; + uint32 parent_quest_id = 9; + bool CKJMKGOKNED = 10; + //repeated DJJEGLDMNAG AHHODEACDAL = 11; + bool is_finished = 12; + map time_var_map = 13; + repeated int32 quest_var = 14; + uint64 video_key = 15; +} diff --git a/proto/ParentQuestRandomInfo.proto b/proto/ParentQuestRandomInfo.proto index b92bdc50..f5c9dbee 100644 --- a/proto/ParentQuestRandomInfo.proto +++ b/proto/ParentQuestRandomInfo.proto @@ -1,10 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 -// 4.7.0 -message ParentQuestRandomInfo { - uint32 template_id = 2; - repeated uint32 factor_list = 4; - uint32 entrance_id = 14; -} \ No newline at end of file +message ParentQuestRandomInfo { + repeated uint32 factor_list = 3; + uint32 template_id = 11; + uint32 entrance_id = 15; +} \ No newline at end of file diff --git a/proto/PathStatusType.proto b/proto/PathStatusType.proto index 085c19a8..eb2e9ba1 100644 --- a/proto/PathStatusType.proto +++ b/proto/PathStatusType.proto @@ -1,11 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - - +// Version: 5.0 enum PathStatusType { - PATH_STATUS_TYPE_FAIL = 0; + PATH_STATUS_TYPE_FAIL = 0; PATH_STATUS_TYPE_SUCC = 1; PATH_STATUS_TYPE_PARTIAL = 2; } diff --git a/proto/PathfindingEnterSceneReq.proto b/proto/PathfindingEnterSceneReq.proto index 76b97f04..cf8b9194 100644 --- a/proto/PathfindingEnterSceneReq.proto +++ b/proto/PathfindingEnterSceneReq.proto @@ -1,16 +1,17 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 2374 import "ObstacleInfo.proto"; -// 4.7.0 -message PathfindingEnterSceneReq { - uint32 scene_id = 10; - uint32 version = 1; - repeated ObstacleInfo obstacles = 8; - repeated int32 FNMLAKOPPNA = 9; - uint32 AHCPBKOFKNE = 2; - bool is_editor = 15; - uint32 FHIFPHJNIJO = 6; -} \ No newline at end of file +message PathfindingEnterSceneReq { + repeated ObstacleInfo obstacles = 10; + repeated int32 HDFCDNCGBBH = 9; + bool is_editor = 8; + uint32 DKEOBFMAFPK = 13; + uint32 scene_id = 14; + uint32 version = 5; + uint32 CDDPHGDDCCN = 3; +} \ No newline at end of file diff --git a/proto/PersonalLineAllDataReq.proto b/proto/PersonalLineAllDataReq.proto index 816303f7..7fd3b432 100644 --- a/proto/PersonalLineAllDataReq.proto +++ b/proto/PersonalLineAllDataReq.proto @@ -1,22 +1,8 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// CmdId: 9323 -// Obf: BDPIKKGLOCD -message PersonalLineAllDataReq { -} +// Version: 5.0 +// CmdId: 28403 + +message PersonalLineAllDataReq { +} \ No newline at end of file diff --git a/proto/PersonalSceneJumpReq.proto b/proto/PersonalSceneJumpReq.proto index 0e41194c..9f9a9e0b 100644 --- a/proto/PersonalSceneJumpReq.proto +++ b/proto/PersonalSceneJumpReq.proto @@ -1,7 +1,9 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message PersonalSceneJumpReq { - uint32 point_id = 11; -} +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 25750 + +message PersonalSceneJumpReq { + uint32 point_id = 6; +} \ No newline at end of file diff --git a/proto/PingReq.proto b/proto/PingReq.proto index 91008f8b..9eea236a 100644 --- a/proto/PingReq.proto +++ b/proto/PingReq.proto @@ -2,11 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 5983 +// CmdId: 5983 message PingReq { bytes PDHFGJIBCLA = 13; - bytes IINPBFLAEEP = 2; + bytes sc_data = 2; uint64 NHLLKPHMFGP = 3; double total_tick_time = 7; uint32 client_time = 4; diff --git a/proto/PingRsp.proto b/proto/PingRsp.proto index b7fc6b00..0330c1c4 100644 --- a/proto/PingRsp.proto +++ b/proto/PingRsp.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 22595 +// CmdId: 22595 message PingRsp { uint32 seq = 2; diff --git a/proto/PlatformType.proto b/proto/PlatformType.proto index 036a8cdf..7acc41d2 100644 --- a/proto/PlatformType.proto +++ b/proto/PlatformType.proto @@ -1,26 +1,28 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// Obf: MLEBHNLEKAB -enum PlatformType { - PLATFORM_TYPE_EDITOR = 0; - PLATFORM_TYPE_IOS = 1; - PLATFORM_TYPE_ANDROID = 2; - PLATFORM_TYPE_PC = 3; - PLATFORM_TYPE_PS4 = 4; - PLATFORM_TYPE_SERVER = 5; - PLATFORM_TYPE_CLOUD_ANDROID = 6; - PLATFORM_TYPE_CLOUD_IOS = 7; - PLATFORM_TYPE_PS5 = 8; - PLATFORM_TYPE_CLOUD_WEB = 9; - PLATFORM_TYPE_CLOUD_TV = 10; - PLATFORM_TYPE_CLOUD_MAC = 11; - PLATFORM_TYPE_CLOUD_PC = 12; - PLATFORM_TYPE_CLOUD_THIRD_PARTY_MOBILE = 13; - PLATFORM_TYPE_CLOUD_THIRD_PARTY_PC = 14; - PLATFORM_TYPE_CLOUD_WEB_ANDROID = 15; - PLATFORM_TYPE_CLOUD_WEB_IOS = 16; - PLATFORM_TYPE_CLOUD_WEB_PC = 17; - PLATFORM_TYPE_CLOUD_WEB_MAC = 18; - PLATFORM_TYPE_CLOUD_WEB_TOUCH = 19; - PLATFORM_TYPE_CLOUD_WEB_KEYBOARD = 20; -} +// Version: 5.0 + +enum PlatformType { + PLATFORM_TYPE_EDITOR = 0; + PLATFORM_TYPE_IOS = 1; + PLATFORM_TYPE_ANDROID = 2; + PLATFORM_TYPE_PC = 3; + PLATFORM_TYPE_PS4 = 4; + PLATFORM_TYPE_SERVER = 5; + PLATFORM_TYPE_CLOUD_ANDROID = 6; + PLATFORM_TYPE_CLOUD_IOS = 7; + PLATFORM_TYPE_PS5 = 8; + PLATFORM_TYPE_CLOUD_WEB = 9; + PLATFORM_TYPE_CLOUD_TV = 10; + PLATFORM_TYPE_CLOUD_MAC = 11; + PLATFORM_TYPE_CLOUD_PC = 12; + PLATFORM_TYPE_CLOUD_THIRD_PARTY_MOBILE = 13; + PLATFORM_TYPE_CLOUD_THIRD_PARTY_PC = 14; + PLATFORM_TYPE_CLOUD_WEB_ANDROID = 15; + PLATFORM_TYPE_CLOUD_WEB_IOS = 16; + PLATFORM_TYPE_CLOUD_WEB_PC = 17; + PLATFORM_TYPE_CLOUD_WEB_MAC = 18; + PLATFORM_TYPE_CLOUD_WEB_TOUCH = 19; + PLATFORM_TYPE_CLOUD_WEB_KEYBOARD = 20; +} \ No newline at end of file diff --git a/proto/PlayTeamEntityInfo.proto b/proto/PlayTeamEntityInfo.proto index 3fc4b59c..360b33f5 100644 --- a/proto/PlayTeamEntityInfo.proto +++ b/proto/PlayTeamEntityInfo.proto @@ -1,11 +1,14 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + import "AbilitySyncStateInfo.proto"; -// Obf: EHPIOEOLPIA -message PlayTeamEntityInfo { - uint32 entity_id = 1; - uint32 player_uid = 2; - uint32 authority_peer_id = 3; - uint32 gadget_config_id = 5; - AbilitySyncStateInfo ability_info = 6; -} + +message PlayTeamEntityInfo { + uint32 entity_id = 1; + uint32 player_uid = 2; + uint32 authority_peer_id = 3; + uint32 gadget_config_id = 5; + AbilitySyncStateInfo ability_info = 6; +} \ No newline at end of file diff --git a/proto/PlayerApplyEnterMpNotify.proto b/proto/PlayerApplyEnterMpNotify.proto index e8e955a7..e96a390c 100644 --- a/proto/PlayerApplyEnterMpNotify.proto +++ b/proto/PlayerApplyEnterMpNotify.proto @@ -1,10 +1,13 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 5245 + import "OnlinePlayerInfo.proto"; -// CmdId: 7182 ? (4.7.0) -// Obf: HKDJLHPMDFP + message PlayerApplyEnterMpNotify { - uint32 src_app_id = 9; - uint32 src_thread_index = 15; - OnlinePlayerInfo src_player_info = 14; + uint32 src_app_id = 1; + uint32 src_thread_index = 11; + OnlinePlayerInfo src_player_info = 13; } diff --git a/proto/PlayerChatNotify.proto b/proto/PlayerChatNotify.proto index 6b6ed312..8078158c 100644 --- a/proto/PlayerChatNotify.proto +++ b/proto/PlayerChatNotify.proto @@ -1,10 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 25824 + import "ChatInfo.proto"; -// 4.7.0 -// CmdId: 1772 -// OJDDKJJMMKK -message PlayerChatNotify { - ChatInfo chat_info = 6; - uint32 channel_id = 2; -} \ No newline at end of file + +message PlayerChatNotify { + uint32 channel_id = 5; + ChatInfo chat_info = 13; +} \ No newline at end of file diff --git a/proto/PlayerChatReq.proto b/proto/PlayerChatReq.proto index f954d5d8..5c0b559c 100644 --- a/proto/PlayerChatReq.proto +++ b/proto/PlayerChatReq.proto @@ -1,9 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 21209 + import "ChatInfo.proto"; -// 4.7.0 -// CmdId: 5171? -message PlayerChatReq { - uint32 channel_id = 1; - ChatInfo chat_info = 9; -} \ No newline at end of file + +message PlayerChatReq { + ChatInfo chat_info = 5; + uint32 channel_id = 8; +} \ No newline at end of file diff --git a/proto/PlayerDataNotify.proto b/proto/PlayerDataNotify.proto index 2ecceb60..6e652b33 100644 --- a/proto/PlayerDataNotify.proto +++ b/proto/PlayerDataNotify.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 7961 +// CmdId: 7961 import "PropValue.proto"; diff --git a/proto/PlayerDieOption.proto b/proto/PlayerDieOption.proto index 7362f4d0..cee5034e 100644 --- a/proto/PlayerDieOption.proto +++ b/proto/PlayerDieOption.proto @@ -1,10 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// Obf: LAOBNEJJEPF -enum PlayerDieOption { - DIE_OPT_NONE = 0; - DIE_OPT_REPLAY = 1; - DIE_OPT_CANCEL = 2; - DIE_OPT_REVIVE = 3; -} +// Version: 5.0 + +enum PlayerDieOption { + DIE_OPT_NONE = 0; + DIE_OPT_REPLAY = 1; + DIE_OPT_CANCEL = 2; + DIE_OPT_REVIVE = 3; +} \ No newline at end of file diff --git a/proto/PlayerDieType.proto b/proto/PlayerDieType.proto index 0da680cf..4bb93212 100644 --- a/proto/PlayerDieType.proto +++ b/proto/PlayerDieType.proto @@ -3,16 +3,16 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -enum PlayerDieType { - PLAYER_DIE_TYPE_NONE = 0; - PLAYER_DIE_TYPE_KILL_BY_MONSTER = 1; - PLAYER_DIE_TYPE_KILL_BY_GEAR = 2; - PLAYER_DIE_TYPE_FALL = 3; - PLAYER_DIE_TYPE_DRAWN = 4; - PLAYER_DIE_TYPE_ABYSS = 5; - PLAYER_DIE_TYPE_GM = 6; - PLAYER_DIE_TYPE_CLIMATE_COLD = 7; - PLAYER_DIE_TYPE_STORM_LIGHTING = 8; - PLAYER_DIE_TYPE_DIRTY_WATER_EROSION = 9; - PLAYER_DIE_TYPE_LIQUID_PHLOGISTON = 10; -} \ No newline at end of file +enum PlayerDieType { + PLAYER_DIE_TYPE_NONE = 0; + PLAYER_DIE_TYPE_KILL_BY_MONSTER = 1; + PLAYER_DIE_TYPE_KILL_BY_GEAR = 2; + PLAYER_DIE_TYPE_FALL = 3; + PLAYER_DIE_TYPE_DRAWN = 4; + PLAYER_DIE_TYPE_ABYSS = 5; + PLAYER_DIE_TYPE_GM = 6; + PLAYER_DIE_TYPE_CLIMATE_COLD = 7; + PLAYER_DIE_TYPE_STORM_LIGHTING = 8; + PLAYER_DIE_TYPE_DIRTY_WATER_EROSION = 9; + PLAYER_DIE_TYPE_LIQUID_PHLOGISTON = 10; +} diff --git a/proto/PlayerEnterDungeonReq.proto b/proto/PlayerEnterDungeonReq.proto index 44104ce7..c5bfca35 100644 --- a/proto/PlayerEnterDungeonReq.proto +++ b/proto/PlayerEnterDungeonReq.proto @@ -1,14 +1,14 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 7557 import "DungeonEnterPosInfo.proto"; -// 4.7.0 -// CmdId: 21509 -// AFNMCKAGOLH -message PlayerEnterDungeonReq { - uint32 dungeon_id = 2; - uint32 point_id = 11; - DungeonEnterPosInfo enter_pos_info = 9; -} \ No newline at end of file +message PlayerEnterDungeonReq { + DungeonEnterPosInfo enter_pos_info = 13; + bool LLCOCJHJBME = 10; + uint32 dungeon_id = 2; + uint32 point_id = 6; +} \ No newline at end of file diff --git a/proto/PlayerEnterDungeonRsp.proto b/proto/PlayerEnterDungeonRsp.proto index 319054c0..04e2e018 100644 --- a/proto/PlayerEnterDungeonRsp.proto +++ b/proto/PlayerEnterDungeonRsp.proto @@ -1,12 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 3067 -// 4.7.0 -// CmdId: 29126 -// GIFFOLCPGJE -message PlayerEnterDungeonRsp { - uint32 dungeon_id = 7; - uint32 point_id = 10; - int32 retcode = 2; -} \ No newline at end of file +message PlayerEnterDungeonRsp { + uint32 dungeon_id = 10; + int32 retcode = 12; + uint32 point_id = 13; +} \ No newline at end of file diff --git a/proto/PlayerEnterSceneInfoNotify.proto b/proto/PlayerEnterSceneInfoNotify.proto index 973163a3..3c1f5352 100644 --- a/proto/PlayerEnterSceneInfoNotify.proto +++ b/proto/PlayerEnterSceneInfoNotify.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 26700 +// CmdId: 26700 import "TeamEnterSceneInfo.proto"; import "AvatarEnterSceneInfo.proto"; diff --git a/proto/PlayerEnterSceneNotify.proto b/proto/PlayerEnterSceneNotify.proto index 7657892e..4706c0b2 100644 --- a/proto/PlayerEnterSceneNotify.proto +++ b/proto/PlayerEnterSceneNotify.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 3595 +// CmdId: 3595 import "Vector.proto"; import "EnterType.proto"; @@ -11,14 +11,14 @@ import "EnterType.proto"; import "MapLayerInfo.proto"; message PlayerEnterSceneNotify { - bool JDNGEPMPFOH = 1; - Vector MBFONBLMNBL = 2; - uint32 OBFCJPOJMOM = 3; + bool is_skip_ui = 1; + Vector prev_pos = 2; + uint32 world_level = 3; uint32 target_uid = 4; uint64 scene_begin_time = 5; repeated uint32 scene_tag_id_list = 6; uint32 enter_scene_token = 7; - uint32 GAPLFMMGBFA = 11; + uint32 dungeon_id = 11; uint32 GPJHAEEMCBK = 12; Vector pos = 13; uint32 scene_id = 14; @@ -30,9 +30,9 @@ message PlayerEnterSceneNotify { //GJNOBDELMLF BFPGBNDFGBO = 681; MapLayerInfo map_layer_info = 740; Vector KMDLMKGJIHH = 776; - bool GBHGABLFDME = 816; + bool is_first_login_enter_scene = 816; uint32 DDGBKGDECME = 1148; string scene_transaction = 1492; - uint32 KKLADMFLAOE = 1696; + uint32 create_player_uid = 1696; uint32 OKCAGDNDEJN = 1870; } diff --git a/proto/PlayerGameTimeNotify.proto b/proto/PlayerGameTimeNotify.proto index 98c6ffc1..8a915515 100644 --- a/proto/PlayerGameTimeNotify.proto +++ b/proto/PlayerGameTimeNotify.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 4423 +// CmdId: 4423 message PlayerGameTimeNotify { uint32 game_time = 4; diff --git a/proto/PlayerHomeCompInfo.proto b/proto/PlayerHomeCompInfo.proto index b6d570bb..d0c082db 100644 --- a/proto/PlayerHomeCompInfo.proto +++ b/proto/PlayerHomeCompInfo.proto @@ -1,11 +1,13 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 import "FriendEnterHomeOption.proto"; -message PlayerHomeCompInfo { - FriendEnterHomeOption friend_enter_home_option = 7; - repeated uint32 levelup_reward_got_level_list = 9; - repeated uint32 seen_module_id_list = 13; - repeated uint32 unlocked_module_id_list = 15; -} +message PlayerHomeCompInfo { + FriendEnterHomeOption friend_enter_home_option = 8; + repeated uint32 seen_module_id_list = 10; + repeated uint32 unlocked_module_id_list = 11; + repeated uint32 levelup_reward_got_level_list = 12; +} \ No newline at end of file diff --git a/proto/PlayerHomeCompInfoNotify.proto b/proto/PlayerHomeCompInfoNotify.proto index 8ed26479..dec5c381 100644 --- a/proto/PlayerHomeCompInfoNotify.proto +++ b/proto/PlayerHomeCompInfoNotify.proto @@ -1,10 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 20264 import "PlayerHomeCompInfo.proto"; -// 4.6.0 -// CmdId: 9764 -message PlayerHomeCompInfoNotify { - PlayerHomeCompInfo comp_info = 13; -} +message PlayerHomeCompInfoNotify { + PlayerHomeCompInfo comp_info = 4; +} \ No newline at end of file diff --git a/proto/PlayerInvestigationAllInfoNotify.proto b/proto/PlayerInvestigationAllInfoNotify.proto index 7199d0a3..1cf77872 100644 --- a/proto/PlayerInvestigationAllInfoNotify.proto +++ b/proto/PlayerInvestigationAllInfoNotify.proto @@ -1,12 +1,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 1519 -import "Investigation.proto"; import "InvestigationTarget.proto"; -// 4.7.0 -// CmdId: 27774 -message PlayerInvestigationAllInfoNotify { - repeated Investigation investigation_list = 11; - repeated InvestigationTarget investigation_target_list = 15; -} \ No newline at end of file +import "Investigation.proto"; + +message PlayerInvestigationAllInfoNotify { + repeated InvestigationTarget investigation_target_list = 8; + repeated Investigation investigation_list = 9; +} \ No newline at end of file diff --git a/proto/PlayerInvestigationNotify.proto b/proto/PlayerInvestigationNotify.proto index aa69b020..d1ea57a5 100644 --- a/proto/PlayerInvestigationNotify.proto +++ b/proto/PlayerInvestigationNotify.proto @@ -1,10 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 6848 import "Investigation.proto"; -// 4.7.0 -// CmdId: 6640 -message PlayerInvestigationNotify { - repeated Investigation investigation_list = 6; -} \ No newline at end of file + +message PlayerInvestigationNotify { + repeated Investigation investigation_list = 4; +} \ No newline at end of file diff --git a/proto/PlayerInvestigationTargetNotify.proto b/proto/PlayerInvestigationTargetNotify.proto index d125ab1d..6ed39555 100644 --- a/proto/PlayerInvestigationTargetNotify.proto +++ b/proto/PlayerInvestigationTargetNotify.proto @@ -1,10 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 5321 import "InvestigationTarget.proto"; -// 4.7.0 -// CmdId: 22101 -message PlayerInvestigationTargetNotify { - repeated InvestigationTarget investigation_target_list = 7; -} + +message PlayerInvestigationTargetNotify { + repeated InvestigationTarget investigation_target_list = 15; +} \ No newline at end of file diff --git a/proto/PlayerLocationInfo.proto b/proto/PlayerLocationInfo.proto index 91910a2a..7f9baf29 100644 --- a/proto/PlayerLocationInfo.proto +++ b/proto/PlayerLocationInfo.proto @@ -1,13 +1,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 import "Vector.proto"; -// Version: 4.7.0 -// Obfs: IEEDPBMKLFC -message PlayerLocationInfo { - uint32 uid = 1; - Vector pos = 6; - Vector rot = 12; -} +message PlayerLocationInfo { + Vector pos = 1; + uint32 uid = 5; + Vector rot = 10; + repeated uint32 KJAEPLIIAIH = 12; +} \ No newline at end of file diff --git a/proto/PlayerLoginReq.proto b/proto/PlayerLoginReq.proto index a7f0e37e..5f41f3e8 100644 --- a/proto/PlayerLoginReq.proto +++ b/proto/PlayerLoginReq.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 2422 +// CmdId: 2422 //import "LHACJNELJMN.proto"; //import "CNIFDNMIKIF.proto"; @@ -19,7 +19,7 @@ message PlayerLoginReq { string LPFPAJBHJMH = 46; //LHACJNELJMN KOFGDJGJPLH = 1939; bytes OFMIHDNGFNM = 265; - string KAMJIJOLFKJ = 376; + string online_id = 376; string KEODMFOKNGH = 5; string MEEGOICDEFG = 525; string MDIKIHJHHJJ = 4; @@ -31,8 +31,8 @@ message PlayerLoginReq { string IMCMLAGLODL = 1146; string NNBGJPGDGCP = 13; string CDDBBPKKOPM = 921; - string MMDPDOOCOCO = 1762; - string JCIMGDHMMLN = 1179; + string psn_id = 1762; + string birthday = 1179; string PECPGFPBJEB = 216; string account_uid = 11; uint32 account_type = 9; @@ -40,10 +40,10 @@ message PlayerLoginReq { uint32 PLNNJPFPPAM = 2029; uint32 target_home_owner_uid = 226; bool is_guest = 6; - bool HAAGGONEHCH = 1; + bool is_editor = 1; bool JAGELBDJFJH = 1641; uint64 login_rand = 12; - uint32 OCINFHOJCEA = 725; + uint32 channel_id = 725; uint32 tag = 1158; uint32 KPCGBPCHBMJ = 507; uint32 client_data_version = 420; diff --git a/proto/PlayerLoginRsp.proto b/proto/PlayerLoginRsp.proto index 6fa8b4d7..b578d757 100644 --- a/proto/PlayerLoginRsp.proto +++ b/proto/PlayerLoginRsp.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 27771 +// CmdId: 27771 import "ShortAbilityHashPair.proto"; import "ResVersionConfig.proto"; @@ -24,7 +24,7 @@ message PlayerLoginRsp { int32 retcode = 12; map ability_hash_map = 14; uint32 client_data_version = 15; - bool POPJGOJFOKA = 67; + bool is_audit = 67; repeated ShortAbilityHashPair short_ability_hash_map = 90; ResVersionConfig res_version_config = 113; bool KLLPFNOLBHO = 179; @@ -43,9 +43,9 @@ message PlayerLoginRsp { string next_resource_url = 1549; string PKEKLEEOLJL = 1594; map block_info_map = 1596; - string JCIMGDHMMLN = 1689; + string birthday = 1689; string JKANELMFGEP = 1728; - bool FGFIHNBMJMK = 1869; + bool is_data_need_relogin = 1869; string country_code = 1898; ResVersionConfig next_res_version_config = 1975; } \ No newline at end of file diff --git a/proto/PlayerPropChangeNotify.proto b/proto/PlayerPropChangeNotify.proto index d653e561..79ba6fc1 100644 --- a/proto/PlayerPropChangeNotify.proto +++ b/proto/PlayerPropChangeNotify.proto @@ -1,8 +1,10 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message PlayerPropChangeNotify { - uint32 prop_delta = 2; - uint32 prop_type = 14; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 27937 + +message PlayerPropChangeNotify { + uint32 prop_delta = 7; + uint32 prop_type = 13; +} \ No newline at end of file diff --git a/proto/PlayerPropChangeReasonNotify.proto b/proto/PlayerPropChangeReasonNotify.proto index 9e0685a8..61dd7580 100644 --- a/proto/PlayerPropChangeReasonNotify.proto +++ b/proto/PlayerPropChangeReasonNotify.proto @@ -1,12 +1,14 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 25374 import "PropChangeReason.proto"; -// 4.7.0 -message PlayerPropChangeReasonNotify { - float cur_value = 1; - float old_value = 4; - uint32 prop_type = 5; - PropChangeReason reason = 9; -} \ No newline at end of file +message PlayerPropChangeReasonNotify { + float cur_value = 1; + PropChangeReason reason = 10; + uint32 prop_type = 11; + float old_value = 13; +} \ No newline at end of file diff --git a/proto/PlayerPropNotify.proto b/proto/PlayerPropNotify.proto index 8e99fa1d..1925a6c5 100644 --- a/proto/PlayerPropNotify.proto +++ b/proto/PlayerPropNotify.proto @@ -1,8 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 25998 + import "PropValue.proto"; -// 4.7.0 -message PlayerPropNotify { - map prop_map = 13; -} \ No newline at end of file +message PlayerPropNotify { + map prop_map = 12; +} \ No newline at end of file diff --git a/proto/PlayerQuitDungeonReq.proto b/proto/PlayerQuitDungeonReq.proto index 9b3fb268..dd6fe3a8 100644 --- a/proto/PlayerQuitDungeonReq.proto +++ b/proto/PlayerQuitDungeonReq.proto @@ -1,11 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 25440 -// 4.7.0 -// CmdId: 4653 -// GLKCKLJODKO -message PlayerQuitDungeonReq { - uint32 point_id = 12; - bool is_quit_immediately = 7; -} \ No newline at end of file +message PlayerQuitDungeonReq { + uint32 point_id = 10; + bool is_quit_immediately = 1; +} \ No newline at end of file diff --git a/proto/PlayerQuitFromHomeNotify.proto b/proto/PlayerQuitFromHomeNotify.proto index 50bacd7f..8559f904 100644 --- a/proto/PlayerQuitFromHomeNotify.proto +++ b/proto/PlayerQuitFromHomeNotify.proto @@ -1,10 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 21403 -// DMHIGMMPDIN +// Version: 5.0 +// CmdId: 3135 + message PlayerQuitFromHomeNotify { - enum QuitReason { + enum QuitReason { INVALID = 0; KICK_BY_HOST = 1; BACK_TO_MY_WORLD = 2; @@ -13,6 +14,5 @@ message PlayerQuitFromHomeNotify { BY_MUIP = 5; CUR_MODULE_CLOSED = 6; } - - QuitReason reason = 5; + QuitReason reason = 15; } diff --git a/proto/PlayerSetPauseReq.proto b/proto/PlayerSetPauseReq.proto index d70e8d05..e03b1520 100644 --- a/proto/PlayerSetPauseReq.proto +++ b/proto/PlayerSetPauseReq.proto @@ -1,8 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 8076 -// 4.7.0 -message PlayerSetPauseReq { - bool is_paused = 15; -} +message PlayerSetPauseReq { + bool is_paused = 9; +} \ No newline at end of file diff --git a/proto/PlayerSetPauseRsp.proto b/proto/PlayerSetPauseRsp.proto index 3c593cd4..74923444 100644 --- a/proto/PlayerSetPauseRsp.proto +++ b/proto/PlayerSetPauseRsp.proto @@ -1,8 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 25030 -// 4.7.0 -message PlayerSetPauseRsp { - int32 retcode = 8; -} +message PlayerSetPauseRsp { + int32 retcode = 15; +} \ No newline at end of file diff --git a/proto/PlayerStoreNotify.proto b/proto/PlayerStoreNotify.proto index 03e50109..3f02922e 100644 --- a/proto/PlayerStoreNotify.proto +++ b/proto/PlayerStoreNotify.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 7845 +// CmdId: 7845 import "Item.proto"; import "StoreType.proto"; diff --git a/proto/PlayerTimeNotify.proto b/proto/PlayerTimeNotify.proto index e407c55c..f79ea8d6 100644 --- a/proto/PlayerTimeNotify.proto +++ b/proto/PlayerTimeNotify.proto @@ -1,10 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 2272 -// 4.7.0 -message PlayerTimeNotify { - uint64 player_time = 5; - bool is_paused = 8; - uint64 server_time = 10; -} +message PlayerTimeNotify { + bool is_paused = 3; + uint64 server_time = 7; + uint64 player_time = 8; +} \ No newline at end of file diff --git a/proto/PlayerWidgetInfo.proto b/proto/PlayerWidgetInfo.proto index d02db974..22d5eac9 100644 --- a/proto/PlayerWidgetInfo.proto +++ b/proto/PlayerWidgetInfo.proto @@ -1,10 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 import "WidgetSlotData.proto"; -// 4.7.0 -message PlayerWidgetInfo { - repeated WidgetSlotData slot_list = 9; - uint32 uid = 10; -} \ No newline at end of file +message PlayerWidgetInfo { + repeated WidgetSlotData slot_list = 6; + uint32 uid = 10; +} \ No newline at end of file diff --git a/proto/PlayerWorldSceneInfo.proto b/proto/PlayerWorldSceneInfo.proto index 43ec8b8f..f9128da6 100644 --- a/proto/PlayerWorldSceneInfo.proto +++ b/proto/PlayerWorldSceneInfo.proto @@ -1,12 +1,15 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + +//import "CGMAOKBGOHO.proto"; import "MapLayerInfo.proto"; -// 4.7.0 message PlayerWorldSceneInfo { - MapLayerInfo map_layer_info = 10; - uint32 scene_id = 12; - bool is_locked = 3; - repeated uint32 scene_tag_id_list = 6; -} \ No newline at end of file + repeated uint32 scene_tag_id_list = 5; + //CGMAOKBGOHO DFNDKDAFEJO = 7; + bool is_locked = 10; + uint32 scene_id = 11; + MapLayerInfo map_layer_info = 14; +} diff --git a/proto/PlayerWorldSceneInfoListNotify.proto b/proto/PlayerWorldSceneInfoListNotify.proto index 1e513f16..7a1d754b 100644 --- a/proto/PlayerWorldSceneInfoListNotify.proto +++ b/proto/PlayerWorldSceneInfoListNotify.proto @@ -1,9 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 8028 import "PlayerWorldSceneInfo.proto"; -// 4.7.0 -message PlayerWorldSceneInfoListNotify { - repeated PlayerWorldSceneInfo info_list = 14; -} \ No newline at end of file +message PlayerWorldSceneInfoListNotify { + repeated PlayerWorldSceneInfo info_list = 13; + repeated uint32 KNFOKJBGBEI = 1055; +} \ No newline at end of file diff --git a/proto/PostEnterSceneReq.proto b/proto/PostEnterSceneReq.proto index 80cad8b1..c0a4c8ec 100644 --- a/proto/PostEnterSceneReq.proto +++ b/proto/PostEnterSceneReq.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 3633 +// CmdId: 3633 message PostEnterSceneReq { double total_tick_time = 8; diff --git a/proto/PostEnterSceneRsp.proto b/proto/PostEnterSceneRsp.proto index 60e64d84..ea8e9753 100644 --- a/proto/PostEnterSceneRsp.proto +++ b/proto/PostEnterSceneRsp.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 22743 +// CmdId: 22743 message PostEnterSceneRsp { uint32 enter_scene_token = 8; diff --git a/proto/PotionDungeonResultInfo.proto b/proto/PotionDungeonResultInfo.proto index f73b002c..c8ed3378 100644 --- a/proto/PotionDungeonResultInfo.proto +++ b/proto/PotionDungeonResultInfo.proto @@ -1,13 +1,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 -// 4.6.0 -message PotionDungeonResultInfo { - uint32 IPKGIOBPENI = 3; - uint32 EEOAFHOMHPH = 8; - uint32 MCAIMDGIIPN = 10; - uint32 level_id = 11; - uint32 IKDMGBPAKOL = 12; - uint32 stage_id = 13; -} \ No newline at end of file +message PotionDungeonResultInfo { + uint32 PJJAOILBFBN = 3; + uint32 LJEJEBELKMJ = 5; + uint32 LJFAFDHIKJD = 7; + uint32 MEMPKCGNNMF = 9; + uint32 KDPLCBJGBAF = 12; + uint32 KMAEHPAGKFK = 15; +} \ No newline at end of file diff --git a/proto/PrivateChatNotify.proto b/proto/PrivateChatNotify.proto index 2fd98023..fb4172da 100644 --- a/proto/PrivateChatNotify.proto +++ b/proto/PrivateChatNotify.proto @@ -1,9 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 6396 + import "ChatInfo.proto"; -// 4.7.0 -// CmdId: 7936 -// ? -message PrivateChatNotify { - ChatInfo chat_info = 14; -} \ No newline at end of file + +message PrivateChatNotify { + ChatInfo chat_info = 7; +} \ No newline at end of file diff --git a/proto/PrivateChatReq.proto b/proto/PrivateChatReq.proto index c61aa46f..b6c63e03 100644 --- a/proto/PrivateChatReq.proto +++ b/proto/PrivateChatReq.proto @@ -1,11 +1,13 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 24426 + message PrivateChatReq { - uint32 target_uid = 15; - oneof content { - string text = 7; - uint32 icon = 4; - } + uint32 target_uid = 8; + oneof content { + uint32 icon = 11; + string text = 9; + } } \ No newline at end of file diff --git a/proto/ProfilePicture.proto b/proto/ProfilePicture.proto index 3433b83e..d4c2b783 100644 --- a/proto/ProfilePicture.proto +++ b/proto/ProfilePicture.proto @@ -1,9 +1,10 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message ProfilePicture { - uint32 head_image_id = 3; - uint32 costume_id = 2; - uint32 avatar_id = 1; -} +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + +message ProfilePicture { + uint32 avatar_id = 1; + uint32 costume_id = 2; + uint32 head_image_id = 3; +} \ No newline at end of file diff --git a/proto/PropChangeReason.proto b/proto/PropChangeReason.proto index 8ff76a02..89aaaba4 100644 --- a/proto/PropChangeReason.proto +++ b/proto/PropChangeReason.proto @@ -1,19 +1,21 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// Obf: OGLAIMNKFEK -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; -} +// Version: 5.0 + +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; +} \ No newline at end of file diff --git a/proto/ProtEntityType.proto b/proto/ProtEntityType.proto index 0692a9eb..05e48e88 100644 --- a/proto/ProtEntityType.proto +++ b/proto/ProtEntityType.proto @@ -3,19 +3,19 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -enum ProtEntityType { - PROT_ENTITY_TYPE_NONE = 0; - PROT_ENTITY_TYPE_AVATAR = 1; - PROT_ENTITY_TYPE_MONSTER = 2; - PROT_ENTITY_TYPE_NPC = 3; - PROT_ENTITY_TYPE_GADGET = 4; - PROT_ENTITY_TYPE_REGION = 5; - PROT_ENTITY_TYPE_WEAPON = 6; - PROT_ENTITY_TYPE_WEATHER = 7; - PROT_ENTITY_TYPE_SCENE = 8; - PROT_ENTITY_TYPE_TEAM = 9; - PROT_ENTITY_TYPE_MP_LEVEL = 11; - PROT_ENTITY_TYPE_PLAY_TEAM_ENTITY = 12; - PROT_ENTITY_TYPE_EYE_POINT = 13; - PROT_ENTITY_TYPE_MAX = 14; -} \ No newline at end of file +enum ProtEntityType { + PROT_ENTITY_TYPE_NONE = 0; + PROT_ENTITY_TYPE_AVATAR = 1; + PROT_ENTITY_TYPE_MONSTER = 2; + PROT_ENTITY_TYPE_NPC = 3; + PROT_ENTITY_TYPE_GADGET = 4; + PROT_ENTITY_TYPE_REGION = 5; + PROT_ENTITY_TYPE_WEAPON = 6; + PROT_ENTITY_TYPE_WEATHER = 7; + PROT_ENTITY_TYPE_SCENE = 8; + PROT_ENTITY_TYPE_TEAM = 9; + PROT_ENTITY_TYPE_MP_LEVEL = 11; + PROT_ENTITY_TYPE_PLAY_TEAM_ENTITY = 12; + PROT_ENTITY_TYPE_EYE_POINT = 13; + PROT_ENTITY_TYPE_MAX = 14; +} diff --git a/proto/PullPrivateChatReq.proto b/proto/PullPrivateChatReq.proto index 2ce9c3f7..3b7fa9f9 100644 --- a/proto/PullPrivateChatReq.proto +++ b/proto/PullPrivateChatReq.proto @@ -1,9 +1,11 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message PullPrivateChatReq { - uint32 from_sequence = 3; - uint32 pull_num = 7; - uint32 target_uid = 9; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 8925 + +message PullPrivateChatReq { + uint32 target_uid = 9; + uint32 pull_num = 11; + uint32 from_sequence = 4; +} \ No newline at end of file diff --git a/proto/PullPrivateChatRsp.proto b/proto/PullPrivateChatRsp.proto index 65b6d7d1..65fc6f98 100644 --- a/proto/PullPrivateChatRsp.proto +++ b/proto/PullPrivateChatRsp.proto @@ -1,10 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 29160 + import "ChatInfo.proto"; -// 4.7.0 -// CmdId: 23154 -// ? -message PullPrivateChatRsp { - repeated ChatInfo chat_info = 1; - int32 retcode = 9; -} \ No newline at end of file + +message PullPrivateChatRsp { + int32 retcode = 5; + repeated ChatInfo chat_info = 14; +} \ No newline at end of file diff --git a/proto/PullRecentChatReq.proto b/proto/PullRecentChatReq.proto index d7e397a6..424b14da 100644 --- a/proto/PullRecentChatReq.proto +++ b/proto/PullRecentChatReq.proto @@ -1,8 +1,10 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message PullRecentChatReq { - uint32 pull_num = 2; - uint32 begin_sequence = 3; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 6977 + +message PullRecentChatReq { + uint32 begin_sequence = 15; + uint32 pull_num = 14; +} \ No newline at end of file diff --git a/proto/PullRecentChatRsp.proto b/proto/PullRecentChatRsp.proto index 4da8479d..53f5b523 100644 --- a/proto/PullRecentChatRsp.proto +++ b/proto/PullRecentChatRsp.proto @@ -1,10 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 26725 + import "ChatInfo.proto"; -// 4.7.0 -// CmdId: 523 -// ? -message PullRecentChatRsp { - repeated ChatInfo chat_info = 9; - int32 retcode = 14; -} \ No newline at end of file + +message PullRecentChatRsp { + int32 retcode = 2; + repeated ChatInfo chat_info = 6; +} \ No newline at end of file diff --git a/proto/Quest.proto b/proto/Quest.proto index b3ede86f..2d7f3e29 100644 --- a/proto/Quest.proto +++ b/proto/Quest.proto @@ -1,21 +1,21 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 import "LackingResourceInfo.proto"; -// 4.7.0 -message Quest { - uint32 quest_id = 1; - uint32 state = 2; - uint32 start_time = 4; - bool is_random = 5; - uint32 parent_quest_id = 6; - uint32 quest_config_id = 7; - uint32 start_game_time = 8; - uint32 accept_time = 9; - repeated uint32 finish_progress_list = 10; - repeated uint32 fail_progress_list = 11; - repeated uint32 FMILFAINACE = 12; - LackingResourceInfo BCOAJLAHNNM = 13; -} \ No newline at end of file +message Quest { + uint32 quest_id = 1; + uint32 state = 2; + uint32 start_time = 4; + bool is_random = 5; + uint32 parent_quest_id = 6; + uint32 quest_config_id = 7; + uint32 start_game_time = 8; + uint32 accept_time = 9; + repeated uint32 finish_progress_list = 10; + repeated uint32 fail_progress_list = 11; + repeated uint32 MLHFBAFCKIP = 12; + LackingResourceInfo EBPOIBHNPNH = 13; +} \ No newline at end of file diff --git a/proto/QuestDestroyNpcReq.proto b/proto/QuestDestroyNpcReq.proto index ceb6af26..9fae0e49 100644 --- a/proto/QuestDestroyNpcReq.proto +++ b/proto/QuestDestroyNpcReq.proto @@ -1,9 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 1472 -// 4.7.0 -message QuestDestroyNpcReq { - uint32 parent_quest_id = 1; - uint32 npc_id = 9; -} \ No newline at end of file +message QuestDestroyNpcReq { + uint32 npc_id = 4; + uint32 parent_quest_id = 12; +} \ No newline at end of file diff --git a/proto/QuestDestroyNpcRsp.proto b/proto/QuestDestroyNpcRsp.proto index a8e4d7d2..bb71125d 100644 --- a/proto/QuestDestroyNpcRsp.proto +++ b/proto/QuestDestroyNpcRsp.proto @@ -1,10 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 23800 -// 4.7.0 -message QuestDestroyNpcRsp { - int32 retcode = 4; - uint32 npc_id = 10; - uint32 parent_quest_id = 11; -} \ No newline at end of file +message QuestDestroyNpcRsp { + uint32 parent_quest_id = 1; + int32 retcode = 4; + uint32 npc_id = 8; +} \ No newline at end of file diff --git a/proto/QuestListNotify.proto b/proto/QuestListNotify.proto index 717f5eb8..682a7d6d 100644 --- a/proto/QuestListNotify.proto +++ b/proto/QuestListNotify.proto @@ -1,10 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 23350 import "Quest.proto"; -// 4.7.0 -message QuestListNotify { - repeated Quest quest_list = 11; -} \ No newline at end of file +message QuestListNotify { + repeated Quest quest_list = 15; +} \ No newline at end of file diff --git a/proto/QuestListUpdateNotify.proto b/proto/QuestListUpdateNotify.proto index badee0e9..9b03e83f 100644 --- a/proto/QuestListUpdateNotify.proto +++ b/proto/QuestListUpdateNotify.proto @@ -1,10 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 3344 import "Quest.proto"; -// 4.7.0 -message QuestListUpdateNotify { - repeated Quest quest_list = 14; -} \ No newline at end of file +message QuestListUpdateNotify { + repeated Quest quest_list = 3; +} \ No newline at end of file diff --git a/proto/QuestProgressUpdateNotify.proto b/proto/QuestProgressUpdateNotify.proto index 92bcfb95..b537b742 100644 --- a/proto/QuestProgressUpdateNotify.proto +++ b/proto/QuestProgressUpdateNotify.proto @@ -1,10 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 28348 -// 4.7.0 -message QuestProgressUpdateNotify { - uint32 quest_id = 2; - repeated uint32 fail_progress_list = 3; - repeated uint32 finish_progress_list = 5; -} \ No newline at end of file +message QuestProgressUpdateNotify { + repeated uint32 fail_progress_list = 12; + repeated uint32 finish_progress_list = 13; + uint32 quest_id = 14; +} \ No newline at end of file diff --git a/proto/QuestTransmitRsp.proto b/proto/QuestTransmitRsp.proto index d1aad002..8ad7c817 100644 --- a/proto/QuestTransmitRsp.proto +++ b/proto/QuestTransmitRsp.proto @@ -1,10 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 2300 -// 4.7.0 -message QuestTransmitRsp { - uint32 quest_id = 2; - uint32 point_id = 8; - int32 retcode = 9; -} \ No newline at end of file +message QuestTransmitRsp { + uint32 quest_id = 12; + uint32 point_id = 13; + int32 retcode = 14; +} \ No newline at end of file diff --git a/proto/QuestUpdateQuestVarNotify.proto b/proto/QuestUpdateQuestVarNotify.proto index 4269419c..85ecd03a 100644 --- a/proto/QuestUpdateQuestVarNotify.proto +++ b/proto/QuestUpdateQuestVarNotify.proto @@ -1,10 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 29565 -// 4.7.0 -message QuestUpdateQuestVarNotify { - uint32 parent_quest_var_seq = 3; - uint32 parent_quest_id = 9; - repeated int32 quest_var = 11; -} \ No newline at end of file +message QuestUpdateQuestVarNotify { + uint32 parent_quest_id = 1; + uint32 parent_quest_var_seq = 4; + repeated int32 quest_var = 14; +} \ No newline at end of file diff --git a/proto/ReadMailNotify.proto b/proto/ReadMailNotify.proto index b23c6bf0..3243d466 100644 --- a/proto/ReadMailNotify.proto +++ b/proto/ReadMailNotify.proto @@ -1,10 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 23556 -// CmdId: 27308 -// Version: 4.6.0 -// Obfs: NBIHDBGBMMA -message ReadMailNotify { - repeated uint32 mail_id_list = 14; -} +message ReadMailNotify { + repeated uint32 mail_id_list = 3; +} \ No newline at end of file diff --git a/unimplemented/Reason.proto b/proto/Reason.proto similarity index 100% rename from unimplemented/Reason.proto rename to proto/Reason.proto diff --git a/unimplemented/ResinCard.proto b/proto/ResinCard.proto similarity index 100% rename from unimplemented/ResinCard.proto rename to proto/ResinCard.proto diff --git a/proto/ResinChangeNotify.proto b/proto/ResinChangeNotify.proto index a8b1268c..a2c81006 100644 --- a/proto/ResinChangeNotify.proto +++ b/proto/ResinChangeNotify.proto @@ -1,25 +1,11 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// CmdId: 21937 -// Obf: POKGPJBGPLM -message ResinChangeNotify { - uint32 cur_buy_count = 3; - uint32 next_add_timestamp = 6; - uint32 cur_value = 7; -} +// Version: 5.0 +// CmdId: 4336 + +message ResinChangeNotify { + uint32 cur_value = 3; + uint32 cur_buy_count = 4; + uint32 next_add_timestamp = 7; +} \ No newline at end of file diff --git a/proto/ResinCostType.proto b/proto/ResinCostType.proto index 411a2b0f..3bcb1ee2 100644 --- a/proto/ResinCostType.proto +++ b/proto/ResinCostType.proto @@ -1,12 +1,13 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.6.0 +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + enum ResinCostType { - RESIN_COST_TYPE_NONE = 0; + 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; -} \ No newline at end of file +} diff --git a/proto/Retcode.proto b/proto/Retcode.proto index 0f4f6d66..af156610 100644 --- a/proto/Retcode.proto +++ b/proto/Retcode.proto @@ -79,7 +79,7 @@ enum Retcode { RET_TEAM_CAN_NOT_CHOSE_REPLACE_USE = 127; RET_AVATAR_IN_COMBAT = 128; RET_PLAYER_TIME_LOCKED = 129; - RET_NICKNAME_UTF8ERROR = 130; + RET_NICKNAME_UTF_8_ERROR = 130; RET_NICKNAME_TOO_LONG = 131; RET_NICKNAME_WORD_ILLEGAL = 132; RET_NICKNAME_TOO_MANY_DIGITS = 133; @@ -483,7 +483,7 @@ enum Retcode { RET_MP_REPLY_NO_VALID_AVATAR = 1250; RET_MP_IS_NOT_IN_TRANSFER_GUARD = 1251; RET_MP_CANNOT_EXEC_GIVING_IN_SINGLE_MODE_QUEST = 1252; - RET_MP_EFFIGY_CHALLENGE_V4IN_PREPARE = 1253; + RET_MP_EFFIGY_CHALLENGE_V_4_IN_PREPARE = 1253; RET_MP_SHUFFLE_BOARD_ONGOING = 1254; RET_MP_FLIGHT_GEAR_ONGOING = 1255; RET_MP_TOY_BATTLE_QTE_ONGOING = 1256; @@ -655,7 +655,7 @@ enum Retcode { RET_REPORT_CONTENT_ILLEGAL = 7027; RET_REMARK_WORD_ILLEGAL = 7028; RET_REMARK_TOO_LONG = 7029; - RET_REMARK_UTF8ERROR = 7030; + RET_REMARK_UTF_8_ERROR = 7030; RET_REMARK_IS_EMPTY = 7031; RET_ASK_ADD_FRIEND_CD = 7032; RET_SHOW_AVATAR_INFO_NOT_EXIST = 7033; @@ -819,10 +819,10 @@ enum Retcode { RET_CHESS_MAP_LOCKED = 9189; RET_BLITZ_RUSH_NOT_OPEN = 9192; RET_BLITZ_RUSH_DUNGEON_NOT_OPEN = 9193; - RET_BLITZ_RUSH_COIN_AEXCEED_LIMIT = 9194; - RET_BLITZ_RUSH_COIN_BEXCEED_LIMIT = 9195; - RET_BLITZ_RUSH_COIN_ANOT_ENOUGH = 9196; - RET_BLITZ_RUSH_COIN_BNOT_ENOUGH = 9197; + 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; @@ -1003,12 +1003,12 @@ enum Retcode { 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_ANOT_ENOUGH = 10031; - RET_ROGUELIKE_COIN_BNOT_ENOUGH = 10032; - RET_ROGUELIKE_COIN_CNOT_ENOUGH = 10033; - RET_ROGUELIKE_COIN_AEXCEED_LIMIT = 10034; - RET_ROGUELIKE_COIN_BEXCEED_LIMIT = 10035; - RET_ROGUELIKE_COIN_CEXCEED_LIMIT = 10036; + 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; @@ -1032,10 +1032,10 @@ enum Retcode { RET_HACHI_DUNGEON_NOT_VALID = 10052; RET_HACHI_DUNGEON_STAGE_NOT_OPEN = 10053; RET_HACHI_DUNGEON_TEAMMATE_NOT_PASS = 10054; - RET_WINTER_CAMP_COIN_ANOT_ENOUGH = 10071; - RET_WINTER_CAMP_COIN_BNOT_ENOUGH = 10072; - RET_WINTER_CAMP_COIN_AEXCEED_LIMIT = 10073; - RET_WINTER_CAMP_COIN_BEXCEED_LIMIT = 10074; + 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; @@ -1044,12 +1044,12 @@ enum Retcode { RET_WINTER_CAMP_REWARD_ALREADY_TAKEN = 10080; RET_WINTER_CAMP_STAGE_NOT_FINISH = 10081; RET_WINTER_CAMP_GADGET_INVALID = 10082; - RET_LANTERN_RITE_COIN_ANOT_ENOUGH = 10090; - RET_LANTERN_RITE_COIN_BNOT_ENOUGH = 10091; - RET_LANTERN_RITE_COIN_CNOT_ENOUGH = 10092; - RET_LANTERN_RITE_COIN_AEXCEED_LIMIT = 10093; - RET_LANTERN_RITE_COIN_BEXCEED_LIMIT = 10094; - RET_LANTERN_RITE_COIN_CEXCEED_LIMIT = 10095; + 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; @@ -1081,10 +1081,10 @@ enum Retcode { RET_ACTIVITY_FRIEND_HAVE_GIFT_LIMIT = 10310; RET_GACHA_ACTIVITY_HAVE_REWARD_LIMIT = 10315; RET_GACHA_ACTIVITY_HAVE_ROBOT_LIMIT = 10316; - RET_SUMMER_TIME_V2COIN_EXCEED_LIMIT = 10317; - RET_SUMMER_TIME_V2COIN_NOT_ENOUGH = 10318; - RET_SUMMER_TIME_V2DUNGEON_STAGE_NOT_OPEN = 10319; - RET_SUMMER_TIME_V2PREV_DUNGEON_NOT_COMPLETE = 10320; + 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; @@ -1092,10 +1092,10 @@ enum Retcode { 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_ANOT_ENOUGH = 10380; - RET_GRAVEN_INNOCENCE_COIN_BNOT_ENOUGH = 10381; - RET_GRAVEN_INNOCENCE_COIN_AEXCEED_LIMIT = 10382; - RET_GRAVEN_INNOCENCE_COIN_BEXCEED_LIMIT = 10383; + 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; @@ -1114,8 +1114,8 @@ enum Retcode { 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_V2COIN_NOT_ENOUGH = 10427; - RET_EFFIGY_CHALLENGE_V2COIN_EXCEED_LIMIT = 10428; + 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; @@ -1132,22 +1132,22 @@ enum Retcode { RET_BRICK_BREAKER_COIN_NOT_ENOUGH = 10463; RET_BRICK_BREAKER_COIN_EXCEED_LIMIT = 10464; RET_TEAMCHAIN_WORLD_IN_MP_MODE = 10466; - RET_LAN_V3BOAT_PLAYER_NUM_NOT_VALID = 10481; - RET_LAN_V3BOAT_PLAY_NOT_OPEN = 10482; - RET_LAN_V3BOAT_NOT_IN_WORLD_SCENE = 10483; - RET_FLEUR_FAIR_V2PACMAN_PLAY_NOT_OPEN = 10500; - RET_FLEUR_FAIR_V2PACMAN_PLAYER_NUM_INCORRECT = 10501; - RET_FLEUR_FAIR_V2COIN_NOT_ENOUGH = 10502; - RET_FLEUR_FAIR_V2COIN_EXCEED_LIMIT = 10503; + 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_AKA_FES_RHYTHM_LEVEL_NOT_OPEN = 10521; RET_AKA_FES_RHYTHM_GALLERY_INIT_FAIL = 10522; RET_AKA_FES_RHYTHM_NOT_IN_EXPECTED_DUNGEON = 10533; RET_AKA_FES_REASONING_LEVEL_NOT_OPEN = 10531; RET_AKA_FES_ASTROLABE_LEVEL_NOT_OPEN = 10541; RET_AKA_FES_ASTROLABE_PRE_LEVEL_NOT_FINISH = 10542; - RET_EFFIGY_CHALLENGE_V4LEVEL_NOT_OPEN = 10551; - RET_EFFIGY_CHALLENGE_V4GUEST_NOT_READY = 10552; - RET_EFFIGY_CHALLENGE_V4DUPLICATE_AVATAR = 10553; + RET_EFFIGY_CHALLENGE_V_4_LEVEL_NOT_OPEN = 10551; + RET_EFFIGY_CHALLENGE_V_4_GUEST_NOT_READY = 10552; + RET_EFFIGY_CHALLENGE_V_4_DUPLICATE_AVATAR = 10553; RET_JOURNEY_ACTIVITY_PICK_PARAM_ERROR = 10561; RET_JOURNEY_ACTIVITY_PICK_COND_NOT_MEET = 10562; RET_JOURNEY_ACTIVITY_COIN_NOT_ENOUGH = 10563; @@ -1156,12 +1156,12 @@ enum Retcode { RET_FILMFES_BALL_GAME_PLAYER_COUNT_NOT_ENOUGH = 10591; RET_MP_FILMFEST_SHOOTING_ONGOING = 10592; RET_FILMFES_BALL_GAME_IS_LOCKED = 10593; - RET_TREASURE_HUNT_V4COIN_NOT_ENOUGH = 10611; - RET_TREASURE_HUNT_V4COIN_EXCEED_LIMIT = 10612; + RET_TREASURE_HUNT_V_4_COIN_NOT_ENOUGH = 10611; + RET_TREASURE_HUNT_V_4_COIN_EXCEED_LIMIT = 10612; RET_LOST_SAMACHURL_SNEAK_LEVEL_NOT_OPEN = 10631; RET_LOST_SAMACHURL_BOSS_LEVEL_NOT_OPEN = 10632; - RET_LAN_V4PARTY_LION_PLAYER_COUNT_NOT_ENOUGH = 10641; - RET_LAN_V4PARTY_LION_LEVEL_NOT_OPEN = 10642; + RET_LAN_V_4_PARTY_LION_PLAYER_COUNT_NOT_ENOUGH = 10641; + RET_LAN_V_4_PARTY_LION_LEVEL_NOT_OPEN = 10642; RET_ACTIVITY_CONTENT_CLOSED = 10901; RET_ACTIVITY_CLIENT_PLAY_BAN_MP = 10902; RET_ACTIVITY_CLIENT_PLAY_FREQUENCY_ERROR = 10903; @@ -1526,18 +1526,18 @@ enum Retcode { RET_CATCAFE_LAYOUT_STAGE_NOT_RIGHT = 13351; RET_CATCAFE_LAYOUT_NOT_RIGHT = 13352; RET_STAMINA_FIGHT_IS_IN_OTHER_DUNGEON = 13371; - RET_EFFIGY_CHALLENGE_V5LEVEL_NOT_OPEN = 13381; - RET_EFFIGY_CHALLENGE_V5INVALID_SUPPORT = 13382; - RET_EFFIGY_CHALLENGE_V5INVALID_PLAYER_NUM = 13383; - RET_EFFIGY_CHALLENGE_V5IN_COMBAT = 13384; - RET_EFFIGY_CHALLENGE_V5INVALID_SCENE = 13385; + RET_EFFIGY_CHALLENGE_V_5_LEVEL_NOT_OPEN = 13381; + RET_EFFIGY_CHALLENGE_V_5_INVALID_SUPPORT = 13382; + RET_EFFIGY_CHALLENGE_V_5_INVALID_PLAYER_NUM = 13383; + RET_EFFIGY_CHALLENGE_V_5_IN_COMBAT = 13384; + RET_EFFIGY_CHALLENGE_V_5_INVALID_SCENE = 13385; RET_BLUEPRINT_SLOT_NOT_FOUND = 13401; RET_FURNITURE_SUITE_ID_INVALID = 13402; RET_WISHLIST_BATCH_OPERATE_OUT_OF_LIMIT = 13403; - RET_HIDE_AND_SEEK_V4GAME_NOT_OPEN = 13411; - RET_HIDE_AND_SEEK_V4PLAY_MAP_NOT_CHOSEN = 13412; - RET_HIDE_AND_SEEK_V4PLAYER_COUNT_NOT_ENOUGH = 13413; - RET_HIDE_AND_SEEK_V4PLAY_MAP_NOT_OPEN = 13414; + RET_HIDE_AND_SEEK_V_4_GAME_NOT_OPEN = 13411; + RET_HIDE_AND_SEEK_V_4_PLAY_MAP_NOT_CHOSEN = 13412; + RET_HIDE_AND_SEEK_V_4_PLAYER_COUNT_NOT_ENOUGH = 13413; + RET_HIDE_AND_SEEK_V_4_PLAY_MAP_NOT_OPEN = 13414; RET_WATERGUN_LEVEL_NOT_OPEN = 13431; RET_ACROBATICS_BATTLE_STAGE_NOT_OPEN = 13441; RET_ACROBATICS_BATTLE_INVALID_TEAM = 13442; diff --git a/proto/SceneAreaUnlockNotify.proto b/proto/SceneAreaUnlockNotify.proto index f7964d35..4b3fa223 100644 --- a/proto/SceneAreaUnlockNotify.proto +++ b/proto/SceneAreaUnlockNotify.proto @@ -1,11 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 25419 -// CmdId: 26087 or 1330 (lock) -// Version: 4.7.0 -// Obfs: EIPEACPKJEN -message SceneAreaUnlockNotify { - uint32 scene_id = 3; - repeated uint32 area_list = 7; -} \ No newline at end of file +message SceneAreaUnlockNotify { + repeated uint32 area_list = 10; + uint32 scene_id = 14; +} \ No newline at end of file diff --git a/proto/SceneAreaWeatherNotify.proto b/proto/SceneAreaWeatherNotify.proto index 986b4b84..60b67949 100644 --- a/proto/SceneAreaWeatherNotify.proto +++ b/proto/SceneAreaWeatherNotify.proto @@ -1,12 +1,13 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 23245 -message SceneAreaWeatherNotify { - uint32 weather_gadget_id = 1; - map weather_value_map = 5; - uint32 weather_area_id = 6; - uint32 climate_type = 10; - float trans_duration = 15; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 21395 + +message SceneAreaWeatherNotify { + float trans_duration = 4; + map weather_value_map = 8; + uint32 weather_area_id = 12; + uint32 climate_type = 13; + uint32 weather_gadget_id = 14; +} \ No newline at end of file diff --git a/proto/SceneAvatarInfo.proto b/proto/SceneAvatarInfo.proto index 1c194ca0..941d6224 100644 --- a/proto/SceneAvatarInfo.proto +++ b/proto/SceneAvatarInfo.proto @@ -31,5 +31,5 @@ message SceneAvatarInfo { CurVehicleInfo cur_vehicle_info = 20; AvatarExcelInfo excel_info = 21; uint32 anim_hash = 22; - uint32 KCINBOMOIGL = 23; + uint32 trace_effect_id = 23; } \ No newline at end of file diff --git a/proto/SceneEntityAiInfo.proto b/proto/SceneEntityAiInfo.proto index 930eeb41..6f34974b 100644 --- a/proto/SceneEntityAiInfo.proto +++ b/proto/SceneEntityAiInfo.proto @@ -7,12 +7,12 @@ import "ServantInfo.proto"; import "Vector.proto"; message SceneEntityAiInfo { - bool is_ai_open = 1; - Vector born_pos = 2; + bool is_ai_open = 1; // -- remove + Vector born_pos = 2; // -- remove map skill_cd_map = 3; ServantInfo servant_info = 4; map ai_threat_map = 5; map skill_group_cd_map = 6; - uint32 cur_tactic = 7; - //bool is_ai_open = 8; + uint32 AJFKKOCIGHA = 7; + bool AADJDKIFENL = 8; } diff --git a/proto/SceneEntityAppearNotify.proto b/proto/SceneEntityAppearNotify.proto index 0710d015..efea8959 100644 --- a/proto/SceneEntityAppearNotify.proto +++ b/proto/SceneEntityAppearNotify.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 6263 +// CmdId: 6263 import "SceneEntityInfo.proto"; import "VisionType.proto"; diff --git a/proto/SceneEntityDisappearNotify.proto b/proto/SceneEntityDisappearNotify.proto index 2e70d11e..7a95263b 100644 --- a/proto/SceneEntityDisappearNotify.proto +++ b/proto/SceneEntityDisappearNotify.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 29127 +// CmdId: 29127 import "VisionType.proto"; diff --git a/proto/SceneEntityDrownRsp.proto b/proto/SceneEntityDrownRsp.proto index 68730241..a91c3962 100644 --- a/proto/SceneEntityDrownRsp.proto +++ b/proto/SceneEntityDrownRsp.proto @@ -1,9 +1,10 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 29817 -// Obf: ? -message SceneEntityDrownRsp { - uint32 entity_id = 10; - int32 retcode = 12; -} +// Version: 5.0 +// CmdId: 1742 + +message SceneEntityDrownRsp { + int32 retcode = 7; + uint32 entity_id = 10; +} \ No newline at end of file diff --git a/proto/SceneForceLockNotify.proto b/proto/SceneForceLockNotify.proto index 54634886..e688a622 100644 --- a/proto/SceneForceLockNotify.proto +++ b/proto/SceneForceLockNotify.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 27356 +// CmdId: 27356 message SceneForceLockNotify { repeated uint32 force_id_list = 3; diff --git a/proto/SceneForceUnlockNotify.proto b/proto/SceneForceUnlockNotify.proto index af40b8f2..887f96f0 100644 --- a/proto/SceneForceUnlockNotify.proto +++ b/proto/SceneForceUnlockNotify.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 2583 +// CmdId: 2583 message SceneForceUnlockNotify { bool is_add = 9; diff --git a/proto/SceneInitFinishRsp.proto b/proto/SceneInitFinishRsp.proto index af761401..96a8757e 100644 --- a/proto/SceneInitFinishRsp.proto +++ b/proto/SceneInitFinishRsp.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 24671 +// CmdId: 24671 message SceneInitFinishRsp { uint32 enter_scene_token = 9; diff --git a/proto/ScenePlayerInfo.proto b/proto/ScenePlayerInfo.proto index f5b26140..7ea25861 100644 --- a/proto/ScenePlayerInfo.proto +++ b/proto/ScenePlayerInfo.proto @@ -1,14 +1,15 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 import "OnlinePlayerInfo.proto"; -// 4.7.0 -message ScenePlayerInfo { - bool is_connected = 7; - string name = 11; - uint32 scene_id = 15; - uint32 uid = 9; - OnlinePlayerInfo online_player_info = 6; - uint32 peer_id = 3; -} \ No newline at end of file +message ScenePlayerInfo { + OnlinePlayerInfo online_player_info = 1; + bool is_connected = 2; + uint32 scene_id = 5; + string name = 8; + uint32 peer_id = 11; + uint32 uid = 13; +} \ No newline at end of file diff --git a/proto/ScenePlayerInfoNotify.proto b/proto/ScenePlayerInfoNotify.proto index 106543d7..a28eacf5 100644 --- a/proto/ScenePlayerInfoNotify.proto +++ b/proto/ScenePlayerInfoNotify.proto @@ -1,10 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 7477 import "ScenePlayerInfo.proto"; -// 4.7.0 -// CmdId: 21623 -message ScenePlayerInfoNotify { - repeated ScenePlayerInfo player_info_list = 13; -} \ No newline at end of file +message ScenePlayerInfoNotify { + repeated ScenePlayerInfo player_info_list = 3; +} \ No newline at end of file diff --git a/proto/ScenePlayerLocationNotify.proto b/proto/ScenePlayerLocationNotify.proto index 19819349..422d9464 100644 --- a/proto/ScenePlayerLocationNotify.proto +++ b/proto/ScenePlayerLocationNotify.proto @@ -1,15 +1,14 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 29696 import "PlayerLocationInfo.proto"; import "VehicleLocationInfo.proto"; -// CmdId: 21376 -// Version: 4.7.0 -// Obfs: MBLLHEGOBPL -message ScenePlayerLocationNotify { - uint32 scene_id = 8; - repeated VehicleLocationInfo vehicle_loc_list = 10; - repeated PlayerLocationInfo player_loc_list = 12; -} \ No newline at end of file +message ScenePlayerLocationNotify { + repeated PlayerLocationInfo player_loc_list = 3; + uint32 scene_id = 10; + repeated VehicleLocationInfo vehicle_loc_list = 11; +} \ No newline at end of file diff --git a/proto/ScenePointUnlockNotify.proto b/proto/ScenePointUnlockNotify.proto index 5847d07c..aa71e347 100644 --- a/proto/ScenePointUnlockNotify.proto +++ b/proto/ScenePointUnlockNotify.proto @@ -1,12 +1,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 21959 -// 4.7.0 -message ScenePointUnlockNotify { - repeated uint32 hide_point_list = 1; - repeated uint32 point_list = 5; - repeated uint32 unhide_point_list = 9; - repeated uint32 locked_point_list = 11; - uint32 scene_id = 15; -} +message ScenePointUnlockNotify { + uint32 scene_id = 3; + repeated uint32 unhide_point_list = 4; + repeated uint32 point_list = 11; + repeated uint32 hide_point_list = 13; + repeated uint32 locked_point_list = 15; +} \ No newline at end of file diff --git a/proto/SceneTeamAvatar.proto b/proto/SceneTeamAvatar.proto index 86bf72f5..55893ef4 100644 --- a/proto/SceneTeamAvatar.proto +++ b/proto/SceneTeamAvatar.proto @@ -21,8 +21,8 @@ message SceneTeamAvatar { AbilityControlBlock ability_control_block = 8; uint32 entity_id = 9; uint64 weapon_guid = 10; - AbilitySyncStateInfo weapon_ability_info = 11; - AbilitySyncStateInfo avatar_ability_info = 12; + AbilitySyncStateInfo avatar_ability_info = 11; + AbilitySyncStateInfo weapon_ability_info = 12; SceneAvatarInfo scene_avatar_info = 13; bool is_player_cur_avatar = 14; uint64 avatar_guid = 15; diff --git a/proto/SceneTeamUpdateNotify.proto b/proto/SceneTeamUpdateNotify.proto index dd4c65fc..7d0ef7f3 100644 --- a/proto/SceneTeamUpdateNotify.proto +++ b/proto/SceneTeamUpdateNotify.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 29107 +// CmdId: 29107 import "SceneTeamAvatar.proto"; diff --git a/proto/SceneTimeNotify.proto b/proto/SceneTimeNotify.proto index a3917929..d696b6df 100644 --- a/proto/SceneTimeNotify.proto +++ b/proto/SceneTimeNotify.proto @@ -1,10 +1,11 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 23193 -message SceneTimeNotify { - bool is_paused = 8; - uint64 scene_time = 9; - uint32 scene_id = 13; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 29187 + +message SceneTimeNotify { + uint32 scene_id = 7; + uint64 scene_time = 11; + bool is_paused = 13; +} \ No newline at end of file diff --git a/proto/SceneTransToPointReq.proto b/proto/SceneTransToPointReq.proto index 49cd6dbe..85a200cb 100644 --- a/proto/SceneTransToPointReq.proto +++ b/proto/SceneTransToPointReq.proto @@ -1,8 +1,10 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message SceneTransToPointReq { - uint32 point_id = 11; - uint32 scene_id = 13; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 4027 + +message SceneTransToPointReq { + uint32 scene_id = 7; + uint32 point_id = 11; +} \ No newline at end of file diff --git a/proto/SceneTransToPointRsp.proto b/proto/SceneTransToPointRsp.proto index 01dcd3ae..62be1bba 100644 --- a/proto/SceneTransToPointRsp.proto +++ b/proto/SceneTransToPointRsp.proto @@ -1,10 +1,11 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 4798 -message SceneTransToPointRsp { - uint32 scene_id = 7; - uint32 point_id = 10; - int32 retcode = 12; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 24104 + +message SceneTransToPointRsp { + uint32 scene_id = 3; + int32 retcode = 10; + uint32 point_id = 11; +} \ No newline at end of file diff --git a/proto/SelectWorktopOptionReq.proto b/proto/SelectWorktopOptionReq.proto index 2851c5a4..3e9af0b5 100644 --- a/proto/SelectWorktopOptionReq.proto +++ b/proto/SelectWorktopOptionReq.proto @@ -1,11 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 23125 -// 4.7.0 -// CmdId: 2015 or 9214 or 6544 or 6885 (lock) -// GHAAJJKIIDI -message SelectWorktopOptionReq { - uint32 gadget_entity_id = 4; - uint32 option_id = 1; -} \ No newline at end of file +message SelectWorktopOptionReq { + uint32 CHDDOFMLBLM = 8; + uint32 gadget_entity_id = 1; + uint32 option_id = 13; +} \ No newline at end of file diff --git a/proto/SelectWorktopOptionRsp.proto b/proto/SelectWorktopOptionRsp.proto index b601717c..d29dee21 100644 --- a/proto/SelectWorktopOptionRsp.proto +++ b/proto/SelectWorktopOptionRsp.proto @@ -1,12 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 1697 -// 4.7.0 -// CmdId: 28536 -// MNPPKLBAEFC -message SelectWorktopOptionRsp { - uint32 option_id = 5; - uint32 gadget_entity_id = 10; - int32 retcode = 7; -} \ No newline at end of file +message SelectWorktopOptionRsp { + uint32 option_id = 1; + uint32 gadget_entity_id = 9; + int32 retcode = 14; +} \ No newline at end of file diff --git a/proto/ServantInfo.proto b/proto/ServantInfo.proto index cf71d0e7..b4083723 100644 --- a/proto/ServantInfo.proto +++ b/proto/ServantInfo.proto @@ -3,7 +3,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -message ServantInfo { - uint32 master_entity_id = 1; - uint32 born_slot_index = 2; -} \ No newline at end of file +message ServantInfo { + uint32 master_entity_id = 1; + uint32 born_slot_index = 2; +} diff --git a/proto/ServerAnnounceNotify.proto b/proto/ServerAnnounceNotify.proto index c07d975c..62a97fba 100644 --- a/proto/ServerAnnounceNotify.proto +++ b/proto/ServerAnnounceNotify.proto @@ -1,10 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 25165 + import "AnnounceData.proto"; -// 4.7.0 -// cmdid: 1758 -// NIICMKOCDDN -message ServerAnnounceNotify { - repeated AnnounceData announce_data_list = 10; -} +message ServerAnnounceNotify { + repeated AnnounceData announce_data_list = 15; +} \ No newline at end of file diff --git a/proto/ServerBuffChangeNotify.proto b/proto/ServerBuffChangeNotify.proto index d0724db8..9e52975f 100644 --- a/proto/ServerBuffChangeNotify.proto +++ b/proto/ServerBuffChangeNotify.proto @@ -1,19 +1,19 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 21009 import "ServerBuff.proto"; -// 4.6.0 -// CmdId: 9934 message ServerBuffChangeNotify { - enum ServerBuffChangeType { + enum ServerBuffChangeType { SERVER_BUFF_CHANGE_TYPE_ADD_SERVER_BUFF = 0; SERVER_BUFF_CHANGE_TYPE_DEL_SERVER_BUFF = 1; } - - bool is_creature_buff = 2; - repeated uint32 entity_id_list = 4; - repeated uint64 avatar_guid_list = 6; - repeated ServerBuff server_buff_list = 7; - ServerBuffChangeType server_buff_change_type = 10; -} \ No newline at end of file + repeated uint32 entity_id_list = 1; + repeated ServerBuff server_buff_list = 2; + bool is_creature_buff = 3; + repeated uint64 avatar_guid_list = 11; + ServerBuffChangeType server_buff_change_type = 14; +} diff --git a/proto/ServerGlobalValueChangeNotify.proto b/proto/ServerGlobalValueChangeNotify.proto index 7f6dd314..b02cbc02 100644 --- a/proto/ServerGlobalValueChangeNotify.proto +++ b/proto/ServerGlobalValueChangeNotify.proto @@ -1,10 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 22099 -// ? -message ServerGlobalValueChangeNotify { - float value = 12; - uint32 key_hash = 6; - uint32 entity_id = 9; -} \ No newline at end of file +// Version: 5.0 +// CmdId: 25816 + +message ServerGlobalValueChangeNotify { + uint32 key_hash = 5; + uint32 entity_id = 7; + float value = 9; +} \ No newline at end of file diff --git a/proto/ServerTimeNotify.proto b/proto/ServerTimeNotify.proto index 023236c5..a26f08d7 100644 --- a/proto/ServerTimeNotify.proto +++ b/proto/ServerTimeNotify.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 28606 +// CmdId: 28606 message ServerTimeNotify { uint64 server_time = 1; diff --git a/proto/SetEntityClientDataNotify.proto b/proto/SetEntityClientDataNotify.proto index 9fbe9659..64ee7809 100644 --- a/proto/SetEntityClientDataNotify.proto +++ b/proto/SetEntityClientDataNotify.proto @@ -1,11 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 5306 import "EntityClientData.proto"; -// 4.7.0 -// CmdId: 28968 -message SetEntityClientDataNotify { - EntityClientData entity_client_data = 6; - uint32 entity_id = 7; -} \ No newline at end of file +message SetEntityClientDataNotify { + EntityClientData entity_client_data = 1; + uint32 entity_id = 2; +} \ No newline at end of file diff --git a/proto/SetFriendEnterHomeOptionReq.proto b/proto/SetFriendEnterHomeOptionReq.proto index e91a2dc3..36723c49 100644 --- a/proto/SetFriendEnterHomeOptionReq.proto +++ b/proto/SetFriendEnterHomeOptionReq.proto @@ -1,9 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 20740 + import "FriendEnterHomeOption.proto"; -// 4.7.0 -// CmdId: 27828 -// Obf: EGCPPBGPKEM -message SetFriendEnterHomeOptionReq { - FriendEnterHomeOption option = 9; -} + +message SetFriendEnterHomeOptionReq { + FriendEnterHomeOption option = 13; +} \ No newline at end of file diff --git a/proto/SetNameCardReq.proto b/proto/SetNameCardReq.proto index 47fcee12..01e68bc7 100644 --- a/proto/SetNameCardReq.proto +++ b/proto/SetNameCardReq.proto @@ -1,7 +1,9 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message SetNameCardReq { - uint32 name_card_id = 14; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 20106 + +message SetNameCardReq { + uint32 name_card_id = 11; +} \ No newline at end of file diff --git a/proto/SetNameCardRsp.proto b/proto/SetNameCardRsp.proto index 1fd10e20..4c760651 100644 --- a/proto/SetNameCardRsp.proto +++ b/proto/SetNameCardRsp.proto @@ -1,8 +1,10 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message SetNameCardRsp { - int32 retcode = 6; - uint32 name_card_id = 12; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 27175 + +message SetNameCardRsp { + int32 retcode = 6; + uint32 name_card_id = 11; +} \ No newline at end of file diff --git a/proto/SetOpenStateReq.proto b/proto/SetOpenStateReq.proto index d8ffb1b6..7ff09bfe 100644 --- a/proto/SetOpenStateReq.proto +++ b/proto/SetOpenStateReq.proto @@ -1,10 +1,10 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 9009 -// ? -message SetOpenStateReq { - uint32 value = 12; - uint32 key = 2; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 24291 + +message SetOpenStateReq { + uint32 key = 3; + uint32 value = 1; +} \ No newline at end of file diff --git a/proto/SetOpenStateRsp.proto b/proto/SetOpenStateRsp.proto index 8d214432..8a130bb4 100644 --- a/proto/SetOpenStateRsp.proto +++ b/proto/SetOpenStateRsp.proto @@ -1,11 +1,11 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 22146 -// ? -message SetOpenStateRsp { - uint32 key = 5; - int32 retcode = 8; - uint32 value = 12; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 7944 + +message SetOpenStateRsp { + uint32 key = 5; + int32 retcode = 6; + uint32 value = 10; +} \ No newline at end of file diff --git a/proto/SetPlayerBirthdayReq.proto b/proto/SetPlayerBirthdayReq.proto index ceb92482..507b5db4 100644 --- a/proto/SetPlayerBirthdayReq.proto +++ b/proto/SetPlayerBirthdayReq.proto @@ -1,9 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 26726 import "Birthday.proto"; -// 4.7.0 -message SetPlayerBirthdayReq { - Birthday birthday = 2; -} \ No newline at end of file +message SetPlayerBirthdayReq { + Birthday birthday = 11; +} \ No newline at end of file diff --git a/proto/SetPlayerBirthdayRsp.proto b/proto/SetPlayerBirthdayRsp.proto index 42ecb04b..711017ab 100644 --- a/proto/SetPlayerBirthdayRsp.proto +++ b/proto/SetPlayerBirthdayRsp.proto @@ -1,10 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 9150 import "Birthday.proto"; -// 4.7.0 -message SetPlayerBirthdayRsp { - int32 retcode = 1; - Birthday birthday = 12; -} \ No newline at end of file +message SetPlayerBirthdayRsp { + Birthday birthday = 3; + int32 retcode = 6; +} \ No newline at end of file diff --git a/proto/SetPlayerBornDataReq.proto b/proto/SetPlayerBornDataReq.proto index fd250d58..a25cc2d5 100644 --- a/proto/SetPlayerBornDataReq.proto +++ b/proto/SetPlayerBornDataReq.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 25726 +// CmdId: 25726 message SetPlayerBornDataReq { string nick_name = 7; diff --git a/proto/SetPlayerBornDataRsp.proto b/proto/SetPlayerBornDataRsp.proto index 2790dac6..d6c523af 100644 --- a/proto/SetPlayerBornDataRsp.proto +++ b/proto/SetPlayerBornDataRsp.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 26454 +// CmdId: 26454 message SetPlayerBornDataRsp { int32 retcode = 10; diff --git a/proto/SetPlayerHeadImageReq.proto b/proto/SetPlayerHeadImageReq.proto index d5ef2c3e..beb9efa3 100644 --- a/proto/SetPlayerHeadImageReq.proto +++ b/proto/SetPlayerHeadImageReq.proto @@ -1,7 +1,9 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message SetPlayerHeadImageReq { - uint32 head_image_id = 2; -} +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 21526 + +message SetPlayerHeadImageReq { + uint32 head_image_id = 9; +} \ No newline at end of file diff --git a/proto/SetPlayerHeadImageRsp.proto b/proto/SetPlayerHeadImageRsp.proto index b67b5573..d454ecf5 100644 --- a/proto/SetPlayerHeadImageRsp.proto +++ b/proto/SetPlayerHeadImageRsp.proto @@ -1,9 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 21563 + import "ProfilePicture.proto"; -// 4.7.0 -message SetPlayerHeadImageRsp { - int32 retcode = 9; - ProfilePicture profile_picture = 10; -} +message SetPlayerHeadImageRsp { + ProfilePicture profile_picture = 2; + int32 retcode = 4; +} \ No newline at end of file diff --git a/proto/SetPlayerNameReq.proto b/proto/SetPlayerNameReq.proto index 0eba0064..b7b7772c 100644 --- a/proto/SetPlayerNameReq.proto +++ b/proto/SetPlayerNameReq.proto @@ -1,7 +1,9 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message SetPlayerNameReq { - string nick_name = 13; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 9269 + +message SetPlayerNameReq { + string nick_name = 7; +} \ No newline at end of file diff --git a/proto/SetPlayerNameRsp.proto b/proto/SetPlayerNameRsp.proto index dce2b6e6..bfcde6c3 100644 --- a/proto/SetPlayerNameRsp.proto +++ b/proto/SetPlayerNameRsp.proto @@ -1,8 +1,10 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message SetPlayerNameRsp { - string nick_name = 2; - int32 retcode = 13; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 24044 + +message SetPlayerNameRsp { + string nick_name = 4; + int32 retcode = 8; +} \ No newline at end of file diff --git a/proto/SetPlayerPropReq.proto b/proto/SetPlayerPropReq.proto index ac4e7130..6cd689af 100644 --- a/proto/SetPlayerPropReq.proto +++ b/proto/SetPlayerPropReq.proto @@ -1,8 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 23363 + import "PropValue.proto"; -// CmdId: 1774 -// Obf: ? -message SetPlayerPropReq { - repeated PropValue prop_list = 3; -} + +message SetPlayerPropReq { + repeated PropValue prop_list = 9; +} \ No newline at end of file diff --git a/proto/SetPlayerSignatureReq.proto b/proto/SetPlayerSignatureReq.proto index abeeda67..ff42560b 100644 --- a/proto/SetPlayerSignatureReq.proto +++ b/proto/SetPlayerSignatureReq.proto @@ -1,7 +1,9 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message SetPlayerSignatureReq { - string signature = 11; -} +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 1006 + +message SetPlayerSignatureReq { + string signature = 10; +} \ No newline at end of file diff --git a/proto/SetPlayerSignatureRsp.proto b/proto/SetPlayerSignatureRsp.proto index 59e75cc9..0b028d5a 100644 --- a/proto/SetPlayerSignatureRsp.proto +++ b/proto/SetPlayerSignatureRsp.proto @@ -1,8 +1,10 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message SetPlayerSignatureRsp { - string signature = 14; - int32 retcode = 9; -} +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 24101 + +message SetPlayerSignatureRsp { + int32 retcode = 6; + string signature = 10; +} \ No newline at end of file diff --git a/proto/SetUpAvatarTeamReq.proto b/proto/SetUpAvatarTeamReq.proto index ef0a84a5..6a333cf1 100644 --- a/proto/SetUpAvatarTeamReq.proto +++ b/proto/SetUpAvatarTeamReq.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 22244 +// CmdId: 22244 message SetUpAvatarTeamReq { repeated uint64 avatar_team_guid_list = 10; diff --git a/proto/SetUpAvatarTeamRsp.proto b/proto/SetUpAvatarTeamRsp.proto index eb8dbaba..0be6c714 100644 --- a/proto/SetUpAvatarTeamRsp.proto +++ b/proto/SetUpAvatarTeamRsp.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 -// CmdID: 306 +// CmdId: 306 message SetUpAvatarTeamRsp { uint64 cur_avatar_guid = 2; diff --git a/proto/SetWidgetSlotReq.proto b/proto/SetWidgetSlotReq.proto index 85b3bf29..1f8ac5d2 100644 --- a/proto/SetWidgetSlotReq.proto +++ b/proto/SetWidgetSlotReq.proto @@ -1,13 +1,14 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 22701 + import "WidgetSlotTag.proto"; import "WidgetSlotOp.proto"; -// 4.7.0 -// CmdId: 25160 -// BLFCJICOGKP -message SetWidgetSlotReq { - repeated WidgetSlotTag tag_list = 5; - uint32 material_id = 14; - WidgetSlotOp op = 9; -} +message SetWidgetSlotReq { + repeated WidgetSlotTag tag_list = 2; + WidgetSlotOp op = 12; + uint32 material_id = 8; +} \ No newline at end of file diff --git a/proto/SetWidgetSlotRsp.proto b/proto/SetWidgetSlotRsp.proto index a180f916..dfe824ca 100644 --- a/proto/SetWidgetSlotRsp.proto +++ b/proto/SetWidgetSlotRsp.proto @@ -1,14 +1,15 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -import "WidgetSlotTag.proto"; -import "WidgetSlotOp.proto"; -// 4.7.0 -// CmdId: 29426 -// FMJHOCGMDJF -message SetWidgetSlotRsp { - repeated WidgetSlotTag tag_list = 2; - uint32 material_id = 3; - int32 retcode = 1; - WidgetSlotOp op = 8; -} +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 7049 + +import "WidgetSlotOp.proto"; +import "WidgetSlotTag.proto"; + +message SetWidgetSlotRsp { + int32 retcode = 1; + WidgetSlotOp op = 6; + uint32 material_id = 10; + repeated WidgetSlotTag tag_list = 12; +} \ No newline at end of file diff --git a/unimplemented/ShapeType.proto b/proto/ShapeType.proto similarity index 100% rename from unimplemented/ShapeType.proto rename to proto/ShapeType.proto diff --git a/proto/Shop.proto b/proto/Shop.proto index 05459142..88c249c8 100644 --- a/proto/Shop.proto +++ b/proto/Shop.proto @@ -1,18 +1,21 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -import "ShopConcertProduct.proto"; +// Version: 5.0 + +import "ShopMcoinProduct.proto"; import "ShopCardProduct.proto"; import "ShopGoods.proto"; -import "ShopMcoinProduct.proto"; -// 4.7.0 -// ? -message Shop { - repeated ShopConcertProduct concert_product_list = 2; - uint32 next_refresh_time = 3; - repeated ShopCardProduct card_product_list = 6; - uint32 city_id = 7; - uint32 shop_type = 9; - repeated ShopGoods goods_list = 12; - uint32 city_reputation_level = 13; - repeated ShopMcoinProduct mcoin_product_list = 15; -} +import "ShopConcertProduct.proto"; + +message Shop { + uint32 city_reputation_level = 2; // 5 + uint32 shop_type = 3; + uint32 next_refresh_time = 4; + uint32 DGEAKOFNGDN = 5; + repeated ShopMcoinProduct mcoin_product_list = 7; + repeated ShopCardProduct card_product_list = 9; + repeated ShopGoods goods_list = 10; + repeated ShopConcertProduct concert_product_list = 12; + uint32 city_id = 14; +} \ No newline at end of file diff --git a/proto/ShopCardProduct.proto b/proto/ShopCardProduct.proto index 08dcf728..ff524088 100644 --- a/proto/ShopCardProduct.proto +++ b/proto/ShopCardProduct.proto @@ -1,20 +1,19 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -import "ItemParam.proto"; -// Obf: LJJFPCDLGIJ +// Version: 5.0 + +import "ResinCard.proto"; + message ShopCardProduct { - // Obf: JIBALNEIBIK - 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; -} + 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 HLAOFKPENGI { + ResinCard resin_card = 101; + } +} \ No newline at end of file diff --git a/proto/ShopConcertProduct.proto b/proto/ShopConcertProduct.proto index 4bdd14d7..b5384e51 100644 --- a/proto/ShopConcertProduct.proto +++ b/proto/ShopConcertProduct.proto @@ -1,12 +1,14 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// Obf: ABHPGEAODHI -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; -} +// Version: 5.0 + +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; +} \ No newline at end of file diff --git a/proto/ShopGoods.proto b/proto/ShopGoods.proto index 543aebe3..e25d6f21 100644 --- a/proto/ShopGoods.proto +++ b/proto/ShopGoods.proto @@ -1,34 +1,30 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + import "ItemParam.proto"; -// 4.7.0 + message ShopGoods { - ItemParam goods_item = 6; // OK - uint32 end_time = 3; // OK - uint32 begin_time = 12; // OK - - repeated ItemParam cost_item_list = 10; // OK - repeated uint32 pre_goods_id_list = 15; // OK - uint32 goods_id = 11; // OK - uint32 next_refresh_time = 14; // OK - - uint32 bought_num = 2; // OK (1x maybe ok too but this limit other, 7=mora) - uint32 buy_limit = 9; // ? - - uint32 max_level = 5; // OK - uint32 min_level = 4; // OK - - uint32 hcoin = 13; // LOCK - uint32 scoin = 7; // LOCK - uint32 mcoin = 8; // LOCK - - //Hcoin: Primogem - //Scoin: Mora - //Mcoin: Genesis crystal - - //uint32 secondary_sheet_id = 663; - //uint32 single_limit = 133; - //uint32 discount_id = 150; - //uint32 discount_end_time = 821; - //uint32 discount_begin_time = 410; + uint32 NJCCEMPMHDI = 1; + uint32 begin_time = 2; + uint32 next_refresh_time = 3; + uint32 CJMMGKPFMOF = 4; + uint32 DJJOHOKKDBM = 5; + ItemParam goods_item = 6; + uint32 HDHJDCPHFMK = 7; + uint32 LPAHJGDBEPE = 8; + uint32 IBCGFFJGCID = 9; + uint32 HKBHNINJMLN = 10; + uint32 goods_id = 11; // sus + repeated ItemParam KMBAMPPHCNI = 12; + repeated uint32 GIICBPIGICM = 13; + uint32 bought_num = 14; + uint32 end_time = 15; + uint32 JLIBGEFCAHD = 590; + uint32 BHNAJCLPOJE = 1487; + uint32 KJAGOOHCNON = 1541; + uint32 AFOGAPGJCOH = 1587; + bool EHIAIOONFDH = 1748; + uint32 MNCAAIMGCJJ = 1942; } diff --git a/proto/ShopMcoinProduct.proto b/proto/ShopMcoinProduct.proto index 3ff43b2a..c6fca3b9 100644 --- a/proto/ShopMcoinProduct.proto +++ b/proto/ShopMcoinProduct.proto @@ -1,12 +1,14 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// Obf: BNMNBLNCBIG -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; -} +// Version: 5.0 + +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; +} \ No newline at end of file diff --git a/proto/ShortAbilityHashPair.proto b/proto/ShortAbilityHashPair.proto index 5f26a4ba..93e6feca 100644 --- a/proto/ShortAbilityHashPair.proto +++ b/proto/ShortAbilityHashPair.proto @@ -4,6 +4,6 @@ option java_package = "emu.grasscutter.net.proto"; // Version: 5.0 message ShortAbilityHashPair { - sfixed32 ability_config_hash = 13; + sfixed32 OMPEBEMNKLG = 13; sfixed32 ability_name_hash = 15; } \ No newline at end of file diff --git a/proto/ShowAvatarInfo.proto b/proto/ShowAvatarInfo.proto index bc25278d..7d291872 100644 --- a/proto/ShowAvatarInfo.proto +++ b/proto/ShowAvatarInfo.proto @@ -1,38 +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"; +// Version: 5.0 + import "PropValue.proto"; import "ShowEquip.proto"; import "AvatarFetterInfo.proto"; import "AvatarExcelInfo.proto"; -// Obf: BHNAGPHOKLL -message ShowAvatarInfo { - uint32 avatar_id = 1; - map prop_map = 2; - repeated uint32 talent_id_list = 3; - map fight_prop_map = 4; - uint32 skill_depot_id = 5; - uint32 core_proud_skill_level = 6; - repeated uint32 inherent_proud_skill_list = 7; - map skill_level_map = 8; - map proud_skill_extra_level_map = 9; - repeated ShowEquip equip_list = 10; - AvatarFetterInfo fetter_info = 11; - uint32 costume_id = 12; - AvatarExcelInfo excel_info = 13; -} + +message ShowAvatarInfo { + uint32 avatar_id = 1; + map prop_map = 2; + repeated uint32 talent_id_list = 3; + map fight_prop_map = 4; + uint32 skill_depot_id = 5; + uint32 core_proud_skill_level = 6; + repeated uint32 inherent_proud_skill_list = 7; + map skill_level_map = 8; + map proud_skill_extra_level_map = 9; + repeated ShowEquip equip_list = 10; + AvatarFetterInfo fetter_info = 11; + uint32 costume_id = 12; + AvatarExcelInfo excel_info = 13; +} \ No newline at end of file diff --git a/proto/ShowEquip.proto b/proto/ShowEquip.proto index 74fee81d..e0cf6157 100644 --- a/proto/ShowEquip.proto +++ b/proto/ShowEquip.proto @@ -1,28 +1,15 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + import "Reliquary.proto"; import "Weapon.proto"; -// Obf: OJMNHOEOFAN + 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; + } +} \ No newline at end of file diff --git a/proto/SocialDetail.proto b/proto/SocialDetail.proto index 2b49cf69..0ede8471 100644 --- a/proto/SocialDetail.proto +++ b/proto/SocialDetail.proto @@ -1,41 +1,47 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 import "Birthday.proto"; import "FriendOnlineState.proto"; import "SocialShowAvatarInfo.proto"; import "FriendEnterHomeOption.proto"; import "ProfilePicture.proto"; +//import "GBNIKBFHHKP.proto"; -// 4.7.0 message SocialDetail { - uint32 uid = 1; - string nickname = 2; - uint32 level = 3; - uint32 avatar_id = 4; - string signature = 5; - Birthday birthday = 6; - uint32 world_level = 7; - repeated uint32 reserved_list = 8; - FriendOnlineState online_state = 9; - uint32 param = 10; - bool is_friend = 11; - bool is_mp_mode_available = 12; - string online_id = 13; - uint32 name_card_id = 14; - bool is_in_blacklist = 15; - bool is_chat_no_disturb = 16; - string remark_name = 17; - uint32 finish_achievement_num = 18; - uint32 tower_floor_index = 19; - uint32 tower_level_index = 20; - bool is_show_avatar = 21; - repeated SocialShowAvatarInfo show_avatar_info_list = 22; - repeated uint32 show_name_card_id_list = 23; - FriendEnterHomeOption friend_enter_home_option = 24; - ProfilePicture profile_picture = 25; - string ip_code = 26; - uint32 FPBKNPMLEPC = 27; - uint32 BNBFADNNNNA = 28; - uint32 NHFIPHHHOEF = 32; -} \ No newline at end of file + uint32 uid = 1; + string nickname = 2; + uint32 level = 3; + uint32 avatar_id = 4; + string signature = 5; + Birthday birthday = 6; + uint32 world_level = 7; + repeated uint32 reserved_list = 8; + FriendOnlineState online_state = 9; + uint32 param = 10; + bool is_friend = 11; + bool is_mp_mode_available = 12; + string online_id = 13; + uint32 name_card_id = 14; + bool is_in_blacklist = 15; + bool is_chat_no_disturb = 16; + string remark_name = 17; + uint32 finish_achievement_num = 18; + uint32 tower_floor_index = 19; + uint32 tower_level_index = 20; + bool is_show_avatar = 21; + repeated SocialShowAvatarInfo show_avatar_info_list = 22; + repeated uint32 show_name_card_id_list = 23; + FriendEnterHomeOption friend_enter_home_option = 24; + ProfilePicture profile_picture = 25; + string ip_code = 26; + uint32 CMOBLNACDIE = 27; + uint32 GEGBOECJJMO = 28; + uint32 MBOLLDBJPCP = 32; + bool is_show_constellation_num = 33; + uint32 FLMFEMCAFHB = 34; + uint32 MOBMAJIJJGL = 35; + //GBNIKBFHHKP GFKFJJOADMH = 36; +} diff --git a/proto/SocialShowAvatarInfo.proto b/proto/SocialShowAvatarInfo.proto index dfb4810d..60702add 100644 --- a/proto/SocialShowAvatarInfo.proto +++ b/proto/SocialShowAvatarInfo.proto @@ -1,8 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// Obf: OGKHFCINDJP -message SocialShowAvatarInfo { - uint32 avatar_id = 1; - uint32 level = 2; - uint32 costume_id = 3; -} +// Version: 5.0 + +message SocialShowAvatarInfo { + uint32 avatar_id = 1; + uint32 level = 2; + uint32 costume_id = 3; + uint32 AEPNHMCDBFL = 4; + uint32 CMAFEKGPACG = 5; +} \ No newline at end of file diff --git a/proto/State.proto b/proto/State.proto new file mode 100644 index 00000000..e46caffd --- /dev/null +++ b/proto/State.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + +enum State { + STATE_INVALID = 0; + STATE_IN_PROGRESS = 1; + STATE_COMPLETE = 2; + STATE_REWARD_TAKEN = 3; +} \ No newline at end of file diff --git a/proto/StoreItemChangeNotify.proto b/proto/StoreItemChangeNotify.proto index 5c3cd7be..323f04b3 100644 --- a/proto/StoreItemChangeNotify.proto +++ b/proto/StoreItemChangeNotify.proto @@ -1,11 +1,13 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 2646 import "Item.proto"; import "StoreType.proto"; -// 4.7.0 -message StoreItemChangeNotify { - repeated Item item_list = 4; - StoreType store_type = 14; -} \ No newline at end of file +message StoreItemChangeNotify { + repeated Item item_list = 10; + StoreType store_type = 12; +} \ No newline at end of file diff --git a/proto/StoreWeightLimitNotify.proto b/proto/StoreWeightLimitNotify.proto index 6cb612ea..d8375be2 100644 --- a/proto/StoreWeightLimitNotify.proto +++ b/proto/StoreWeightLimitNotify.proto @@ -1,14 +1,16 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 3034 import "StoreType.proto"; -// 4.7.0 -message StoreWeightLimitNotify { - uint32 weight_limit = 12; - uint32 furniture_count_limit = 10; - uint32 weapon_count_limit = 7; - uint32 reliquary_count_limit = 1; - uint32 material_count_limit = 4; - StoreType store_type = 15; -} \ No newline at end of file +message StoreWeightLimitNotify { + uint32 weapon_count_limit = 3; + uint32 weight_limit = 5; + uint32 furniture_count_limit = 7; + uint32 material_count_limit = 11; + uint32 reliquary_count_limit = 14; + StoreType store_type = 15; +} \ No newline at end of file diff --git a/proto/StrengthenPointData.proto b/proto/StrengthenPointData.proto index 76350052..e44d23f9 100644 --- a/proto/StrengthenPointData.proto +++ b/proto/StrengthenPointData.proto @@ -1,8 +1,9 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// ? -message StrengthenPointData { - uint32 base_point = 9; // sus - uint32 cur_point = 13; // sus -} +// Version: 5.0 + +message StrengthenPointData { + uint32 base_point = 3; + uint32 cur_point = 7; +} \ No newline at end of file diff --git a/proto/SyncScenePlayTeamEntityNotify.proto b/proto/SyncScenePlayTeamEntityNotify.proto index 78cf8168..926cc8a3 100644 --- a/proto/SyncScenePlayTeamEntityNotify.proto +++ b/proto/SyncScenePlayTeamEntityNotify.proto @@ -1,11 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 26946 import "PlayTeamEntityInfo.proto"; -// 4.7.0 -// CmdId: 22675 -message SyncScenePlayTeamEntityNotify { - uint32 scene_id = 10; - repeated PlayTeamEntityInfo entity_info_list = 15; -} \ No newline at end of file +message SyncScenePlayTeamEntityNotify { + uint32 scene_id = 8; + repeated PlayTeamEntityInfo entity_info_list = 14; +} \ No newline at end of file diff --git a/proto/SyncTeamEntityNotify.proto b/proto/SyncTeamEntityNotify.proto index ddae87aa..988e11a9 100644 --- a/proto/SyncTeamEntityNotify.proto +++ b/proto/SyncTeamEntityNotify.proto @@ -1,11 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 29231 import "TeamEntityInfo.proto"; -// 4.7.0 -// CmdId: 5280 -message SyncTeamEntityNotify { - uint32 scene_id = 13; - repeated TeamEntityInfo team_entity_info_list = 14; -} \ No newline at end of file +message SyncTeamEntityNotify { + uint32 scene_id = 8; + repeated TeamEntityInfo team_entity_info_list = 9; +} \ No newline at end of file diff --git a/proto/SystemHint.proto b/proto/SystemHint.proto new file mode 100644 index 00000000..c8278d69 --- /dev/null +++ b/proto/SystemHint.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + +message SystemHint { + uint32 type = 2; +} \ No newline at end of file diff --git a/proto/TakeBattlePassMissionPointRsp.proto b/proto/TakeBattlePassMissionPointRsp.proto index e5ddfdf7..69fd0756 100644 --- a/proto/TakeBattlePassMissionPointRsp.proto +++ b/proto/TakeBattlePassMissionPointRsp.proto @@ -1,11 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 23201 -// CmdId: 5756 -// Version: 4.6.0 -// Obfs: CGAMLKOBIKD -message TakeBattlePassMissionPointRsp { - int32 retcode = 7; - repeated uint32 mission_id_list = 12; -} \ No newline at end of file +message TakeBattlePassMissionPointRsp { + repeated uint32 mission_id_list = 5; + int32 retcode = 8; +} \ No newline at end of file diff --git a/proto/TeamEntityInfo.proto b/proto/TeamEntityInfo.proto index 13bd59ed..21d5d26a 100644 --- a/proto/TeamEntityInfo.proto +++ b/proto/TeamEntityInfo.proto @@ -1,11 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 import "AbilitySyncStateInfo.proto"; -// 4.7.0 -message TeamEntityInfo { - uint32 authority_peer_id = 8; - uint32 team_entity_id = 10; - AbilitySyncStateInfo team_ability_info = 13; -} \ No newline at end of file +message TeamEntityInfo { + uint32 team_entity_id = 9; + AbilitySyncStateInfo team_ability_info = 13; + uint32 authority_peer_id = 15; +} \ No newline at end of file diff --git a/proto/ToTheMoonEnterSceneReq.proto b/proto/ToTheMoonEnterSceneReq.proto index 457d2d56..f880f823 100644 --- a/proto/ToTheMoonEnterSceneReq.proto +++ b/proto/ToTheMoonEnterSceneReq.proto @@ -1,11 +1,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 6116 -// 4.7.0 -message ToTheMoonEnterSceneReq { - uint32 scene_id = 13; - uint32 version = 2; - uint32 AHCPBKOFKNE = 1; - uint32 FHIFPHJNIJO = 5; -} +message ToTheMoonEnterSceneReq { + uint32 DKEOBFMAFPK = 5; + uint32 CDDPHGDDCCN = 2; + uint32 scene_id = 3; + uint32 version = 4; +} \ No newline at end of file diff --git a/proto/ToTheMoonQueryPathRsp.proto b/proto/ToTheMoonQueryPathRsp.proto index cc215320..48a0d3ff 100644 --- a/proto/ToTheMoonQueryPathRsp.proto +++ b/proto/ToTheMoonQueryPathRsp.proto @@ -1,36 +1,17 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 6148 + import "Vector.proto"; -// CmdId: 6191 -// Obf: FMMCBFGLFPH -message ToTheMoonQueryPathRsp { - // Obf: OHGIBJOJCED - enum PathStatusType { - STATUS_FAIL = 0; - STATUS_SUCC = 1; - STATUS_PARTIAL = 2; - } - - repeated Vector corners = 14; - int32 query_id = 2; - PathStatusType query_status = 11; - repeated int32 level = 13; - repeated int64 index = 15; - int32 retcode = 7; -} +import "PathStatusType.proto"; + +message ToTheMoonQueryPathRsp { + repeated int32 level = 1; + int32 retcode = 7; + repeated Vector corners = 9; + PathStatusType query_status = 10; + int32 query_id = 13; + repeated int64 index = 15; +} \ No newline at end of file diff --git a/proto/TowerAllDataReq.proto b/proto/TowerAllDataReq.proto index f77376bb..83f58fd1 100644 --- a/proto/TowerAllDataReq.proto +++ b/proto/TowerAllDataReq.proto @@ -1,10 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 2265 -// 4.7.0 -// CmdId: 611 -// AOPOGBADJHN -message TowerAllDataReq { - bool is_interact = 9; -} \ No newline at end of file +message TowerAllDataReq { + bool is_interact = 6; +} \ No newline at end of file diff --git a/proto/TowerLevelEndNotify.proto b/proto/TowerLevelEndNotify.proto index 771478a2..6c10a424 100644 --- a/proto/TowerLevelEndNotify.proto +++ b/proto/TowerLevelEndNotify.proto @@ -1,19 +1,20 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -import "ItemParam.proto"; -// 4.7.0 -// CmdId: 4173 -// ? -message TowerLevelEndNotify { - repeated uint32 finished_star_cond_list = 1; - repeated ItemParam reward_item_list = 13; - uint32 next_floor_id = 4; // sus - bool is_success = 10; - uint32 continue_state = 8; // sus +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 22669 + +import "ItemParam.proto"; + +message TowerLevelEndNotify { 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; } + repeated ItemParam reward_item_list = 1; + uint32 next_floor_id = 3; + repeated uint32 finished_star_cond_list = 8; + uint32 continue_state = 11; + bool is_success = 12; } diff --git a/proto/TrialAvatarFirstPassDungeonNotify.proto b/proto/TrialAvatarFirstPassDungeonNotify.proto index 90ae0937..cb11df2a 100644 --- a/proto/TrialAvatarFirstPassDungeonNotify.proto +++ b/proto/TrialAvatarFirstPassDungeonNotify.proto @@ -1,8 +1,9 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 26939 -// ? -message TrialAvatarFirstPassDungeonNotify { - uint32 trial_avatar_index_id = 13; -} \ No newline at end of file +// Version: 5.0 +// CmdId: 8103 + +message TrialAvatarFirstPassDungeonNotify { + uint32 trial_avatar_index_id = 5; +} \ No newline at end of file diff --git a/proto/TryEnterHomeReq.proto b/proto/TryEnterHomeReq.proto index 9d29346c..942cf28a 100644 --- a/proto/TryEnterHomeReq.proto +++ b/proto/TryEnterHomeReq.proto @@ -1,11 +1,12 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 24797 -// HJAKBGCDBIF -message TryEnterHomeReq { - uint32 target_uid = 5; - uint32 target_point = 14; - bool is_transfer_to_main_house_point = 15; - bool is_transfer_to_safe_point = 7; -} +// Version: 5.0 +// CmdId: 29384 + +message TryEnterHomeReq { + uint32 target_uid = 7; + bool is_transfer_to_main_house_point = 1; + bool is_transfer_to_safe_point = 11; + uint32 target_point = 15; +} \ No newline at end of file diff --git a/proto/TryEnterHomeRsp.proto b/proto/TryEnterHomeRsp.proto index 95a983e2..7cf28d66 100644 --- a/proto/TryEnterHomeRsp.proto +++ b/proto/TryEnterHomeRsp.proto @@ -1,10 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 24318 -// MCFMMONGMMH -message TryEnterHomeRsp { - uint32 target_uid = 11; - int32 retcode = 7; - repeated uint32 param_list = 15; -} +// Version: 5.0 +// CmdId: 21829 + +message TryEnterHomeRsp { + int32 retcode = 6; + repeated uint32 param_list = 8; + uint32 target_uid = 9; +} \ No newline at end of file diff --git a/proto/Uint32Pair.proto b/proto/Uint32Pair.proto index e8491af1..4d32237a 100644 --- a/proto/Uint32Pair.proto +++ b/proto/Uint32Pair.proto @@ -1,10 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 -// Version: 4.6.0 -// Obfs: ??? -message Uint32Pair { - uint32 key = 1; - uint32 value = 2; -} +message Uint32Pair { + uint32 key = 1; + uint32 value = 2; +} \ No newline at end of file diff --git a/proto/UnfreezeGroupLimitNotify.proto b/proto/UnfreezeGroupLimitNotify.proto index 501316bb..2382ec7b 100644 --- a/proto/UnfreezeGroupLimitNotify.proto +++ b/proto/UnfreezeGroupLimitNotify.proto @@ -1,11 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 2540 -// CmdId: 24297 or 28371? -// Version: 4.7.0 -// Obfs: MMPEMIHNEEI -message UnfreezeGroupLimitNotify { - uint32 point_id = 7; - uint32 scene_id = 11; -} \ No newline at end of file +message UnfreezeGroupLimitNotify { + uint32 scene_id = 5; + uint32 point_id = 12; +} \ No newline at end of file diff --git a/proto/UnionCmd.proto b/proto/UnionCmd.proto index e031bf79..fc3db24b 100644 --- a/proto/UnionCmd.proto +++ b/proto/UnionCmd.proto @@ -1,8 +1,9 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message UnionCmd { - bytes body = 15; - uint32 message_id = 3; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + +message UnionCmd { + uint32 message_id = 8; + bytes body = 14; +} \ No newline at end of file diff --git a/proto/UnionCmdNotify.proto b/proto/UnionCmdNotify.proto index 830c2439..4e750f52 100644 --- a/proto/UnionCmdNotify.proto +++ b/proto/UnionCmdNotify.proto @@ -1,9 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 9762 + import "UnionCmd.proto"; -// 4.7.0 -// CmdId: 6564 -// ? -message UnionCmdNotify { - repeated UnionCmd cmd_list = 1; -} \ No newline at end of file + +message UnionCmdNotify { + repeated UnionCmd cmd_list = 6; +} \ No newline at end of file diff --git a/proto/UpdatePlayerShowAvatarListReq.proto b/proto/UpdatePlayerShowAvatarListReq.proto index ff0ceddf..a866e0b2 100644 --- a/proto/UpdatePlayerShowAvatarListReq.proto +++ b/proto/UpdatePlayerShowAvatarListReq.proto @@ -1,8 +1,11 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message UpdatePlayerShowAvatarListReq { - repeated uint32 show_avatar_id_list = 7; - bool is_show_avatar = 8; -} +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 3998 + +message UpdatePlayerShowAvatarListReq { + repeated uint32 show_avatar_id_list = 3; + bool is_show_avatar = 13; + bool is_show_constellation_num = 11; +} \ No newline at end of file diff --git a/proto/UpdatePlayerShowAvatarListRsp.proto b/proto/UpdatePlayerShowAvatarListRsp.proto index d624322d..0133fecd 100644 --- a/proto/UpdatePlayerShowAvatarListRsp.proto +++ b/proto/UpdatePlayerShowAvatarListRsp.proto @@ -1,9 +1,12 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message UpdatePlayerShowAvatarListRsp { - bool is_show_avatar = 10; - int32 retcode = 11; - repeated uint32 show_avatar_id_list = 15; -} +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 20659 + +message UpdatePlayerShowAvatarListRsp { + repeated uint32 show_avatar_id_list = 3; + int32 retcode = 5; + bool is_show_avatar = 8; + bool is_show_constellation_num = 15; +} \ No newline at end of file diff --git a/proto/UpdatePlayerShowNameCardListReq.proto b/proto/UpdatePlayerShowNameCardListReq.proto index babd564f..e501b39b 100644 --- a/proto/UpdatePlayerShowNameCardListReq.proto +++ b/proto/UpdatePlayerShowNameCardListReq.proto @@ -1,7 +1,9 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message UpdatePlayerShowNameCardListReq { - repeated uint32 show_name_card_id_list = 5; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 7487 + +message UpdatePlayerShowNameCardListReq { + repeated uint32 show_name_card_id_list = 13; +} \ No newline at end of file diff --git a/proto/UpdatePlayerShowNameCardListRsp.proto b/proto/UpdatePlayerShowNameCardListRsp.proto index e9d953c2..227e1737 100644 --- a/proto/UpdatePlayerShowNameCardListRsp.proto +++ b/proto/UpdatePlayerShowNameCardListRsp.proto @@ -1,8 +1,10 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message UpdatePlayerShowNameCardListRsp { - int32 retcode = 5; - repeated uint32 show_name_card_id_list = 7; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 8022 + +message UpdatePlayerShowNameCardListRsp { + repeated uint32 show_name_card_id_list = 1; + int32 retcode = 8; +} \ No newline at end of file diff --git a/proto/UseItemReq.proto b/proto/UseItemReq.proto index 057a70ae..bc00b64c 100644 --- a/proto/UseItemReq.proto +++ b/proto/UseItemReq.proto @@ -1,11 +1,13 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message UseItemReq { - uint64 target_guid = 1; - uint32 option_idx = 2; - uint32 count = 8; - bool is_enter_mp_dungeon_team = 10; - uint64 guid = 15; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 9576 + +message UseItemReq { + uint32 count = 9; + uint32 option_idx = 6; + uint64 target_guid = 5; + bool is_enter_mp_dungeon_team = 10; + uint64 guid = 4; +} \ No newline at end of file diff --git a/proto/UseItemRsp.proto b/proto/UseItemRsp.proto index fdd92e3d..dab4cd64 100644 --- a/proto/UseItemRsp.proto +++ b/proto/UseItemRsp.proto @@ -1,11 +1,13 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message UseItemRsp { - uint32 option_idx = 3; - uint32 item_id = 5; - uint64 guid = 8; - int32 retcode = 9; - uint64 target_guid = 11; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 7672 + +message UseItemRsp { + uint64 target_guid = 2; + int32 retcode = 5; + uint32 option_idx = 11; + uint64 guid = 12; + uint32 item_id = 14; +} \ No newline at end of file diff --git a/proto/Vector3Int.proto b/proto/Vector3Int.proto index 87eea84d..ec4cbacf 100644 --- a/proto/Vector3Int.proto +++ b/proto/Vector3Int.proto @@ -1,11 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 -// Version: 4.6.0 -// Obfs: IPDNLGHMCNH -message Vector3Int { - int32 x = 1; - int32 y = 2; - int32 z = 3; -} +message Vector3Int { + int32 x = 1; + int32 y = 2; + int32 z = 3; +} \ No newline at end of file diff --git a/proto/VehicleInteractReq.proto b/proto/VehicleInteractReq.proto index de2c10ca..223c7961 100644 --- a/proto/VehicleInteractReq.proto +++ b/proto/VehicleInteractReq.proto @@ -1,12 +1,14 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 25867 + import "VehicleInteractType.proto"; -// 4.7.0 -// CmdId: 5099 -// Obf: ? -message VehicleInteractReq { - uint32 entity_id = 1; - uint32 pos = 2; - VehicleInteractType interact_type = 14; - bool uk1 = 4; -} + +message VehicleInteractReq { + uint32 pos = 13; + uint32 entity_id = 5; + bool EILHBJJEPOK = 1; + VehicleInteractType interact_type = 8; +} \ No newline at end of file diff --git a/proto/VehicleInteractRsp.proto b/proto/VehicleInteractRsp.proto index e22bf2ec..3d522122 100644 --- a/proto/VehicleInteractRsp.proto +++ b/proto/VehicleInteractRsp.proto @@ -1,18 +1,22 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 27433 + import "VehicleMember.proto"; +//import "HDPDHDLPHAE.proto"; import "Vector.proto"; import "VehicleInteractType.proto"; -// 4.7.0 -// CmdId: 27242 -// Obf: ? + message VehicleInteractRsp { - int32 retcode = 1; - VehicleMember member = 6; - Vector uk1 = 2; - uint32 entity_id = 13; - VehicleInteractType interact_type = 5; - uint32 gadget_id = 8; - Vector uk2 = 15; - uint32 uk3 = 12; + VehicleMember member = 3; + uint32 GIICKAOFKDB = 4; + int32 retcode = 5; + //HDPDHDLPHAE IIFDBEPLDKE = 6; + uint32 gadget_id = 7; + uint32 entity_id = 8; + Vector vehicle_pos = 10; + VehicleInteractType interact_type = 11; + Vector vehicle_rot = 15; } diff --git a/proto/VehicleInteractType.proto b/proto/VehicleInteractType.proto index 3a61affe..88711f52 100644 --- a/proto/VehicleInteractType.proto +++ b/proto/VehicleInteractType.proto @@ -1,24 +1,10 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// Obf: HHAEHDABPEB -enum VehicleInteractType { - VEHICLE_INTERACT_TYPE_NONE = 0; - VEHICLE_INTERACT_TYPE_IN = 1; - VEHICLE_INTERACT_TYPE_OUT = 2; -} +// Version: 5.0 + +enum VehicleInteractType { + VEHICLE_INTERACT_TYPE_NONE = 0; + VEHICLE_INTERACT_TYPE_IN = 1; + VEHICLE_INTERACT_TYPE_OUT = 2; +} \ No newline at end of file diff --git a/proto/VehicleLocationInfo.proto b/proto/VehicleLocationInfo.proto index 30a688f1..4a22fc48 100644 --- a/proto/VehicleLocationInfo.proto +++ b/proto/VehicleLocationInfo.proto @@ -1,18 +1,17 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 import "Vector.proto"; -// Version: 4.7.0 -// Obfs: ? -message VehicleLocationInfo { - uint32 entity_id = 11; - //float MKHCMCLJKLN = 5; // seems to be sorush related - //float AACAIMICFPI = 6; // seems to be sorush related - uint32 owner_uid = 12; - Vector pos = 8; - repeated uint32 uid_list = 5; - Vector rot = 4; - uint32 gadget_id = 2; -} +message VehicleLocationInfo { + repeated uint32 uid_list = 1; + float MEGKADCAAAJ = 2; + Vector pos = 4; + uint32 entity_id = 6; + float FIPKPJPKJBN = 9; + uint32 owner_uid = 10; + Vector rot = 14; + uint32 gadget_id = 15; +} \ No newline at end of file diff --git a/proto/VehicleStaminaNotify.proto b/proto/VehicleStaminaNotify.proto index def3b617..e3515fe1 100644 --- a/proto/VehicleStaminaNotify.proto +++ b/proto/VehicleStaminaNotify.proto @@ -1,24 +1,10 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// CmdId: 6743 -// Obf: FJJEGAOHOAC -message VehicleStaminaNotify { - uint32 entity_id = 10; - float cur_stamina = 5; -} +// Version: 5.0 +// CmdId: 1047 + +message VehicleStaminaNotify { + uint32 entity_id = 5; + float cur_stamina = 6; +} \ No newline at end of file diff --git a/proto/WearEquipReq.proto b/proto/WearEquipReq.proto index 31baac82..b28850b5 100644 --- a/proto/WearEquipReq.proto +++ b/proto/WearEquipReq.proto @@ -1,8 +1,10 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message WearEquipReq { - uint64 avatar_guid = 1; - uint64 equip_guid = 3; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 7023 + +message WearEquipReq { + uint64 equip_guid = 10; + uint64 avatar_guid = 6; +} \ No newline at end of file diff --git a/proto/WearEquipRsp.proto b/proto/WearEquipRsp.proto index 0e37c43d..2e0283ef 100644 --- a/proto/WearEquipRsp.proto +++ b/proto/WearEquipRsp.proto @@ -1,9 +1,11 @@ syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -message WearEquipRsp { - uint64 equip_guid = 2; - int32 retcode = 3; - uint64 avatar_guid = 8; -} \ No newline at end of file +option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 3218 + +message WearEquipRsp { + uint64 avatar_guid = 1; + int32 retcode = 9; + uint64 equip_guid = 13; +} \ No newline at end of file diff --git a/proto/WeekendDjinnInfo.proto b/proto/WeekendDjinnInfo.proto index 31d8eec4..6f939dc5 100644 --- a/proto/WeekendDjinnInfo.proto +++ b/proto/WeekendDjinnInfo.proto @@ -1,9 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + import "Vector.proto"; -// 4.7.0 -//obf: GNPAHMGJEHJ -message WeekendDjinnInfo { - Vector rot = 2; - Vector pos = 1; -} + +message WeekendDjinnInfo { + Vector pos = 11; + Vector rot = 14; +} \ No newline at end of file diff --git a/proto/WidgetCreateLocationInfo.proto b/proto/WidgetCreateLocationInfo.proto index ec8e19d7..4c99059c 100644 --- a/proto/WidgetCreateLocationInfo.proto +++ b/proto/WidgetCreateLocationInfo.proto @@ -1,10 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 + import "Vector.proto"; -// 4.7.0 -// Obf: PBAOGDGPBGJ -message WidgetCreateLocationInfo { - Vector rot = 15; - Vector pos = 13; - // TODO: some rot and pos switched -} + +message WidgetCreateLocationInfo { + Vector rot = 3; + Vector pos = 9; +} \ No newline at end of file diff --git a/proto/WidgetCreatorInfo.proto b/proto/WidgetCreatorInfo.proto index db110e68..da9b8c90 100644 --- a/proto/WidgetCreatorInfo.proto +++ b/proto/WidgetCreatorInfo.proto @@ -1,11 +1,13 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -import "WidgetCreatorOpType.proto"; +// Version: 5.0 + import "WidgetCreateLocationInfo.proto"; -// 4.7.0 -// Obf: IGAMKCLFACP -message WidgetCreatorInfo { - uint32 entity_id = 15; - WidgetCreatorOpType op_type = 8; - WidgetCreateLocationInfo location_info = 4; -} +import "WidgetCreatorOpType.proto"; + +message WidgetCreatorInfo { + WidgetCreateLocationInfo location_info = 2; + uint32 entity_id = 9; + WidgetCreatorOpType op_type = 12; +} \ No newline at end of file diff --git a/proto/WidgetCreatorOpType.proto b/proto/WidgetCreatorOpType.proto index 8df95394..55baf748 100644 --- a/proto/WidgetCreatorOpType.proto +++ b/proto/WidgetCreatorOpType.proto @@ -1,9 +1,10 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// Obf: FLOIKBKAJEM -enum WidgetCreatorOpType { - WIDGET_CREATOR_TYPE_NONE = 0; - WIDGET_CREATOR_TYPE_RETRACT = 1; - WIDGET_CREATOR_TYPE_RETRACT_AND_CREATE = 2; -} +// Version: 5.0 + +enum WidgetCreatorOpType { + WIDGET_CREATOR_TYPE_NONE = 0; + WIDGET_CREATOR_TYPE_RETRACT = 1; + WIDGET_CREATOR_TYPE_RETRACT_AND_CREATE = 2; +} \ No newline at end of file diff --git a/proto/WidgetDoBagReq.proto b/proto/WidgetDoBagReq.proto index ec6bdbd4..78652280 100644 --- a/proto/WidgetDoBagReq.proto +++ b/proto/WidgetDoBagReq.proto @@ -1,14 +1,16 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 1993 + import "WidgetCreateLocationInfo.proto"; import "WidgetCreatorInfo.proto"; -// 4.7.0 -// CmdId: 8213 -// Obf: LPCCGGKDGML + message WidgetDoBagReq { - uint32 material_id = 2; - oneof op_info { - WidgetCreateLocationInfo location_info = 1448; - WidgetCreatorInfo widget_creator_info = 1848; - } + uint32 material_id = 11; + oneof op_info { + WidgetCreateLocationInfo location_info = 1755; + WidgetCreatorInfo widget_creator_info = 858; + } } diff --git a/proto/WidgetDoBagRsp.proto b/proto/WidgetDoBagRsp.proto index 6dbeb520..c47827cc 100644 --- a/proto/WidgetDoBagRsp.proto +++ b/proto/WidgetDoBagRsp.proto @@ -1,9 +1,10 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 2951x or 21671 or 1415 or 7840? -// Obf: GKMOAEBHCLB -message WidgetDoBagRsp { - uint32 material_id = 6; - int32 retcode = 14; -} +// Version: 5.0 +// CmdId: 9170 + +message WidgetDoBagRsp { + int32 retcode = 11; + uint32 material_id = 12; +} \ No newline at end of file diff --git a/proto/WidgetGadgetAllDataNotify.proto b/proto/WidgetGadgetAllDataNotify.proto index fe9a79d2..12319232 100644 --- a/proto/WidgetGadgetAllDataNotify.proto +++ b/proto/WidgetGadgetAllDataNotify.proto @@ -1,9 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 26345 + import "WidgetGadgetData.proto"; -// 4.7.0 -// CmdId: 6291 -// Obf: GKCKKCHHINC -message WidgetGadgetAllDataNotify { - repeated WidgetGadgetData widget_gadget_data = 10; -} + +message WidgetGadgetAllDataNotify { + repeated WidgetGadgetData widget_gadget_data = 9; +} \ No newline at end of file diff --git a/proto/WidgetGadgetData.proto b/proto/WidgetGadgetData.proto index b7a47c16..695f71a1 100644 --- a/proto/WidgetGadgetData.proto +++ b/proto/WidgetGadgetData.proto @@ -1,8 +1,9 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// Obf: NJMDFFKJKJK -message WidgetGadgetData { - repeated uint32 gadget_entity_id_list = 9; - uint32 gadget_id = 10; -} +// Version: 5.0 + +message WidgetGadgetData { + uint32 gadget_id = 9; + repeated uint32 gadget_entity_id_list = 15; +} \ No newline at end of file diff --git a/proto/WidgetGadgetDataNotify.proto b/proto/WidgetGadgetDataNotify.proto index 782946cf..a71731d4 100644 --- a/proto/WidgetGadgetDataNotify.proto +++ b/proto/WidgetGadgetDataNotify.proto @@ -1,9 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 380 + import "WidgetGadgetData.proto"; -// 4.7.0 -// CmdId: 9673 -// Obf: HCNKGFAPJNC -message WidgetGadgetDataNotify { - WidgetGadgetData widget_gadget_data = 3; -} + +message WidgetGadgetDataNotify { + WidgetGadgetData widget_gadget_data = 9; +} \ No newline at end of file diff --git a/proto/WidgetSlotChangeNotify.proto b/proto/WidgetSlotChangeNotify.proto index 1a317e2b..d1f2fb34 100644 --- a/proto/WidgetSlotChangeNotify.proto +++ b/proto/WidgetSlotChangeNotify.proto @@ -1,11 +1,13 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 24715 + import "WidgetSlotData.proto"; import "WidgetSlotOp.proto"; -// 4.7.0 -// CmdId: 25904 -// Obf: IPDKAOIFKPO -message WidgetSlotChangeNotify { - WidgetSlotData slot = 2; - WidgetSlotOp op = 7; -} + +message WidgetSlotChangeNotify { + WidgetSlotData slot = 8; + WidgetSlotOp op = 15; +} \ No newline at end of file diff --git a/proto/WidgetSlotData.proto b/proto/WidgetSlotData.proto index 55e83c57..979a605c 100644 --- a/proto/WidgetSlotData.proto +++ b/proto/WidgetSlotData.proto @@ -1,12 +1,13 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 import "WidgetSlotTag.proto"; -// 4.7.0 -message WidgetSlotData { - uint32 material_id = 4; - bool is_active = 5; - WidgetSlotTag tag = 7; - uint32 cd_over_time = 13; -} \ No newline at end of file +message WidgetSlotData { + WidgetSlotTag tag = 1; + uint32 material_id = 9; + uint32 cd_over_time = 11; + bool is_active = 12; +} \ No newline at end of file diff --git a/proto/WidgetSlotOp.proto b/proto/WidgetSlotOp.proto index a58f5764..64de5bf9 100644 --- a/proto/WidgetSlotOp.proto +++ b/proto/WidgetSlotOp.proto @@ -1,8 +1,9 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// Obf: IHPLLJMLPGK -enum WidgetSlotOp { - WIDGET_SLOT_OP_ATTACH = 0; - WIDGET_SLOT_OP_DETACH = 1; -} +// Version: 5.0 + +enum WidgetSlotOp { + WIDGET_SLOT_OP_ATTACH = 0; + WIDGET_SLOT_OP_DETACH = 1; +} \ No newline at end of file diff --git a/proto/WindSeedType1Notify.proto b/proto/WindSeedType1Notify.proto index b5797ad1..2750d60e 100644 --- a/proto/WindSeedType1Notify.proto +++ b/proto/WindSeedType1Notify.proto @@ -1,9 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 7486 -// 4.7.0 -message WindSeedType1Notify { - uint32 config_id = 7; - bytes payload = 12; -} \ No newline at end of file +message WindSeedType1Notify { + uint32 config_id = 5; + bytes payload = 8; +} \ No newline at end of file diff --git a/proto/WorktopOptionNotify.proto b/proto/WorktopOptionNotify.proto index 2f261238..a4295385 100644 --- a/proto/WorktopOptionNotify.proto +++ b/proto/WorktopOptionNotify.proto @@ -1,9 +1,10 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// 4.7.0 -// CmdId: 5012 -// Obf: GKAGPMCEONE -message WorktopOptionNotify { - repeated uint32 option_list = 11; - uint32 gadget_entity_id = 6; -} +// Version: 5.0 +// CmdId: 28583 + +message WorktopOptionNotify { + uint32 gadget_entity_id = 7; + repeated uint32 option_list = 11; +} \ No newline at end of file diff --git a/proto/WorldDataNotify.proto b/proto/WorldDataNotify.proto index 14462cd3..39dfef4d 100644 --- a/proto/WorldDataNotify.proto +++ b/proto/WorldDataNotify.proto @@ -1,10 +1,11 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 23950 import "PropValue.proto"; -// 4.7.0 -// CmdId: 27793 -message WorldDataNotify { - map world_prop_map = 5; -} \ No newline at end of file +message WorldDataNotify { + map world_prop_map = 3; +} \ No newline at end of file diff --git a/proto/WorldPlayerDieNotify.proto b/proto/WorldPlayerDieNotify.proto index bb4d502e..7b701aff 100644 --- a/proto/WorldPlayerDieNotify.proto +++ b/proto/WorldPlayerDieNotify.proto @@ -1,16 +1,19 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// Version: 5.0 +// CmdId: 2689 +import "AbilityString.proto"; import "PlayerDieType.proto"; -// 4.7.0 message WorldPlayerDieNotify { - PlayerDieType die_type = 3; - uint32 murderer_entity_id = 6; - uint32 CMFMJLIALCD = 15; - oneof entity { - uint32 monster_id = 13; - uint32 gadget_id = 1; - } -} \ No newline at end of file + AbilityString GOEACHAMIAF = 1; + uint32 murderer_entity_id = 5; // 7 + uint32 GKHNLKAADNG = 7; + PlayerDieType die_type = 15; + oneof entity { + uint32 gadget_id = 3; + uint32 monster_id = 11; + } +} diff --git a/proto/WorldPlayerReviveReq.proto b/proto/WorldPlayerReviveReq.proto index 317f5bca..d7d01789 100644 --- a/proto/WorldPlayerReviveReq.proto +++ b/proto/WorldPlayerReviveReq.proto @@ -1,22 +1,8 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// CmdId: 2639 -// Obf: CLFPPNDBGLJ -message WorldPlayerReviveReq { -} +// Version: 5.0 +// CmdId: 2401 + +message WorldPlayerReviveReq { +} \ No newline at end of file diff --git a/proto/WorldPlayerReviveRsp.proto b/proto/WorldPlayerReviveRsp.proto index 77833128..aff71d73 100644 --- a/proto/WorldPlayerReviveRsp.proto +++ b/proto/WorldPlayerReviveRsp.proto @@ -1,23 +1,9 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; -// CmdId: 3657 -// Obf: OBBNANBMDCB -message WorldPlayerReviveRsp { - int32 retcode = 14; -} +// Version: 5.0 +// CmdId: 22159 + +message WorldPlayerReviveRsp { + int32 retcode = 5; +} \ No newline at end of file