From 09e59ae2513d0a4f62e98e65ecfa8b001941aff7 Mon Sep 17 00:00:00 2001 From: Yuuki <6851027-yukiz@users.noreply.gitlab.com> Date: Wed, 23 Aug 2023 01:23:37 +0800 Subject: [PATCH] sync 2.7 GC --- PacketOpcodes.java | 3020 ++++++++--------- README.md | 2 +- proto/AbilityAppliedAbility.proto | 2 +- proto/AbilityAppliedModifier.proto | 2 +- proto/AbilityAttachedModifier.proto | 1 - proto/AbilityChangeNotify.proto | 15 +- proto/AbilityEmbryo.proto | 1 - proto/AbilityGadgetInfo.proto | 1 - proto/AbilityIdentifier.proto | 1 - proto/AbilityInvocationsNotify.proto | 15 +- proto/AbilityInvokeArgument.proto | 102 +- proto/AbilityInvokeEntry.proto | 2 +- proto/AbilityInvokeEntryHead.proto | 1 - proto/AbilityMixinRecoverInfo.proto | 8 +- proto/AbilityScalarType.proto | 14 +- proto/AbilityScalarValueEntry.proto | 8 +- proto/AbilityString.proto | 3 +- proto/AbilitySyncStateInfo.proto | 2 +- proto/ActivityInfo.proto | 123 +- proto/ActivityInfoNotify.proto | 13 + proto/ActivityScheduleInfo.proto | 11 + proto/ActivityScheduleInfoNotify.proto | 14 + proto/ActivityTakeWatcherRewardReq.proto | 12 + proto/ActivityTakeWatcherRewardRsp.proto | 12 + proto/ActivityUpdateWatcherNotify.proto | 14 + proto/ActivityWatcherInfo.proto | 1 - proto/AddQuestContentProgressReq.proto | 13 + proto/AddQuestContentProgressRsp.proto | 11 + proto/AiSkillCdInfo.proto | 1 - proto/AiSyncInfo.proto | 1 - proto/AiThreatInfo.proto | 1 - proto/AllWidgetDataNotify.proto | 33 +- proto/AnchorPointData.proto | 1 + proto/AnchorPointDataNotify.proto | 15 +- proto/AnchorPointOpReq.proto | 24 +- proto/AnchorPointOpRsp.proto | 18 +- proto/AnimatorParameterValueInfo.proto | 5 +- proto/AnnounceData.proto | 15 + proto/AskAddFriendNotify.proto | 15 +- proto/AskAddFriendReq.proto | 16 +- proto/AskAddFriendRsp.proto | 20 +- proto/AttackHitEffectResult.proto | 1 - proto/AttackResult.proto | 3 +- proto/AvatarAddNotify.proto | 15 +- proto/AvatarChangeCostumeNotify.proto | 11 +- proto/AvatarChangeCostumeReq.proto | 18 +- proto/AvatarChangeCostumeRsp.proto | 18 +- proto/AvatarChangeElementTypeReq.proto | 12 + proto/AvatarChangeElementTypeRsp.proto | 10 + proto/AvatarDataNotify.proto | 23 +- proto/AvatarDieAnimationEndReq.proto | 19 +- proto/AvatarDieAnimationEndRsp.proto | 18 +- proto/AvatarEquipAffixInfo.proto | 1 - proto/AvatarEquipChangeNotify.proto | 21 +- proto/AvatarExpeditionAllDataRsp.proto | 20 +- proto/AvatarExpeditionCallBackReq.proto | 15 +- proto/AvatarExpeditionCallBackRsp.proto | 14 +- proto/AvatarExpeditionDataNotify.proto | 12 +- proto/AvatarExpeditionGetRewardReq.proto | 15 +- proto/AvatarExpeditionGetRewardRsp.proto | 21 +- proto/AvatarExpeditionInfo.proto | 1 + proto/AvatarExpeditionStartReq.proto | 17 +- proto/AvatarExpeditionStartRsp.proto | 16 +- proto/AvatarExpeditionState.proto | 10 +- proto/AvatarFetterDataNotify.proto | 11 +- proto/AvatarFetterLevelRewardReq.proto | 15 +- proto/AvatarFetterLevelRewardRsp.proto | 19 +- proto/AvatarFightPropNotify.proto | 16 +- proto/AvatarFightPropUpdateNotify.proto | 14 +- proto/AvatarFlycloakChangeNotify.proto | 16 +- proto/AvatarGainCostumeNotify.proto | 14 +- proto/AvatarGainFlycloakNotify.proto | 14 +- proto/AvatarInfo.proto | 12 +- proto/AvatarLifeStateChangeNotify.proto | 25 +- proto/AvatarPromoteGetRewardReq.proto | 17 +- proto/AvatarPromoteGetRewardRsp.proto | 18 +- proto/AvatarPromoteReq.proto | 16 +- proto/AvatarPromoteRsp.proto | 16 +- proto/AvatarPropNotify.proto | 16 +- proto/AvatarSkillChangeNotify.proto | 24 +- proto/AvatarSkillDepotChangeNotify.proto | 17 + proto/AvatarSkillInfo.proto | 1 - proto/AvatarSkillInfoNotify.proto | 5 +- proto/AvatarSkillMaxChargeCountNotify.proto | 7 +- proto/AvatarSkillUpgradeReq.proto | 18 +- proto/AvatarSkillUpgradeRsp.proto | 22 +- proto/AvatarTeam.proto | 1 - proto/AvatarTeamResonanceInfo.proto | 1 - proto/AvatarTeamUpdateNotify.proto | 15 +- proto/AvatarUnlockTalentNotify.proto | 18 +- proto/AvatarUpgradeReq.proto | 20 +- proto/AvatarUpgradeRsp.proto | 24 +- proto/AvatarWearFlycloakReq.proto | 18 +- proto/AvatarWearFlycloakRsp.proto | 18 +- proto/BattlePassAllDataNotify.proto | 15 + proto/BattlePassBuySuccNotify.proto | 15 + proto/BattlePassCurScheduleUpdateNotify.proto | 13 + proto/BattlePassCycle.proto | 9 + proto/BattlePassMission.proto | 19 + proto/BattlePassMissionDelNotify.proto | 10 + proto/BattlePassMissionUpdateNotify.proto | 12 + proto/BattlePassProduct.proto | 9 + proto/BattlePassRewardTag.proto | 11 + proto/BattlePassRewardTakeOption.proto | 10 + proto/BattlePassSchedule.proto | 24 + proto/BattlePassUnlockStatus.proto | 9 + proto/Birthday.proto | 1 - proto/BlockInfo.proto | 1 - proto/BlossomBriefInfoNotify.proto | 13 + proto/BuyBattlePassLevelReq.proto | 11 + proto/BuyBattlePassLevelRsp.proto | 11 + proto/BuyGoodsReq.proto | 10 +- proto/BuyGoodsRsp.proto | 11 +- proto/CBJEDMGOBPL.proto | 10 + proto/CalcWeaponUpgradeReturnItemsReq.proto | 19 +- proto/CalcWeaponUpgradeReturnItemsRsp.proto | 15 +- proto/CanUseSkillNotify.proto | 13 +- proto/CardProductRewardNotify.proto | 17 +- proto/ChallengeDataNotify.proto | 9 +- proto/ChangeAvatarReq.proto | 21 +- proto/ChangeAvatarRsp.proto | 18 +- proto/ChangeEnergyReason.proto | 4 +- proto/ChangeGameTimeReq.proto | 20 +- proto/ChangeGameTimeRsp.proto | 18 +- proto/ChangeHpReason.proto | 55 +- proto/ChangeMailStarNotify.proto | 8 +- proto/ChangeMpTeamAvatarReq.proto | 18 +- proto/ChangeMpTeamAvatarRsp.proto | 18 +- proto/ChangeTeamNameReq.proto | 18 +- proto/ChangeTeamNameRsp.proto | 16 +- proto/ChapterState.proto | 10 + proto/ChapterStateNotify.proto | 25 + proto/ChatInfo.proto | 31 +- proto/CheckAddItemExceedLimitNotify.proto | 18 +- proto/ChooseCurAvatarTeamReq.proto | 16 +- proto/ChooseCurAvatarTeamRsp.proto | 16 +- proto/CityInfo.proto | 1 - proto/ClientAbilityChangeNotify.proto | 18 +- proto/ClientAbilityInitBeginNotify.proto | 14 +- proto/ClientAbilityInitFinishNotify.proto | 17 +- proto/ClientCollectorData.proto | 1 - proto/ClientCollectorDataNotify.proto | 13 +- proto/ClientGadgetInfo.proto | 2 + proto/CodexDataFullNotify.proto | 17 +- proto/CodexDataUpdateNotify.proto | 18 +- proto/CodexType.proto | 18 +- proto/CodexTypeData.proto | 1 + proto/CombatInvocationsNotify.proto | 15 +- proto/CombatTypeArgument.proto | 34 +- proto/CombineDataNotify.proto | 13 +- proto/CombineFormulaDataNotify.proto | 15 +- proto/CombineReq.proto | 19 +- proto/CombineRsp.proto | 29 +- proto/CookDataNotify.proto | 13 + proto/CookGradeDataNotify.proto | 10 + proto/CookRecipeData.proto | 8 + proto/CookRecipeDataNotify.proto | 12 + proto/CoopCg.proto | 1 - proto/CoopChapter.proto | 16 +- proto/CoopDataNotify.proto | 19 +- proto/CoopPoint.proto | 13 +- proto/CoopReward.proto | 13 +- proto/CreateVehicleReq.proto | 12 +- proto/CreateVehicleRsp.proto | 8 +- proto/CutSceneBeginNotify.proto | 7 +- proto/CutSceneEndNotify.proto | 7 +- proto/CutSceneFinishNotify.proto | 6 +- proto/DailyDungeonEntryInfo.proto | 12 + proto/DealAddFriendReq.proto | 17 +- proto/DealAddFriendResultType.proto | 4 +- proto/DealAddFriendRsp.proto | 17 +- proto/DelMailReq.proto | 6 +- proto/DelMailRsp.proto | 7 +- proto/DelTeamEntityNotify.proto | 16 +- proto/DeleteFriendNotify.proto | 14 +- proto/DeleteFriendReq.proto | 16 +- proto/DeleteFriendRsp.proto | 16 +- proto/DestroyMaterialReq.proto | 15 +- proto/DestroyMaterialRsp.proto | 18 +- proto/DoGachaReq.proto | 24 +- proto/DoGachaRsp.proto | 39 +- proto/DropHintNotify.proto | 15 +- proto/DungeonChallengeBeginNotify.proto | 15 +- proto/DungeonChallengeFinishNotify.proto | 30 +- proto/DungeonDataNotify.proto | 5 +- proto/DungeonEntryInfoReq.proto | 17 +- proto/DungeonEntryInfoRsp.proto | 17 +- proto/DungeonGetStatueDropRsp.proto | 5 +- proto/DungeonSettleExhibitionInfo.proto | 11 + proto/DungeonSettleNotify.proto | 35 +- proto/DungeonShowReminderNotify.proto | 10 + proto/EAJCGENDICI.proto | 12 + proto/EnterSceneDoneRsp.proto | 16 +- proto/EnterScenePeerNotify.proto | 20 +- proto/EnterSceneReadyRsp.proto | 16 +- proto/EnterTransPointRegionNotify.proto | 9 +- proto/EnterType.proto | 24 +- proto/EnterWorldAreaReq.proto | 18 +- proto/EnterWorldAreaRsp.proto | 16 +- proto/EntityAiSyncNotify.proto | 15 +- proto/EntityAuthorityInfo.proto | 4 +- proto/EntityClientData.proto | 1 - proto/EntityEnvironmentInfo.proto | 1 - proto/EntityFightPropChangeReasonNotify.proto | 29 +- proto/EntityFightPropUpdateNotify.proto | 14 +- proto/EntityPropNotify.proto | 15 +- proto/EntityRendererChangedInfo.proto | 1 - proto/Equip.proto | 4 +- proto/EquipParam.proto | 8 +- proto/EvtAiSyncCombatThreatInfoNotify.proto | 15 +- proto/EvtAiSyncSkillCdNotify.proto | 15 +- proto/EvtAvatarLockChairReq.proto | 17 +- proto/EvtAvatarLockChairRsp.proto | 17 +- proto/EvtAvatarSitDownNotify.proto | 19 +- proto/EvtAvatarStandUpNotify.proto | 21 +- proto/EvtBeingHitNotify.proto | 19 +- proto/EvtBeingHitsCombineNotify.proto | 17 +- proto/EvtCreateGadgetNotify.proto | 47 +- proto/EvtDestroyGadgetNotify.proto | 17 +- proto/EvtDoSkillSuccNotify.proto | 21 +- proto/EvtEntityRenderersChangedNotify.proto | 17 + proto/ExhibitionDisplayInfo.proto | 9 + proto/FeatureBlockInfo.proto | 1 - proto/FetterData.proto | 1 - proto/FightPropPair.proto | 1 - proto/FinishedParentQuestNotify.proto | 5 +- proto/FinishedParentQuestUpdateNotify.proto | 5 +- proto/FireWorkData.proto | 10 + proto/FireWorkInstance.proto | 10 + proto/FireWorkNotify.proto | 12 + proto/FireWorkReq.proto | 13 + proto/FireWorkRsp.proto | 10 + proto/FireWorkType.proto | 12 + proto/FireworkSetData.proto | 11 + proto/FireworkSetNotify.proto | 13 + proto/FireworkSetReq.proto | 13 + proto/FireworkSetRsp.proto | 10 + proto/ForgeDataNotify.proto | 14 + proto/ForgeFormulaDataNotify.proto | 11 + proto/ForgeGetQueueDataRsp.proto | 14 + proto/ForgeQueueData.proto | 13 + proto/ForgeQueueDataNotify.proto | 14 + proto/ForgeQueueManipulateReq.proto | 14 + proto/ForgeQueueManipulateRsp.proto | 17 + proto/ForgeQueueManipulateType.proto | 8 + proto/ForgeStartReq.proto | 13 + proto/ForgeStartRsp.proto | 10 + proto/ForwardType.proto | 18 +- proto/FoundationInfo.proto | 8 +- proto/FriendBrief.proto | 4 +- proto/FriendEnterHomeOption.proto | 6 +- proto/FriendOnlineState.proto | 4 +- proto/Furniture.proto | 1 - ...FurnitureCurModuleArrangeCountNotify.proto | 12 + proto/FurnitureMakeBeHelpedData.proto | 13 + proto/FurnitureMakeData.proto | 12 + proto/FurnitureMakeHelpData.proto | 8 + proto/FurnitureMakeMakeInfo.proto | 8 + proto/FurnitureMakeReq.proto | 10 + proto/FurnitureMakeRsp.proto | 19 + proto/FurnitureMakeSlot.proto | 9 + proto/FurnitureMakeStartReq.proto | 12 + proto/FurnitureMakeStartRsp.proto | 13 + proto/GachaInfo.proto | 48 +- proto/GachaItem.proto | 2 +- proto/GachaUpInfo.proto | 1 - proto/GachaWishReq.proto | 13 + proto/GachaWishRsp.proto | 15 + proto/GadgetAutoPickDropInfoNotify.proto | 5 +- proto/GadgetBornType.proto | 14 +- proto/GadgetCrucibleInfo.proto | 1 - proto/GadgetInteractReq.proto | 24 +- proto/GadgetInteractRsp.proto | 21 +- proto/GadgetPlayInfo.proto | 6 +- proto/GadgetStateNotify.proto | 9 +- proto/GetActivityInfoReq.proto | 11 + proto/GetActivityInfoRsp.proto | 17 +- proto/GetAllMailReq.proto | 6 +- proto/GetAllMailRsp.proto | 11 +- proto/GetAllUnlockNameCardRsp.proto | 16 +- proto/GetAuthkeyReq.proto | 20 +- proto/GetAuthkeyRsp.proto | 24 +- proto/GetBattlePassProductReq.proto | 11 + proto/GetBattlePassProductRsp.proto | 14 + proto/GetDailyDungeonEntryInfoReq.proto | 11 + proto/GetDailyDungeonEntryInfoRsp.proto | 13 + proto/GetFriendShowAvatarInfoReq.proto | 15 +- proto/GetFriendShowAvatarInfoRsp.proto | 17 +- ...GetFurnitureCurModuleArrangeCountReq.proto | 10 + proto/GetGachaInfoRsp.proto | 19 +- proto/GetInvestigationMonsterReq.proto | 16 +- proto/GetInvestigationMonsterRsp.proto | 18 +- proto/GetMailItemReq.proto | 6 +- proto/GetMailItemRsp.proto | 9 +- proto/GetOnlinePlayerListReq.proto | 6 +- proto/GetOnlinePlayerListRsp.proto | 12 +- proto/GetPlayerAskFriendListRsp.proto | 15 +- proto/GetPlayerBlacklistRsp.proto | 15 +- proto/GetPlayerFriendListRsp.proto | 19 +- proto/GetPlayerHomeCompInfoReq.proto | 10 + proto/GetPlayerSocialDetailReq.proto | 16 +- proto/GetPlayerSocialDetailRsp.proto | 15 +- proto/GetPlayerTokenReq.proto | 42 +- proto/GetPlayerTokenRsp.proto | 61 +- proto/GetSceneAreaReq.proto | 18 +- proto/GetSceneAreaRsp.proto | 19 +- proto/GetScenePointReq.proto | 18 +- proto/GetScenePointRsp.proto | 35 +- proto/GetShopReq.proto | 16 +- proto/GetShopRsp.proto | 15 +- proto/GetShopmallDataRsp.proto | 16 +- proto/GetWidgetSlotReq.proto | 14 +- proto/GetWidgetSlotRsp.proto | 15 +- proto/GetWorldMpInfoRsp.proto | 18 +- proto/GroupSuiteNotify.proto | 13 +- proto/GroupUnloadNotify.proto | 10 + proto/H5ActivityIdsNotify.proto | 16 +- proto/HEMFKLPNNOM.proto | 12 + proto/HitColliderType.proto | 8 +- proto/HitTreeNotify.proto | 13 + proto/HomeAnimalData.proto | 11 + proto/HomeBasicInfo.proto | 16 + proto/HomeBasicInfoNotify.proto | 12 + proto/HomeBlockArrangementInfo.proto | 29 + proto/HomeBlockDotPattern.proto | 9 + proto/HomeBlockFieldData.proto | 14 + proto/HomeBlockNotify.proto | 10 + proto/HomeBlockSubFieldData.proto | 10 + proto/HomeChangeEditModeReq.proto | 11 + proto/HomeChangeEditModeRsp.proto | 11 + proto/HomeChooseModuleReq.proto | 18 +- proto/HomeChooseModuleRsp.proto | 18 +- proto/HomeComfortInfoNotify.proto | 15 +- proto/HomeFurnitureData.proto | 14 + proto/HomeFurnitureSuiteData.proto | 13 + proto/HomeGetArrangementInfoReq.proto | 11 + proto/HomeGetArrangementInfoRsp.proto | 13 + proto/HomeGetBasicInfoReq.proto | 10 + proto/HomeLimitedShopInfo.proto | 14 + proto/HomeMarkPointFurnitureData.proto | 18 + proto/HomeMarkPointNPCData.proto | 8 + proto/HomeMarkPointNotify.proto | 12 + proto/HomeMarkPointSceneData.proto | 13 + proto/HomeMarkPointSuiteData.proto | 7 + proto/HomeModuleComfortInfo.proto | 9 +- proto/HomeNpcData.proto | 12 + proto/HomeSceneArrangementInfo.proto | 22 + proto/HomeSceneInitFinishReq.proto | 10 + proto/HomeSceneInitFinishRsp.proto | 10 + proto/HomeSceneJumpReq.proto | 11 + proto/HomeSceneJumpRsp.proto | 11 + proto/HomeUnknown1Notify.proto | 7 + proto/HomeUpdateArrangementInfoReq.proto | 13 + proto/HomeUpdateArrangementInfoRsp.proto | 10 + proto/HostPlayerNotify.proto | 16 +- proto/InterOpType.proto | 4 +- proto/InteractType.proto | 31 +- proto/Item.proto | 8 +- proto/ItemAddHintNotify.proto | 29 +- proto/ItemGivingReq.proto | 19 +- proto/ItemGivingRsp.proto | 17 +- proto/ItemHint.proto | 2 +- proto/ItemParam.proto | 1 - proto/JDPMOMKAPIF.proto | 10 + proto/JMPCGMBHJLG.proto | 11 + proto/JOEPIGNPDGH.proto | 10 + proto/KJDPNIKDKEJ.proto | 10 + proto/LifeStateChangeNotify.proto | 25 +- proto/LockedPersonallineData.proto | 17 + proto/LunchBoxData.proto | 1 - proto/MLMEFKLMOEF.proto | 10 + proto/MailChangeNotify.proto | 7 +- proto/MailData.proto | 25 +- proto/MailItem.proto | 6 +- proto/MailTextContent.proto | 6 +- proto/MapMarkFromType.proto | 6 +- proto/MapMarkPoint.proto | 4 +- proto/MapMarkTipsType.proto | 2 +- proto/MarkEntityInMinMapNotify.proto | 17 +- proto/MarkMapReq.proto | 27 +- proto/MarkMapRsp.proto | 15 +- proto/MarkNewNotify.proto | 16 +- proto/MassivePropParam.proto | 1 - proto/MaterialDeleteInfo.proto | 17 +- proto/MathQuaternion.proto | 9 +- proto/McoinExchangeHcoinReq.proto | 8 +- proto/McoinExchangeHcoinRsp.proto | 7 +- proto/ModifierDurability.proto | 1 - proto/MonsterBornType.proto | 6 +- proto/MotionInfo.proto | 4 +- proto/MotionState.proto | 112 +- proto/MovingPlatformType.proto | 8 +- proto/MpSettingType.proto | 6 +- proto/MusicBeatmap.proto | 10 + proto/MusicBeatmapList.proto | 9 + proto/MusicBeatmapNote.proto | 8 + proto/MusicBriefInfo.proto | 26 + proto/MusicGameActivityDetailInfo.proto | 12 + proto/MusicGameCreateBeatmapReq.proto | 21 + proto/MusicGameCreateBeatmapRsp.proto | 15 + proto/MusicGameGetBeatmapReq.proto | 19 + proto/MusicGameGetBeatmapReqType.proto | 14 + proto/MusicGameGetBeatmapRsp.proto | 24 + proto/MusicGameRecord.proto | 9 + proto/MusicGameSearchBeatmapReq.proto | 14 + proto/MusicGameSearchBeatmapRsp.proto | 18 + proto/MusicGameSettleReq.proto | 31 + proto/MusicGameSettleRsp.proto | 14 + proto/MusicGameStartReq.proto | 13 + proto/MusicGameStartRsp.proto | 12 + ...MusicGameStartToPlayOthersBeatmapReq.proto | 13 + ...MusicGameStartToPlayOthersBeatmapRsp.proto | 14 + proto/MusicGameUnknown1Enum.proto | 8 + proto/MusicGameUnknown2Enum.proto | 9 + proto/NpcTalkReq.proto | 19 +- proto/NpcTalkRsp.proto | 19 +- .../OneoffGatherPointDetectorDataNotify.proto | 13 +- proto/OpenStateUpdateNotify.proto | 14 +- proto/ParentQuest.proto | 3 +- proto/PersonalLineAllDataReq.proto | 10 + proto/PersonalLineAllDataRsp.proto | 17 + proto/PersonalSceneJumpReq.proto | 15 +- proto/PersonalSceneJumpRsp.proto | 15 +- proto/PingReq.proto | 24 +- proto/PingRsp.proto | 18 +- proto/PlatformInfo.proto | 2 +- proto/PlatformType.proto | 24 +- proto/PlayerApplyEnterMpNotify.proto | 17 +- proto/PlayerApplyEnterMpReq.proto | 16 +- proto/PlayerApplyEnterMpResultNotify.proto | 48 +- proto/PlayerApplyEnterMpResultReq.proto | 18 +- proto/PlayerApplyEnterMpResultRsp.proto | 20 +- proto/PlayerApplyEnterMpRsp.proto | 18 +- proto/PlayerChatNotify.proto | 15 +- proto/PlayerChatReq.proto | 17 +- proto/PlayerChatRsp.proto | 16 +- proto/PlayerCookArgsReq.proto | 12 + proto/PlayerCookArgsRsp.proto | 11 + proto/PlayerCookReq.proto | 14 + proto/PlayerCookRsp.proto | 18 + proto/PlayerDataNotify.proto | 19 +- proto/PlayerDieType.proto | 18 +- proto/PlayerEnterDungeonReq.proto | 8 +- proto/PlayerEnterDungeonRsp.proto | 9 +- proto/PlayerEnterSceneInfoNotify.proto | 27 +- proto/PlayerEnterSceneNotify.proto | 45 +- proto/PlayerGameTimeNotify.proto | 20 +- proto/PlayerGetForceQuitBanInfoRsp.proto | 18 +- proto/PlayerHomeCompInfo.proto | 10 +- proto/PlayerHomeCompInfoNotify.proto | 15 +- proto/PlayerLevelRewardUpdateNotify.proto | 14 +- proto/PlayerLoginReq.proto | 95 +- proto/PlayerLoginRsp.proto | 78 +- proto/PlayerLuaShellNotify.proto | 15 + proto/PlayerPropNotify.proto | 13 +- proto/PlayerQuitDungeonReq.proto | 8 +- proto/PlayerQuitDungeonRsp.proto | 7 +- proto/PlayerRTTInfo.proto | 1 - proto/PlayerSetPauseReq.proto | 16 +- proto/PlayerStoreNotify.proto | 19 +- proto/PlayerTimeNotify.proto | 18 +- proto/PlayerWorldSceneInfo.proto | 9 + proto/PlayerWorldSceneInfoListNotify.proto | 7 +- proto/PostEnterSceneRsp.proto | 16 +- proto/PrivateChatNotify.proto | 11 +- proto/PrivateChatReq.proto | 22 +- proto/PrivateChatRsp.proto | 16 +- proto/PropChangeReason.proto | 28 +- proto/PropValue.proto | 7 +- proto/ProtEntityType.proto | 30 +- proto/ProudSkillChangeNotify.proto | 18 +- proto/ProudSkillExtraLevelNotify.proto | 20 +- proto/PullPrivateChatReq.proto | 20 +- proto/PullPrivateChatRsp.proto | 15 +- proto/PullRecentChatRsp.proto | 15 +- proto/QueryCodexMonsterBeKilledNumReq.proto | 15 +- proto/QueryCodexMonsterBeKilledNumRsp.proto | 17 +- proto/QueryFilter.proto | 8 + proto/QueryPathReq.proto | 28 + proto/QueryPathRsp.proto | 21 + proto/QuestDelNotify.proto | 5 +- proto/QuestGlobalVarNotify.proto | 5 +- proto/QuestListNotify.proto | 5 +- proto/QuestListUpdateNotify.proto | 5 +- proto/QuestProgressUpdateNotify.proto | 9 +- proto/QuestUpdateQuestVarNotify.proto | 9 +- proto/QuestUpdateQuestVarReq.proto | 10 +- proto/QuestUpdateQuestVarRsp.proto | 11 +- proto/QuickUseWidgetReq.proto | 25 +- proto/QuickUseWidgetRsp.proto | 23 +- proto/ReadMailNotify.proto | 6 +- proto/Reliquary.proto | 1 - proto/ReliquaryDecomposeReq.proto | 13 + proto/ReliquaryDecomposeRsp.proto | 12 + proto/ReliquaryPromoteReq.proto | 18 +- proto/ReliquaryPromoteRsp.proto | 24 +- proto/ReliquaryUpgradeReq.proto | 19 +- proto/ReliquaryUpgradeRsp.proto | 24 +- proto/ResVersionConfig.proto | 3 +- proto/ResinChangeNotify.proto | 14 +- proto/ResinCostType.proto | 12 +- proto/RoguelikeDungeonSettleInfo.proto | 15 + proto/RoguelikeSettleCoinInfo.proto | 9 + proto/RoutePoint.proto | 10 +- proto/SceneAreaWeatherNotify.proto | 22 +- proto/SceneAvatarInfo.proto | 4 +- proto/SceneEntityAiInfo.proto | 2 +- proto/SceneEntityAppearNotify.proto | 19 +- proto/SceneEntityDisappearNotify.proto | 16 +- proto/SceneEntityDrownReq.proto | 15 +- proto/SceneEntityDrownRsp.proto | 15 +- proto/SceneEntityInfo.proto | 30 +- proto/SceneEntityMoveNotify.proto | 19 +- proto/SceneFishInfo.proto | 1 + proto/SceneForceUnlockNotify.proto | 14 +- proto/SceneGadgetInfo.proto | 72 +- proto/SceneInitFinishRsp.proto | 18 +- proto/SceneKickPlayerNotify.proto | 18 +- proto/SceneKickPlayerReq.proto | 16 +- proto/SceneKickPlayerRsp.proto | 16 +- proto/SceneMonsterInfo.proto | 8 +- proto/SceneNpcInfo.proto | 1 - proto/ScenePlayerInfoNotify.proto | 13 +- proto/ScenePlayerLocationNotify.proto | 15 +- proto/SceneReliquaryInfo.proto | 1 - proto/SceneTeamAvatar.proto | 4 +- proto/SceneTeamUpdateNotify.proto | 15 +- proto/SceneTimeNotify.proto | 18 +- proto/SceneTransToPointReq.proto | 18 +- proto/SceneTransToPointRsp.proto | 18 +- proto/SceneWeaponInfo.proto | 2 + proto/SelectWorktopOptionReq.proto | 8 +- proto/SelectWorktopOptionRsp.proto | 9 +- proto/ServantInfo.proto | 1 - proto/ServerAnnounceNotify.proto | 12 + proto/ServerAnnounceRevokeNotify.proto | 10 + proto/ServerBuff.proto | 1 - .../ServerCondMeetQuestListUpdateNotify.proto | 7 +- proto/ServerTimeNotify.proto | 14 +- proto/SetBattlePassViewedReq.proto | 11 + proto/SetBattlePassViewedRsp.proto | 11 + proto/SetEntityClientDataNotify.proto | 17 +- proto/SetEquipLockStateReq.proto | 18 +- proto/SetEquipLockStateRsp.proto | 18 +- proto/SetNameCardReq.proto | 16 +- proto/SetNameCardRsp.proto | 16 +- proto/SetPlayerBirthdayReq.proto | 19 +- proto/SetPlayerBirthdayRsp.proto | 19 +- proto/SetPlayerBornDataReq.proto | 17 +- proto/SetPlayerBornDataRsp.proto | 13 +- proto/SetPlayerHeadImageReq.proto | 16 +- proto/SetPlayerHeadImageRsp.proto | 17 +- proto/SetPlayerNameReq.proto | 16 +- proto/SetPlayerNameRsp.proto | 16 +- proto/SetPlayerPropReq.proto | 15 +- proto/SetPlayerPropRsp.proto | 14 +- proto/SetPlayerSignatureReq.proto | 16 +- proto/SetPlayerSignatureRsp.proto | 16 +- proto/SetUpAvatarTeamReq.proto | 20 +- proto/SetUpAvatarTeamRsp.proto | 20 +- proto/SetUpLunchBoxWidgetReq.proto | 15 +- proto/SetUpLunchBoxWidgetRsp.proto | 15 +- proto/SetWidgetSlotReq.proto | 19 +- proto/SetWidgetSlotRsp.proto | 19 +- proto/Shop.proto | 4 +- proto/ShopCardProduct.proto | 16 +- proto/ShopMcoinProduct.proto | 1 - proto/ShortAbilityHashPair.proto | 1 - proto/ShowAvatarInfo.proto | 2 +- proto/ShowEquip.proto | 4 +- proto/SocialDetail.proto | 2 +- proto/SocialShowAvatarInfo.proto | 1 - proto/StoreItemChangeNotify.proto | 17 +- proto/StoreItemDelNotify.proto | 15 +- proto/StoreType.proto | 6 +- proto/StoreWeightLimitNotify.proto | 19 +- proto/SyncScenePlayTeamEntityNotify.proto | 13 +- proto/SyncTeamEntityNotify.proto | 13 +- proto/TakeAchievementRewardReq.proto | 16 +- proto/TakeBattlePassMissionPointReq.proto | 11 + proto/TakeBattlePassMissionPointRsp.proto | 11 + proto/TakeBattlePassRewardReq.proto | 13 + proto/TakeBattlePassRewardRsp.proto | 15 + proto/TakeFurnitureMakeReq.proto | 13 + proto/TakeFurnitureMakeRsp.proto | 17 + proto/TakePlayerLevelRewardReq.proto | 16 +- proto/TakePlayerLevelRewardRsp.proto | 18 +- proto/TakeoffEquipReq.proto | 18 +- proto/TakeoffEquipRsp.proto | 18 +- proto/TeamEnterSceneInfo.proto | 2 +- proto/TeamResonanceChangeNotify.proto | 13 +- proto/TowerAllDataRsp.proto | 47 +- proto/TowerBuffSelectReq.proto | 15 +- proto/TowerBuffSelectRsp.proto | 15 +- proto/TowerCurLevelRecord.proto | 1 + proto/TowerCurLevelRecordChangeNotify.proto | 13 +- proto/TowerEnterLevelReq.proto | 15 +- proto/TowerEnterLevelRsp.proto | 19 +- proto/TowerFloorRecordChangeNotify.proto | 15 +- proto/TowerLevelEndNotify.proto | 28 +- proto/TowerLevelRecord.proto | 1 - proto/TowerLevelStarCondData.proto | 1 + proto/TowerLevelStarCondNotify.proto | 17 +- proto/TowerMiddleLevelChangeTeamNotify.proto | 11 +- proto/TowerMonthlyBrief.proto | 1 - proto/TowerTeam.proto | 1 - proto/TowerTeamSelectReq.proto | 15 +- proto/TowerTeamSelectRsp.proto | 11 +- proto/TrackingIOInfo.proto | 1 - proto/TrialAvatarFirstPassDungeonNotify.proto | 10 + proto/TrialAvatarGrantRecord.proto | 22 +- proto/TrialAvatarInfo.proto | 2 +- proto/TryEnterHomeReq.proto | 20 +- proto/TryEnterHomeRsp.proto | 20 +- proto/UnionCmd.proto | 1 - proto/UnionCmdNotify.proto | 15 +- proto/UnlockAvatarTalentReq.proto | 18 +- proto/UnlockAvatarTalentRsp.proto | 18 +- proto/UnlockNameCardNotify.proto | 14 +- proto/UnlockPersonalLineReq.proto | 11 + proto/UnlockPersonalLineRsp.proto | 15 + .../UnlockedFurnitureFormulaDataNotify.proto | 11 + proto/UnlockedFurnitureSuiteDataNotify.proto | 11 + proto/UpdatePlayerShowAvatarListReq.proto | 15 +- proto/UpdatePlayerShowAvatarListRsp.proto | 17 +- proto/UseItemReq.proto | 22 +- proto/UseItemRsp.proto | 22 +- proto/UseWidgetCreateGadgetReq.proto | 17 +- proto/UseWidgetCreateGadgetRsp.proto | 14 +- proto/UseWidgetRetractGadgetReq.proto | 16 +- proto/UseWidgetRetractGadgetRsp.proto | 18 +- proto/Vector.proto | 1 - proto/Vector3Int.proto | 9 + proto/VehicleInteractReq.proto | 10 +- proto/VehicleInteractRsp.proto | 9 +- proto/VehicleInteractType.proto | 6 +- proto/VehicleStaminaNotify.proto | 7 +- proto/VisionType.proto | 39 +- proto/Weapon.proto | 1 - proto/WeaponAwakenReq.proto | 20 +- proto/WeaponAwakenRsp.proto | 24 +- proto/WeaponPromoteReq.proto | 16 +- proto/WeaponPromoteRsp.proto | 20 +- proto/WeaponUpgradeReq.proto | 19 +- proto/WeaponUpgradeRsp.proto | 21 +- proto/WearEquipReq.proto | 16 +- proto/WearEquipRsp.proto | 18 +- proto/WeeklyBossResinDiscountInfo.proto | 1 - proto/WidgetActiveChangeNotify.proto | 13 +- proto/WidgetCameraInfo.proto | 1 - proto/WidgetCoolDownData.proto | 1 - proto/WidgetCoolDownNotify.proto | 15 +- proto/WidgetCreatorInfo.proto | 2 +- proto/WidgetCreatorOpType.proto | 6 +- proto/WidgetDoBagReq.proto | 21 +- proto/WidgetDoBagRsp.proto | 16 +- proto/WidgetGadgetAllDataNotify.proto | 13 +- proto/WidgetGadgetData.proto | 1 - proto/WidgetGadgetDataNotify.proto | 13 +- proto/WidgetGadgetDestroyNotify.proto | 14 +- proto/WidgetReportReq.proto | 21 +- proto/WidgetReportRsp.proto | 16 +- proto/WidgetSlotChangeNotify.proto | 17 +- proto/WidgetSlotOp.proto | 4 +- proto/WidgetSlotTag.proto | 4 +- proto/WidgetThunderBirdFeatherInfo.proto | 1 - ...getUseAttachAbilityGroupChangeNotify.proto | 16 +- proto/WindSeedClientNotify.proto | 35 + proto/WorktopOptionNotify.proto | 7 +- proto/WorldDataNotify.proto | 21 +- proto/WorldPlayerDieNotify.proto | 21 +- proto/WorldPlayerInfoNotify.proto | 17 +- proto/WorldPlayerLocationNotify.proto | 15 +- proto/WorldPlayerRTTNotify.proto | 13 +- proto/WorldPlayerReviveReq.proto | 13 +- proto/WorldPlayerReviveRsp.proto | 14 +- 676 files changed, 6722 insertions(+), 5912 deletions(-) create mode 100644 proto/ActivityInfoNotify.proto create mode 100644 proto/ActivityScheduleInfo.proto create mode 100644 proto/ActivityScheduleInfoNotify.proto create mode 100644 proto/ActivityTakeWatcherRewardReq.proto create mode 100644 proto/ActivityTakeWatcherRewardRsp.proto create mode 100644 proto/ActivityUpdateWatcherNotify.proto create mode 100644 proto/AddQuestContentProgressReq.proto create mode 100644 proto/AddQuestContentProgressRsp.proto create mode 100644 proto/AnnounceData.proto create mode 100644 proto/AvatarChangeElementTypeReq.proto create mode 100644 proto/AvatarChangeElementTypeRsp.proto create mode 100644 proto/AvatarSkillDepotChangeNotify.proto create mode 100644 proto/BattlePassAllDataNotify.proto create mode 100644 proto/BattlePassBuySuccNotify.proto create mode 100644 proto/BattlePassCurScheduleUpdateNotify.proto create mode 100644 proto/BattlePassCycle.proto create mode 100644 proto/BattlePassMission.proto create mode 100644 proto/BattlePassMissionDelNotify.proto create mode 100644 proto/BattlePassMissionUpdateNotify.proto create mode 100644 proto/BattlePassProduct.proto create mode 100644 proto/BattlePassRewardTag.proto create mode 100644 proto/BattlePassRewardTakeOption.proto create mode 100644 proto/BattlePassSchedule.proto create mode 100644 proto/BattlePassUnlockStatus.proto create mode 100644 proto/BlossomBriefInfoNotify.proto create mode 100644 proto/BuyBattlePassLevelReq.proto create mode 100644 proto/BuyBattlePassLevelRsp.proto create mode 100644 proto/CBJEDMGOBPL.proto create mode 100644 proto/ChapterState.proto create mode 100644 proto/ChapterStateNotify.proto create mode 100644 proto/CookDataNotify.proto create mode 100644 proto/CookGradeDataNotify.proto create mode 100644 proto/CookRecipeData.proto create mode 100644 proto/CookRecipeDataNotify.proto create mode 100644 proto/DailyDungeonEntryInfo.proto create mode 100644 proto/DungeonSettleExhibitionInfo.proto create mode 100644 proto/DungeonShowReminderNotify.proto create mode 100644 proto/EAJCGENDICI.proto create mode 100644 proto/EvtEntityRenderersChangedNotify.proto create mode 100644 proto/ExhibitionDisplayInfo.proto create mode 100644 proto/FireWorkData.proto create mode 100644 proto/FireWorkInstance.proto create mode 100644 proto/FireWorkNotify.proto create mode 100644 proto/FireWorkReq.proto create mode 100644 proto/FireWorkRsp.proto create mode 100644 proto/FireWorkType.proto create mode 100644 proto/FireworkSetData.proto create mode 100644 proto/FireworkSetNotify.proto create mode 100644 proto/FireworkSetReq.proto create mode 100644 proto/FireworkSetRsp.proto create mode 100644 proto/ForgeDataNotify.proto create mode 100644 proto/ForgeFormulaDataNotify.proto create mode 100644 proto/ForgeGetQueueDataRsp.proto create mode 100644 proto/ForgeQueueData.proto create mode 100644 proto/ForgeQueueDataNotify.proto create mode 100644 proto/ForgeQueueManipulateReq.proto create mode 100644 proto/ForgeQueueManipulateRsp.proto create mode 100644 proto/ForgeQueueManipulateType.proto create mode 100644 proto/ForgeStartReq.proto create mode 100644 proto/ForgeStartRsp.proto create mode 100644 proto/FurnitureCurModuleArrangeCountNotify.proto create mode 100644 proto/FurnitureMakeBeHelpedData.proto create mode 100644 proto/FurnitureMakeData.proto create mode 100644 proto/FurnitureMakeHelpData.proto create mode 100644 proto/FurnitureMakeMakeInfo.proto create mode 100644 proto/FurnitureMakeReq.proto create mode 100644 proto/FurnitureMakeRsp.proto create mode 100644 proto/FurnitureMakeSlot.proto create mode 100644 proto/FurnitureMakeStartReq.proto create mode 100644 proto/FurnitureMakeStartRsp.proto create mode 100644 proto/GachaWishReq.proto create mode 100644 proto/GachaWishRsp.proto create mode 100644 proto/GetActivityInfoReq.proto create mode 100644 proto/GetBattlePassProductReq.proto create mode 100644 proto/GetBattlePassProductRsp.proto create mode 100644 proto/GetDailyDungeonEntryInfoReq.proto create mode 100644 proto/GetDailyDungeonEntryInfoRsp.proto create mode 100644 proto/GetFurnitureCurModuleArrangeCountReq.proto create mode 100644 proto/GetPlayerHomeCompInfoReq.proto create mode 100644 proto/GroupUnloadNotify.proto create mode 100644 proto/HEMFKLPNNOM.proto create mode 100644 proto/HitTreeNotify.proto create mode 100644 proto/HomeAnimalData.proto create mode 100644 proto/HomeBasicInfo.proto create mode 100644 proto/HomeBasicInfoNotify.proto create mode 100644 proto/HomeBlockArrangementInfo.proto create mode 100644 proto/HomeBlockDotPattern.proto create mode 100644 proto/HomeBlockFieldData.proto create mode 100644 proto/HomeBlockNotify.proto create mode 100644 proto/HomeBlockSubFieldData.proto create mode 100644 proto/HomeChangeEditModeReq.proto create mode 100644 proto/HomeChangeEditModeRsp.proto create mode 100644 proto/HomeFurnitureData.proto create mode 100644 proto/HomeFurnitureSuiteData.proto create mode 100644 proto/HomeGetArrangementInfoReq.proto create mode 100644 proto/HomeGetArrangementInfoRsp.proto create mode 100644 proto/HomeGetBasicInfoReq.proto create mode 100644 proto/HomeLimitedShopInfo.proto create mode 100644 proto/HomeMarkPointFurnitureData.proto create mode 100644 proto/HomeMarkPointNPCData.proto create mode 100644 proto/HomeMarkPointNotify.proto create mode 100644 proto/HomeMarkPointSceneData.proto create mode 100644 proto/HomeMarkPointSuiteData.proto create mode 100644 proto/HomeNpcData.proto create mode 100644 proto/HomeSceneArrangementInfo.proto create mode 100644 proto/HomeSceneInitFinishReq.proto create mode 100644 proto/HomeSceneInitFinishRsp.proto create mode 100644 proto/HomeSceneJumpReq.proto create mode 100644 proto/HomeSceneJumpRsp.proto create mode 100644 proto/HomeUnknown1Notify.proto create mode 100644 proto/HomeUpdateArrangementInfoReq.proto create mode 100644 proto/HomeUpdateArrangementInfoRsp.proto create mode 100644 proto/JDPMOMKAPIF.proto create mode 100644 proto/JMPCGMBHJLG.proto create mode 100644 proto/JOEPIGNPDGH.proto create mode 100644 proto/KJDPNIKDKEJ.proto create mode 100644 proto/LockedPersonallineData.proto create mode 100644 proto/MLMEFKLMOEF.proto create mode 100644 proto/MusicBeatmap.proto create mode 100644 proto/MusicBeatmapList.proto create mode 100644 proto/MusicBeatmapNote.proto create mode 100644 proto/MusicBriefInfo.proto create mode 100644 proto/MusicGameActivityDetailInfo.proto create mode 100644 proto/MusicGameCreateBeatmapReq.proto create mode 100644 proto/MusicGameCreateBeatmapRsp.proto create mode 100644 proto/MusicGameGetBeatmapReq.proto create mode 100644 proto/MusicGameGetBeatmapReqType.proto create mode 100644 proto/MusicGameGetBeatmapRsp.proto create mode 100644 proto/MusicGameRecord.proto create mode 100644 proto/MusicGameSearchBeatmapReq.proto create mode 100644 proto/MusicGameSearchBeatmapRsp.proto create mode 100644 proto/MusicGameSettleReq.proto create mode 100644 proto/MusicGameSettleRsp.proto create mode 100644 proto/MusicGameStartReq.proto create mode 100644 proto/MusicGameStartRsp.proto create mode 100644 proto/MusicGameStartToPlayOthersBeatmapReq.proto create mode 100644 proto/MusicGameStartToPlayOthersBeatmapRsp.proto create mode 100644 proto/MusicGameUnknown1Enum.proto create mode 100644 proto/MusicGameUnknown2Enum.proto create mode 100644 proto/PersonalLineAllDataReq.proto create mode 100644 proto/PersonalLineAllDataRsp.proto create mode 100644 proto/PlayerCookArgsReq.proto create mode 100644 proto/PlayerCookArgsRsp.proto create mode 100644 proto/PlayerCookReq.proto create mode 100644 proto/PlayerCookRsp.proto create mode 100644 proto/PlayerLuaShellNotify.proto create mode 100644 proto/PlayerWorldSceneInfo.proto create mode 100644 proto/QueryFilter.proto create mode 100644 proto/QueryPathReq.proto create mode 100644 proto/QueryPathRsp.proto create mode 100644 proto/ReliquaryDecomposeReq.proto create mode 100644 proto/ReliquaryDecomposeRsp.proto create mode 100644 proto/RoguelikeDungeonSettleInfo.proto create mode 100644 proto/RoguelikeSettleCoinInfo.proto create mode 100644 proto/ServerAnnounceNotify.proto create mode 100644 proto/ServerAnnounceRevokeNotify.proto create mode 100644 proto/SetBattlePassViewedReq.proto create mode 100644 proto/SetBattlePassViewedRsp.proto create mode 100644 proto/TakeBattlePassMissionPointReq.proto create mode 100644 proto/TakeBattlePassMissionPointRsp.proto create mode 100644 proto/TakeBattlePassRewardReq.proto create mode 100644 proto/TakeBattlePassRewardRsp.proto create mode 100644 proto/TakeFurnitureMakeReq.proto create mode 100644 proto/TakeFurnitureMakeRsp.proto create mode 100644 proto/TrialAvatarFirstPassDungeonNotify.proto create mode 100644 proto/UnlockPersonalLineReq.proto create mode 100644 proto/UnlockPersonalLineRsp.proto create mode 100644 proto/UnlockedFurnitureFormulaDataNotify.proto create mode 100644 proto/UnlockedFurnitureSuiteDataNotify.proto create mode 100644 proto/Vector3Int.proto create mode 100644 proto/WindSeedClientNotify.proto diff --git a/PacketOpcodes.java b/PacketOpcodes.java index a4c5905b..41c10fcf 100644 --- a/PacketOpcodes.java +++ b/PacketOpcodes.java @@ -1,1561 +1,1541 @@ package emu.grasscutter.net.packet; -import java.util.Arrays; import java.util.HashSet; -import java.util.List; public class PacketOpcodes { // Empty public static final int NONE = 0; // Opcodes - public static final int AbilityChangeNotify = 1179; - public static final int AbilityInvocationFailNotify = 1137; - public static final int AbilityInvocationFixedNotify = 1160; - public static final int AbilityInvocationsNotify = 1133; - public static final int AcceptCityReputationRequestReq = 2845; - public static final int AcceptCityReputationRequestRsp = 2875; - public static final int AchievementAllDataNotify = 2685; - public static final int AchievementUpdateNotify = 2675; - public static final int ActivityCoinInfoNotify = 2080; - public static final int ActivityCondStateChangeNotify = 2102; - public static final int ActivityDisableTransferPointInteractionNotify = 8295; - public static final int ActivityInfoNotify = 2074; - public static final int ActivityPlayOpenAnimNotify = 2187; - public static final int ActivitySaleChangeNotify = 2166; - public static final int ActivityScheduleInfoNotify = 2180; - public static final int ActivitySelectAvatarCardReq = 2056; - public static final int ActivitySelectAvatarCardRsp = 2174; - public static final int ActivityTakeAllScoreRewardReq = 8708; - public static final int ActivityTakeAllScoreRewardRsp = 8836; - public static final int ActivityTakeScoreRewardReq = 8767; - public static final int ActivityTakeScoreRewardRsp = 8445; - public static final int ActivityTakeWatcherRewardBatchReq = 2042; - public static final int ActivityTakeWatcherRewardBatchRsp = 2013; - public static final int ActivityTakeWatcherRewardReq = 2101; - public static final int ActivityTakeWatcherRewardRsp = 2153; - public static final int ActivityUpdateWatcherNotify = 2069; - public static final int AddBlacklistReq = 4067; + public static final int AbilityChangeNotify = 1155; + public static final int AbilityInvocationFailNotify = 1132; + public static final int AbilityInvocationFixedNotify = 1109; + public static final int AbilityInvocationsNotify = 1131; + public static final int AcceptCityReputationRequestReq = 2835; + public static final int AcceptCityReputationRequestRsp = 2849; + public static final int AchievementAllDataNotify = 2668; + public static final int AchievementUpdateNotify = 2659; + public static final int ActivityCoinInfoNotify = 2094; + public static final int ActivityCondStateChangeNotify = 2120; + public static final int ActivityDisableTransferPointInteractionNotify = 8686; + public static final int ActivityInfoNotify = 2125; + public static final int ActivityPlayOpenAnimNotify = 2146; + public static final int ActivitySaleChangeNotify = 2109; + public static final int ActivityScheduleInfoNotify = 2033; + public static final int ActivitySelectAvatarCardReq = 2030; + public static final int ActivitySelectAvatarCardRsp = 2127; + public static final int ActivityTakeAllScoreRewardReq = 8424; + public static final int ActivityTakeAllScoreRewardRsp = 8692; + public static final int ActivityTakeScoreRewardReq = 8321; + public static final int ActivityTakeScoreRewardRsp = 8218; + public static final int ActivityTakeWatcherRewardBatchReq = 2079; + public static final int ActivityTakeWatcherRewardBatchRsp = 2150; + public static final int ActivityTakeWatcherRewardReq = 2090; + public static final int ActivityTakeWatcherRewardRsp = 2025; + public static final int ActivityUpdateWatcherNotify = 2172; + public static final int AddBlacklistReq = 4050; public static final int AddBlacklistRsp = 4020; - public static final int AddFriendNotify = 4026; - public static final int AddNoGachaAvatarCardNotify = 1740; - public static final int AddQuestContentProgressReq = 493; - public static final int AddQuestContentProgressRsp = 444; - public static final int AddRandTaskInfoNotify = 147; - public static final int AddSeenMonsterNotify = 242; - public static final int AdjustWorldLevelReq = 104; - public static final int AdjustWorldLevelRsp = 106; - public static final int AllCoopInfoNotify = 1985; - public static final int AllMarkPointNotify = 3462; - public static final int AllSeenMonsterNotify = 276; - public static final int AllWidgetDataNotify = 4284; - public static final int AnchorPointDataNotify = 4285; - public static final int AnchorPointOpReq = 4298; - public static final int AnchorPointOpRsp = 4263; - public static final int AnimatorForceSetAirMoveNotify = 308; - public static final int AntiAddictNotify = 177; - public static final int ArenaChallengeFinishNotify = 2027; - public static final int AskAddFriendNotify = 4062; - public static final int AskAddFriendReq = 4037; - public static final int AskAddFriendRsp = 4093; - public static final int AsterLargeInfoNotify = 2073; - public static final int AsterLittleInfoNotify = 2098; - public static final int AsterMidCampInfoNotify = 2001; - public static final int AsterMidInfoNotify = 2051; - public static final int AsterMiscInfoNotify = 2041; - public static final int AsterProgressInfoNotify = 2151; - public static final int AvatarAddNotify = 1759; - public static final int AvatarBuffAddNotify = 367; + public static final int AddFriendNotify = 4024; + public static final int AddNoGachaAvatarCardNotify = 1648; + public static final int AddQuestContentProgressReq = 417; + public static final int AddQuestContentProgressRsp = 485; + public static final int AddRandTaskInfoNotify = 116; + public static final int AddSeenMonsterNotify = 251; + public static final int AdjustWorldLevelReq = 195; + public static final int AdjustWorldLevelRsp = 115; + public static final int AllCoopInfoNotify = 1968; + public static final int AllMarkPointNotify = 3195; + public static final int AllSeenMonsterNotify = 226; + public static final int AllWidgetDataNotify = 4273; + public static final int AnchorPointDataNotify = 4268; + public static final int AnchorPointOpReq = 4254; + public static final int AnchorPointOpRsp = 4278; + public static final int AnimatorForceSetAirMoveNotify = 346; + public static final int AntiAddictNotify = 148; + public static final int ArenaChallengeFinishNotify = 2082; + public static final int AskAddFriendNotify = 4038; + public static final int AskAddFriendReq = 4032; + public static final int AskAddFriendRsp = 4017; + public static final int AsterLargeInfoNotify = 2192; + public static final int AsterLittleInfoNotify = 2188; + public static final int AsterMidCampInfoNotify = 2020; + public static final int AsterMidInfoNotify = 2121; + public static final int AsterMiscInfoNotify = 2187; + public static final int AsterProgressInfoNotify = 2193; + public static final int AvatarAddNotify = 1757; + public static final int AvatarBuffAddNotify = 350; public static final int AvatarBuffDelNotify = 320; - public static final int AvatarCardChangeReq = 667; + public static final int AvatarCardChangeReq = 650; public static final int AvatarCardChangeRsp = 620; - public static final int AvatarChangeAnimHashReq = 1630; - public static final int AvatarChangeAnimHashRsp = 1747; - public static final int AvatarChangeCostumeNotify = 1748; - public static final int AvatarChangeCostumeReq = 1650; - public static final int AvatarChangeCostumeRsp = 1632; - public static final int AvatarChangeElementTypeReq = 1741; - public static final int AvatarChangeElementTypeRsp = 1626; - public static final int AvatarDataNotify = 1757; - public static final int AvatarDelNotify = 1624; - public static final int AvatarDieAnimationEndReq = 1635; - public static final int AvatarDieAnimationEndRsp = 1638; - public static final int AvatarEnterElementViewNotify = 366; - public static final int AvatarEquipAffixStartNotify = 1734; - public static final int AvatarEquipChangeNotify = 674; - public static final int AvatarExpeditionAllDataReq = 1721; - public static final int AvatarExpeditionAllDataRsp = 1800; - public static final int AvatarExpeditionCallBackReq = 1607; - public static final int AvatarExpeditionCallBackRsp = 1783; - public static final int AvatarExpeditionDataNotify = 1777; - public static final int AvatarExpeditionGetRewardReq = 1604; - public static final int AvatarExpeditionGetRewardRsp = 1731; - public static final int AvatarExpeditionStartReq = 1788; - public static final int AvatarExpeditionStartRsp = 1786; - public static final int AvatarFetterDataNotify = 1718; - public static final int AvatarFetterLevelRewardReq = 1717; - public static final int AvatarFetterLevelRewardRsp = 1690; - public static final int AvatarFightPropNotify = 1237; - public static final int AvatarFightPropUpdateNotify = 1293; - public static final int AvatarFlycloakChangeNotify = 1761; - public static final int AvatarFollowRouteNotify = 3210; - public static final int AvatarGainCostumeNotify = 1778; - public static final int AvatarGainFlycloakNotify = 1676; - public static final int AvatarLifeStateChangeNotify = 1245; - public static final int AvatarPromoteGetRewardReq = 1784; - public static final int AvatarPromoteGetRewardRsp = 1776; - public static final int AvatarPromoteReq = 1661; - public static final int AvatarPromoteRsp = 1712; - public static final int AvatarPropChangeReasonNotify = 1275; - public static final int AvatarPropNotify = 1279; - public static final int AvatarSatiationDataNotify = 1639; - public static final int AvatarSkillChangeNotify = 1088; - public static final int AvatarSkillDepotChangeNotify = 1015; - public static final int AvatarSkillInfoNotify = 1045; - public static final int AvatarSkillMaxChargeCountNotify = 1044; - public static final int AvatarSkillUpgradeReq = 1091; - public static final int AvatarSkillUpgradeRsp = 1097; - public static final int AvatarTeamUpdateNotify = 1649; - public static final int AvatarUnlockTalentNotify = 1010; - public static final int AvatarUpgradeReq = 1660; - public static final int AvatarUpgradeRsp = 1735; - public static final int AvatarWearFlycloakReq = 1677; - public static final int AvatarWearFlycloakRsp = 1782; - public static final int BackMyWorldReq = 219; - public static final int BackMyWorldRsp = 269; - public static final int BargainOfferPriceReq = 409; - public static final int BargainOfferPriceRsp = 465; - public static final int BargainStartNotify = 489; - public static final int BargainTerminateNotify = 403; - public static final int BattlePassAllDataNotify = 2635; - public static final int BattlePassBuySuccNotify = 2612; - public static final int BattlePassCurScheduleUpdateNotify = 2648; - public static final int BattlePassMissionDelNotify = 2645; - public static final int BattlePassMissionUpdateNotify = 2625; - public static final int BeginCameraSceneLookNotify = 261; - public static final int BigTalentPointConvertReq = 1037; - public static final int BigTalentPointConvertRsp = 1093; - public static final int BlessingAcceptAllGivePicReq = 2032; - public static final int BlessingAcceptAllGivePicRsp = 2148; - public static final int BlessingAcceptGivePicReq = 2090; - public static final int BlessingAcceptGivePicRsp = 2140; - public static final int BlessingGetAllRecvPicRecordListReq = 2184; - public static final int BlessingGetAllRecvPicRecordListRsp = 2176; - public static final int BlessingGetFriendPicListReq = 2161; - public static final int BlessingGetFriendPicListRsp = 2076; - public static final int BlessingGiveFriendPicReq = 2134; - public static final int BlessingGiveFriendPicRsp = 2117; - public static final int BlessingRecvFriendPicNotify = 2050; - public static final int BlessingRedeemRewardReq = 2077; - public static final int BlessingRedeemRewardRsp = 2182; - public static final int BlessingScanReq = 2172; - public static final int BlessingScanRsp = 2039; - public static final int BlitzRushParkourRestartReq = 8212; - public static final int BlitzRushParkourRestartRsp = 8962; - public static final int BlossomBriefInfoNotify = 2710; - public static final int BlossomChestCreateNotify = 2793; - public static final int BlossomChestInfoNotify = 845; - public static final int BonusActivityInfoReq = 2597; - public static final int BonusActivityInfoRsp = 2588; - public static final int BonusActivityUpdateNotify = 2591; - public static final int BossChestActivateNotify = 844; - public static final int BounceConjuringSettleNotify = 8339; - public static final int BuoyantCombatSettleNotify = 9000; - public static final int BuyBattlePassLevelReq = 2639; - public static final int BuyBattlePassLevelRsp = 2621; - public static final int BuyGoodsReq = 710; - public static final int BuyGoodsRsp = 715; - public static final int BuyResinReq = 630; - public static final int BuyResinRsp = 647; - public static final int CalcWeaponUpgradeReturnItemsReq = 643; - public static final int CalcWeaponUpgradeReturnItemsRsp = 686; - public static final int CancelCityReputationRequestReq = 2834; - public static final int CancelCityReputationRequestRsp = 2879; - public static final int CancelCoopTaskReq = 1989; - public static final int CancelCoopTaskRsp = 1971; - public static final int CancelFinishParentQuestNotify = 492; - public static final int CanUseSkillNotify = 1055; - public static final int CardProductRewardNotify = 4148; - public static final int ChallengeDataNotify = 983; - public static final int ChallengeRecordNotify = 909; - public static final int ChangeAvatarReq = 1743; - public static final int ChangeAvatarRsp = 1672; - public static final int ChangeGameTimeReq = 175; - public static final int ChangeGameTimeRsp = 134; - public static final int ChangeMailStarNotify = 1497; - public static final int ChangeMpTeamAvatarReq = 1794; - public static final int ChangeMpTeamAvatarRsp = 1629; - public static final int ChangeServerGlobalValueNotify = 65; - public static final int ChangeTeamNameReq = 1793; - public static final int ChangeTeamNameRsp = 1707; - public static final int ChangeWorldToSingleModeNotify = 3293; - public static final int ChangeWorldToSingleModeReq = 3174; - public static final int ChangeWorldToSingleModeRsp = 3308; - public static final int ChannelerSlabStageActiveChallengeIndexNotify = 8578; - public static final int ChannelerSlabStageOneoffDungeonNotify = 8137; - public static final int ChannellerSlabCheckEnterLoopDungeonReq = 8684; - public static final int ChannellerSlabCheckEnterLoopDungeonRsp = 8376; - public static final int ChannellerSlabEnterLoopDungeonReq = 8090; - public static final int ChannellerSlabEnterLoopDungeonRsp = 8120; - public static final int ChannellerSlabLoopDungeonChallengeInfoNotify = 8263; - public static final int ChannellerSlabLoopDungeonSelectConditionReq = 8741; - public static final int ChannellerSlabLoopDungeonSelectConditionRsp = 8341; - public static final int ChannellerSlabLoopDungeonTakeFirstPassRewardReq = 8914; - public static final int ChannellerSlabLoopDungeonTakeFirstPassRewardRsp = 8503; - public static final int ChannellerSlabLoopDungeonTakeScoreRewardReq = 8012; - public static final int ChannellerSlabLoopDungeonTakeScoreRewardRsp = 8123; - public static final int ChannellerSlabOneOffDungeonInfoNotify = 8795; - public static final int ChannellerSlabOneOffDungeonInfoReq = 8772; - public static final int ChannellerSlabOneOffDungeonInfoRsp = 8715; - public static final int ChannellerSlabSaveAssistInfoReq = 8518; - public static final int ChannellerSlabSaveAssistInfoRsp = 8773; - public static final int ChannellerSlabTakeoffBuffReq = 8407; - public static final int ChannellerSlabTakeoffBuffRsp = 8260; - public static final int ChannellerSlabWearBuffReq = 8850; - public static final int ChannellerSlabWearBuffRsp = 8203; - public static final int ChapterStateNotify = 455; - public static final int ChatChannelDataNotify = 5047; - public static final int ChatChannelUpdateNotify = 5041; - public static final int ChatHistoryNotify = 3265; - public static final int CheckAddItemExceedLimitNotify = 639; - public static final int CheckSegmentCRCNotify = 56; - public static final int CheckSegmentCRCReq = 83; - public static final int ChessEscapedMonstersNotify = 5394; - public static final int ChessLeftMonstersNotify = 5378; - public static final int ChessManualRefreshCardsReq = 5325; - public static final int ChessManualRefreshCardsRsp = 5349; - public static final int ChessPickCardNotify = 5377; - public static final int ChessPickCardReq = 5343; - public static final int ChessPickCardRsp = 5386; - public static final int ChessPlayerInfoNotify = 5385; - public static final int ChessSelectedCardsNotify = 5339; - public static final int ChooseCurAvatarTeamReq = 1713; - public static final int ChooseCurAvatarTeamRsp = 1608; - public static final int CityReputationDataNotify = 2855; - public static final int CityReputationLevelupNotify = 2837; - public static final int ClearRoguelikeCurseNotify = 8997; - public static final int ClientAbilitiesInitFinishCombineNotify = 1144; - public static final int ClientAbilityChangeNotify = 1191; - public static final int ClientAbilityInitBeginNotify = 1110; - public static final int ClientAbilityInitFinishNotify = 1115; - public static final int ClientAIStateNotify = 1128; - public static final int ClientBulletCreateNotify = 89; - public static final int ClientCollectorDataNotify = 4262; - public static final int ClientHashDebugNotify = 3163; - public static final int ClientLoadingCostumeVerificationNotify = 3133; - public static final int ClientLockGameTimeNotify = 194; - public static final int ClientNewMailNotify = 1434; - public static final int ClientPauseNotify = 278; - public static final int ClientReconnectNotify = 91; - public static final int ClientReportNotify = 28; - public static final int ClientScriptEventNotify = 218; - public static final int ClientTransmitReq = 252; - public static final int ClientTransmitRsp = 292; - public static final int ClientTriggerEventNotify = 197; - public static final int CloseCommonTipsNotify = 3187; - public static final int ClosedItemNotify = 694; - public static final int CodexDataFullNotify = 4204; - public static final int CodexDataUpdateNotify = 4205; - public static final int CombatInvocationsNotify = 347; - public static final int CombineDataNotify = 649; - public static final int CombineFormulaDataNotify = 685; - public static final int CombineReq = 663; - public static final int CombineRsp = 608; - public static final int CommonPlayerTipsNotify = 8928; - public static final int CompoundDataNotify = 181; - public static final int CompoundUnlockNotify = 199; - public static final int CookDataNotify = 164; - public static final int CookGradeDataNotify = 166; + public static final int AvatarChangeAnimHashReq = 1798; + public static final int AvatarChangeAnimHashRsp = 1622; + public static final int AvatarChangeCostumeNotify = 1780; + public static final int AvatarChangeCostumeReq = 1734; + public static final int AvatarChangeCostumeRsp = 1723; + public static final int AvatarChangeElementTypeReq = 1706; + public static final int AvatarChangeElementTypeRsp = 1708; + public static final int AvatarDataNotify = 1695; + public static final int AvatarDelNotify = 1608; + public static final int AvatarDieAnimationEndReq = 1616; + public static final int AvatarDieAnimationEndRsp = 1765; + public static final int AvatarEnterElementViewNotify = 311; + public static final int AvatarEquipAffixStartNotify = 1609; + public static final int AvatarEquipChangeNotify = 690; + public static final int AvatarExpeditionAllDataReq = 1659; + public static final int AvatarExpeditionAllDataRsp = 1636; + public static final int AvatarExpeditionCallBackReq = 1655; + public static final int AvatarExpeditionCallBackRsp = 1642; + public static final int AvatarExpeditionDataNotify = 1698; + public static final int AvatarExpeditionGetRewardReq = 1603; + public static final int AvatarExpeditionGetRewardRsp = 1646; + public static final int AvatarExpeditionStartReq = 1675; + public static final int AvatarExpeditionStartRsp = 1688; + public static final int AvatarFetterDataNotify = 1777; + public static final int AvatarFetterLevelRewardReq = 1704; + public static final int AvatarFetterLevelRewardRsp = 1606; + public static final int AvatarFightPropNotify = 1232; + public static final int AvatarFightPropUpdateNotify = 1217; + public static final int AvatarFlycloakChangeNotify = 1681; + public static final int AvatarFollowRouteNotify = 3353; + public static final int AvatarGainCostumeNotify = 1670; + public static final int AvatarGainFlycloakNotify = 1615; + public static final int AvatarLifeStateChangeNotify = 1235; + public static final int AvatarPromoteGetRewardReq = 1676; + public static final int AvatarPromoteGetRewardRsp = 1613; + public static final int AvatarPromoteReq = 1711; + public static final int AvatarPromoteRsp = 1668; + public static final int AvatarPropChangeReasonNotify = 1249; + public static final int AvatarPropNotify = 1255; + public static final int AvatarSatiationDataNotify = 1632; + public static final int AvatarSkillChangeNotify = 1030; + public static final int AvatarSkillDepotChangeNotify = 1037; + public static final int AvatarSkillInfoNotify = 1035; + public static final int AvatarSkillMaxChargeCountNotify = 1085; + public static final int AvatarSkillUpgradeReq = 1027; + public static final int AvatarSkillUpgradeRsp = 1007; + public static final int AvatarTeamUpdateNotify = 1713; + public static final int AvatarUnlockTalentNotify = 1041; + public static final int AvatarUpgradeReq = 1680; + public static final int AvatarUpgradeRsp = 1779; + public static final int AvatarWearFlycloakReq = 1728; + public static final int AvatarWearFlycloakRsp = 1770; + public static final int BackMyWorldReq = 221; + public static final int BackMyWorldRsp = 223; + public static final int BargainOfferPriceReq = 419; + public static final int BargainOfferPriceRsp = 412; + public static final int BargainStartNotify = 406; + public static final int BargainTerminateNotify = 458; + public static final int BattlePassAllDataNotify = 2618; + public static final int BattlePassBuySuccNotify = 2614; + public static final int BattlePassCurScheduleUpdateNotify = 2604; + public static final int BattlePassMissionDelNotify = 2643; + public static final int BattlePassMissionUpdateNotify = 2609; + public static final int BeginCameraSceneLookNotify = 203; + public static final int BigTalentPointConvertReq = 1032; + public static final int BigTalentPointConvertRsp = 1017; + public static final int BlessingAcceptAllGivePicReq = 2123; + public static final int BlessingAcceptAllGivePicRsp = 2180; + public static final int BlessingAcceptGivePicReq = 2006; + public static final int BlessingAcceptGivePicRsp = 2048; + public static final int BlessingGetAllRecvPicRecordListReq = 2076; + public static final int BlessingGetAllRecvPicRecordListRsp = 2013; + public static final int BlessingGetFriendPicListReq = 2081; + public static final int BlessingGetFriendPicListRsp = 2015; + public static final int BlessingGiveFriendPicReq = 2009; + public static final int BlessingGiveFriendPicRsp = 2104; + public static final int BlessingRecvFriendPicNotify = 2134; + public static final int BlessingRedeemRewardReq = 2128; + public static final int BlessingRedeemRewardRsp = 2170; + public static final int BlessingScanReq = 2012; + public static final int BlessingScanRsp = 2032; + public static final int BlitzRushParkourRestartReq = 8355; + public static final int BlitzRushParkourRestartRsp = 8943; + public static final int BlossomBriefInfoNotify = 2741; + public static final int BlossomChestCreateNotify = 2717; + public static final int BlossomChestInfoNotify = 835; + public static final int BonusActivityInfoReq = 2507; + public static final int BonusActivityInfoRsp = 2530; + public static final int BonusActivityUpdateNotify = 2527; + public static final int BossChestActivateNotify = 885; + public static final int BounceConjuringSettleNotify = 8313; + public static final int BuoyantCombatSettleNotify = 8347; + public static final int BuyBattlePassLevelReq = 2612; + public static final int BuyBattlePassLevelRsp = 2646; + public static final int BuyGoodsReq = 741; + public static final int BuyGoodsRsp = 737; + public static final int BuyResinReq = 602; + public static final int BuyResinRsp = 616; + public static final int CalcWeaponUpgradeReturnItemsReq = 610; + public static final int CalcWeaponUpgradeReturnItemsRsp = 666; + public static final int CancelCityReputationRequestReq = 2882; + public static final int CancelCityReputationRequestRsp = 2855; + public static final int CancelCoopTaskReq = 1962; + public static final int CancelCoopTaskRsp = 1996; + public static final int CancelFinishParentQuestNotify = 459; + public static final int CanUseSkillNotify = 1098; + public static final int CardProductRewardNotify = 4104; + public static final int ChallengeDataNotify = 963; + public static final int ChallengeRecordNotify = 919; + public static final int ChangeAvatarReq = 1662; + public static final int ChangeAvatarRsp = 1710; + public static final int ChangeGameTimeReq = 149; + public static final int ChangeGameTimeRsp = 182; + public static final int ChangeMailStarNotify = 1407; + public static final int ChangeMpTeamAvatarReq = 1689; + public static final int ChangeMpTeamAvatarRsp = 1617; + public static final int ChangeServerGlobalValueNotify = 12; + public static final int ChangeTeamNameReq = 1762; + public static final int ChangeTeamNameRsp = 1789; + public static final int ChangeWorldToSingleModeNotify = 3260; + public static final int ChangeWorldToSingleModeReq = 3140; + public static final int ChangeWorldToSingleModeRsp = 3083; + public static final int ChannelerSlabStageActiveChallengeIndexNotify = 8864; + public static final int ChannelerSlabStageOneoffDungeonNotify = 8522; + public static final int ChannellerSlabCheckEnterLoopDungeonReq = 8304; + public static final int ChannellerSlabCheckEnterLoopDungeonRsp = 8928; + public static final int ChannellerSlabEnterLoopDungeonReq = 8687; + public static final int ChannellerSlabEnterLoopDungeonRsp = 8639; + public static final int ChannellerSlabLoopDungeonChallengeInfoNotify = 8555; + public static final int ChannellerSlabLoopDungeonSelectConditionReq = 8383; + public static final int ChannellerSlabLoopDungeonSelectConditionRsp = 8979; + public static final int ChannellerSlabLoopDungeonTakeFirstPassRewardReq = 8910; + public static final int ChannellerSlabLoopDungeonTakeFirstPassRewardRsp = 8482; + public static final int ChannellerSlabLoopDungeonTakeScoreRewardReq = 8305; + public static final int ChannellerSlabLoopDungeonTakeScoreRewardRsp = 8552; + public static final int ChannellerSlabOneOffDungeonInfoNotify = 8008; + public static final int ChannellerSlabOneOffDungeonInfoReq = 8295; + public static final int ChannellerSlabOneOffDungeonInfoRsp = 8716; + public static final int ChannellerSlabSaveAssistInfoReq = 8860; + public static final int ChannellerSlabSaveAssistInfoRsp = 8320; + public static final int ChannellerSlabTakeoffBuffReq = 8577; + public static final int ChannellerSlabTakeoffBuffRsp = 8689; + public static final int ChannellerSlabWearBuffReq = 8132; + public static final int ChannellerSlabWearBuffRsp = 8315; + public static final int ChapterStateNotify = 498; + public static final int ChatChannelDataNotify = 4957; + public static final int ChatChannelUpdateNotify = 4977; + public static final int ChatHistoryNotify = 3213; + public static final int CheckAddItemExceedLimitNotify = 653; + public static final int CheckSegmentCRCNotify = 86; + public static final int CheckSegmentCRCReq = 63; + public static final int ChessEscapedMonstersNotify = 5374; + public static final int ChessLeftMonstersNotify = 5391; + public static final int ChessManualRefreshCardsReq = 5373; + public static final int ChessManualRefreshCardsRsp = 5361; + public static final int ChessPickCardNotify = 5348; + public static final int ChessPickCardReq = 5310; + public static final int ChessPickCardRsp = 5366; + public static final int ChessPlayerInfoNotify = 5388; + public static final int ChessSelectedCardsNotify = 5353; + public static final int ChooseCurAvatarTeamReq = 1800; + public static final int ChooseCurAvatarTeamRsp = 1673; + public static final int CityReputationDataNotify = 2898; + public static final int CityReputationLevelupNotify = 2832; + public static final int ClearRoguelikeCurseNotify = 8291; + public static final int ClientAbilitiesInitFinishCombineNotify = 1185; + public static final int ClientAbilityChangeNotify = 1127; + public static final int ClientAbilityInitBeginNotify = 1141; + public static final int ClientAbilityInitFinishNotify = 1137; + public static final int ClientAIStateNotify = 1197; + public static final int ClientBulletCreateNotify = 6; + public static final int ClientCollectorDataNotify = 4264; + public static final int ClientHashDebugNotify = 3192; + public static final int ClientLoadingCostumeVerificationNotify = 3488; + public static final int ClientLockGameTimeNotify = 174; + public static final int ClientNewMailNotify = 1482; + public static final int ClientPauseNotify = 291; + public static final int ClientReconnectNotify = 27; + public static final int ClientReportNotify = 97; + public static final int ClientScriptEventNotify = 214; + public static final int ClientTransmitReq = 272; + public static final int ClientTransmitRsp = 259; + public static final int ClientTriggerEventNotify = 107; + public static final int CloseCommonTipsNotify = 3496; + public static final int ClosedItemNotify = 674; + public static final int CodexDataFullNotify = 4201; + public static final int CodexDataUpdateNotify = 4210; + public static final int CombatInvocationsNotify = 316; + public static final int CombineDataNotify = 661; + public static final int CombineFormulaDataNotify = 688; + public static final int CombineReq = 654; + public static final int CombineRsp = 646; + public static final int CommonPlayerTipsNotify = 8490; + public static final int CompoundDataNotify = 136; + public static final int CompoundUnlockNotify = 181; + public static final int CookDataNotify = 142; + public static final int CookGradeDataNotify = 111; public static final int CookRecipeDataNotify = 101; - public static final int CoopCgShowNotify = 1983; - public static final int CoopCgUpdateNotify = 1993; - public static final int CoopChapterUpdateNotify = 1986; - public static final int CoopDataNotify = 1967; + public static final int CoopCgShowNotify = 1989; + public static final int CoopCgUpdateNotify = 1966; + public static final int CoopChapterUpdateNotify = 1997; + public static final int CoopDataNotify = 1976; public static final int CoopPointUpdateNotify = 1987; - public static final int CoopProgressUpdateNotify = 2000; - public static final int CoopRewardUpdateNotify = 1976; - public static final int CreateMassiveEntityNotify = 336; - public static final int CreateMassiveEntityReq = 323; - public static final int CreateMassiveEntityRsp = 313; - public static final int CreateVehicleReq = 809; - public static final int CreateVehicleRsp = 865; - public static final int CutSceneBeginNotify = 241; - public static final int CutSceneEndNotify = 214; - public static final int CutSceneFinishNotify = 248; - public static final int DailyTaskDataNotify = 124; - public static final int DailyTaskFilterCityReq = 159; - public static final int DailyTaskFilterCityRsp = 150; - public static final int DailyTaskProgressNotify = 161; - public static final int DailyTaskScoreRewardNotify = 138; - public static final int DailyTaskUnlockedCitiesNotify = 119; - public static final int DataResVersionNotify = 136; - public static final int DealAddFriendReq = 4044; - public static final int DealAddFriendRsp = 4045; + public static final int CoopProgressUpdateNotify = 1961; + public static final int CoopRewardUpdateNotify = 1951; + public static final int CreateMassiveEntityNotify = 325; + public static final int CreateMassiveEntityReq = 370; + public static final int CreateMassiveEntityRsp = 329; + public static final int CreateVehicleReq = 819; + public static final int CreateVehicleRsp = 812; + public static final int CutSceneBeginNotify = 300; + public static final int CutSceneEndNotify = 299; + public static final int CutSceneFinishNotify = 294; + public static final int DailyTaskDataNotify = 183; + public static final int DailyTaskFilterCityReq = 192; + public static final int DailyTaskFilterCityRsp = 118; + public static final int DailyTaskProgressNotify = 103; + public static final int DailyTaskScoreRewardNotify = 134; + public static final int DailyTaskUnlockedCitiesNotify = 121; + public static final int DataResVersionNotify = 125; + public static final int DealAddFriendReq = 4085; + public static final int DealAddFriendRsp = 4035; public static final int DebugNotify = 101; - public static final int DeleteFriendNotify = 4083; - public static final int DeleteFriendReq = 4079; - public static final int DeleteFriendRsp = 4091; - public static final int DelMailReq = 1493; - public static final int DelMailRsp = 1444; - public static final int DelScenePlayTeamEntityNotify = 3117; - public static final int DelTeamEntityNotify = 330; - public static final int DestroyMassiveEntityNotify = 324; - public static final int DestroyMaterialReq = 670; - public static final int DestroyMaterialRsp = 654; - public static final int DigActivityChangeGadgetStateReq = 8283; - public static final int DigActivityChangeGadgetStateRsp = 8609; - public static final int DigActivityMarkPointChangeNotify = 8143; - public static final int DisableRoguelikeTrapNotify = 8029; - public static final int DoGachaReq = 1510; - public static final int DoGachaRsp = 1515; - public static final int DoRoguelikeDungeonCardGachaReq = 8897; - public static final int DoRoguelikeDungeonCardGachaRsp = 8973; - public static final int DoSetPlayerBornDataNotify = 174; - public static final int DraftGuestReplyInviteNotify = 5445; - public static final int DraftGuestReplyInviteReq = 5493; - public static final int DraftGuestReplyInviteRsp = 5444; - public static final int DraftGuestReplyTwiceConfirmNotify = 5488; - public static final int DraftGuestReplyTwiceConfirmReq = 5479; - public static final int DraftGuestReplyTwiceConfirmRsp = 5491; - public static final int DraftInviteResultNotify = 5475; - public static final int DraftOwnerInviteNotify = 5437; - public static final int DraftOwnerStartInviteReq = 5410; - public static final int DraftOwnerStartInviteRsp = 5415; - public static final int DraftOwnerTwiceConfirmNotify = 5434; - public static final int DraftTwiceConfirmResultNotify = 5497; - public static final int DragonSpineChapterFinishNotify = 2043; - public static final int DragonSpineChapterOpenNotify = 2196; - public static final int DragonSpineChapterProgressChangeNotify = 2189; - public static final int DragonSpineCoinChangeNotify = 2123; - public static final int DropHintNotify = 673; - public static final int DropItemReq = 634; - public static final int DropItemRsp = 679; - public static final int DropSubfieldReq = 232; - public static final int DropSubfieldRsp = 251; - public static final int DungeonCandidateTeamChangeAvatarReq = 958; - public static final int DungeonCandidateTeamChangeAvatarRsp = 923; - public static final int DungeonCandidateTeamCreateReq = 964; + public static final int DeleteFriendNotify = 4063; + public static final int DeleteFriendReq = 4055; + public static final int DeleteFriendRsp = 4027; + public static final int DelMailReq = 1417; + public static final int DelMailRsp = 1485; + public static final int DelScenePlayTeamEntityNotify = 3087; + public static final int DelTeamEntityNotify = 302; + public static final int DestroyMassiveEntityNotify = 383; + public static final int DestroyMaterialReq = 678; + public static final int DestroyMaterialRsp = 608; + public static final int DigActivityChangeGadgetStateReq = 8155; + public static final int DigActivityChangeGadgetStateRsp = 8851; + public static final int DigActivityMarkPointChangeNotify = 8679; + public static final int DisableRoguelikeTrapNotify = 8250; + public static final int DoGachaReq = 1541; + public static final int DoGachaRsp = 1537; + public static final int DoRoguelikeDungeonCardGachaReq = 8764; + public static final int DoRoguelikeDungeonCardGachaRsp = 8641; + public static final int DoSetPlayerBornDataNotify = 190; + public static final int DraftGuestReplyInviteNotify = 5435; + public static final int DraftGuestReplyInviteReq = 5417; + public static final int DraftGuestReplyInviteRsp = 5485; + public static final int DraftGuestReplyTwiceConfirmNotify = 5430; + public static final int DraftGuestReplyTwiceConfirmReq = 5455; + public static final int DraftGuestReplyTwiceConfirmRsp = 5427; + public static final int DraftInviteResultNotify = 5449; + public static final int DraftOwnerInviteNotify = 5432; + public static final int DraftOwnerStartInviteReq = 5441; + public static final int DraftOwnerStartInviteRsp = 5437; + public static final int DraftOwnerTwiceConfirmNotify = 5482; + public static final int DraftTwiceConfirmResultNotify = 5407; + public static final int DragonSpineChapterFinishNotify = 2135; + public static final int DragonSpineChapterOpenNotify = 2119; + public static final int DragonSpineChapterProgressChangeNotify = 2102; + public static final int DragonSpineCoinChangeNotify = 2031; + public static final int DropHintNotify = 622; + public static final int DropItemReq = 682; + public static final int DropItemRsp = 655; + public static final int DungeonCandidateTeamChangeAvatarReq = 984; + public static final int DungeonCandidateTeamChangeAvatarRsp = 970; + public static final int DungeonCandidateTeamCreateReq = 942; public static final int DungeonCandidateTeamCreateRsp = 901; - public static final int DungeonCandidateTeamDismissNotify = 980; - public static final int DungeonCandidateTeamInfoNotify = 965; - public static final int DungeonCandidateTeamInviteNotify = 903; - public static final int DungeonCandidateTeamInviteReq = 966; - public static final int DungeonCandidateTeamInviteRsp = 973; - public static final int DungeonCandidateTeamKickReq = 963; - public static final int DungeonCandidateTeamKickRsp = 908; - public static final int DungeonCandidateTeamLeaveReq = 917; - public static final int DungeonCandidateTeamLeaveRsp = 981; + public static final int DungeonCandidateTeamDismissNotify = 913; + public static final int DungeonCandidateTeamInfoNotify = 912; + public static final int DungeonCandidateTeamInviteNotify = 958; + public static final int DungeonCandidateTeamInviteReq = 911; + public static final int DungeonCandidateTeamInviteRsp = 922; + public static final int DungeonCandidateTeamKickReq = 954; + public static final int DungeonCandidateTeamKickRsp = 946; + public static final int DungeonCandidateTeamLeaveReq = 933; + public static final int DungeonCandidateTeamLeaveRsp = 936; public static final int DungeonCandidateTeamPlayerLeaveNotify = 920; - public static final int DungeonCandidateTeamRefuseNotify = 967; - public static final int DungeonCandidateTeamReplyInviteReq = 927; - public static final int DungeonCandidateTeamReplyInviteRsp = 902; - public static final int DungeonCandidateTeamSetChangingAvatarReq = 954; - public static final int DungeonCandidateTeamSetChangingAvatarRsp = 935; - public static final int DungeonCandidateTeamSetReadyReq = 952; - public static final int DungeonCandidateTeamSetReadyRsp = 992; - public static final int DungeonChallengeBeginNotify = 974; - public static final int DungeonChallengeFinishNotify = 956; - public static final int DungeonDataNotify = 946; - public static final int DungeonDieOptionReq = 991; - public static final int DungeonDieOptionRsp = 997; - public static final int DungeonEntryInfoReq = 960; - public static final int DungeonEntryInfoRsp = 933; - public static final int DungeonEntryToBeExploreNotify = 3067; - public static final int DungeonFollowNotify = 926; - public static final int DungeonGetStatueDropReq = 962; - public static final int DungeonGetStatueDropRsp = 989; - public static final int DungeonInterruptChallengeReq = 938; - public static final int DungeonInterruptChallengeRsp = 930; - public static final int DungeonPlayerDieNotify = 979; - public static final int DungeonPlayerDieReq = 928; - public static final int DungeonPlayerDieRsp = 955; - public static final int DungeonRestartInviteNotify = 984; - public static final int DungeonRestartInviteReplyNotify = 972; - public static final int DungeonRestartInviteReplyReq = 912; - public static final int DungeonRestartInviteReplyRsp = 953; - public static final int DungeonRestartReq = 932; - public static final int DungeonRestartResultNotify = 970; - public static final int DungeonRestartRsp = 951; - public static final int DungeonReviseLevelNotify = 957; - public static final int DungeonSettleNotify = 934; - public static final int DungeonShowReminderNotify = 988; - public static final int DungeonSlipRevivePointActivateReq = 924; - public static final int DungeonSlipRevivePointActivateRsp = 961; - public static final int DungeonWayPointActivateReq = 945; - public static final int DungeonWayPointActivateRsp = 975; - public static final int DungeonWayPointNotify = 944; - public static final int EchoNotify = 62; - public static final int EchoShellTakeRewardReq = 8801; - public static final int EchoShellTakeRewardRsp = 8888; - public static final int EchoShellUpdateNotify = 8730; - public static final int EffigyChallengeInfoNotify = 2071; - public static final int EffigyChallengeResultNotify = 2034; - public static final int EndCameraSceneLookNotify = 238; - public static final int EnterChessDungeonReq = 8336; - public static final int EnterChessDungeonRsp = 8581; - public static final int EnterFishingReq = 5835; - public static final int EnterFishingRsp = 5825; - public static final int EnterMechanicusDungeonReq = 3979; - public static final int EnterMechanicusDungeonRsp = 3991; - public static final int EnterRoguelikeDungeonNotify = 8330; - public static final int EnterSceneDoneReq = 268; - public static final int EnterSceneDoneRsp = 290; - public static final int EnterScenePeerNotify = 282; - public static final int EnterSceneReadyReq = 298; - public static final int EnterSceneReadyRsp = 296; - public static final int EnterSceneWeatherAreaNotify = 258; - public static final int EnterTransPointRegionNotify = 255; - public static final int EnterTrialAvatarActivityDungeonReq = 2020; - public static final int EnterTrialAvatarActivityDungeonRsp = 2087; - public static final int EnterWorldAreaReq = 273; - public static final int EnterWorldAreaRsp = 263; - public static final int EntityAiKillSelfNotify = 370; - public static final int EntityAiSyncNotify = 312; - public static final int EntityAuthorityChangeNotify = 303; - public static final int EntityConfigHashNotify = 3458; - public static final int EntityFightPropChangeReasonNotify = 1244; - public static final int EntityFightPropNotify = 1210; - public static final int EntityFightPropUpdateNotify = 1215; - public static final int EntityForceSyncReq = 208; - public static final int EntityForceSyncRsp = 217; - public static final int EntityJumpNotify = 226; - public static final int EntityMoveRoomNotify = 3135; - public static final int EntityPropNotify = 1260; - public static final int EntityTagChangeNotify = 3262; - public static final int EquipRoguelikeRuneReq = 8579; - public static final int EquipRoguelikeRuneRsp = 8412; - public static final int EvtAiSyncCombatThreatInfoNotify = 351; - public static final int EvtAiSyncSkillCdNotify = 317; - public static final int EvtAnimatorParameterNotify = 333; - public static final int EvtAnimatorStateChangedNotify = 379; - public static final int EvtAvatarEnterFocusNotify = 389; - public static final int EvtAvatarExitFocusNotify = 309; - public static final int EvtAvatarLockChairReq = 354; - public static final int EvtAvatarLockChairRsp = 335; - public static final int EvtAvatarSitDownNotify = 392; - public static final int EvtAvatarStandUpNotify = 358; - public static final int EvtAvatarUpdateFocusNotify = 365; - public static final int EvtBeingHitNotify = 360; - public static final int EvtBeingHitsCombineNotify = 381; - public static final int EvtBulletDeactiveNotify = 388; - public static final int EvtBulletHitNotify = 397; - public static final int EvtBulletMoveNotify = 362; - public static final int EvtCostStaminaNotify = 375; - public static final int EvtCreateGadgetNotify = 337; - public static final int EvtDestroyGadgetNotify = 393; - public static final int EvtDestroyServerGadgetNotify = 372; - public static final int EvtDoSkillSuccNotify = 315; - public static final int EvtEntityRenderersChangedNotify = 363; - public static final int EvtEntityStartDieEndNotify = 328; - public static final int EvtFaceToDirNotify = 345; - public static final int EvtFaceToEntityNotify = 344; - public static final int EvtRushMoveNotify = 391; - public static final int EvtSetAttackTargetNotify = 334; - public static final int ExclusiveRuleNotify = 169; - public static final int ExecuteGadgetLuaReq = 231; - public static final int ExecuteGadgetLuaRsp = 240; - public static final int ExecuteGroupTriggerReq = 284; - public static final int ExecuteGroupTriggerRsp = 212; - public static final int ExitFishingReq = 5812; - public static final int ExitFishingRsp = 5839; - public static final int ExitSceneWeatherAreaNotify = 223; - public static final int ExitTransPointRegionNotify = 246; - public static final int ExpeditionChallengeEnterRegionNotify = 2192; - public static final int ExpeditionChallengeFinishedNotify = 2015; - public static final int ExpeditionRecallReq = 2053; - public static final int ExpeditionRecallRsp = 2181; - public static final int ExpeditionStartReq = 2114; - public static final int ExpeditionStartRsp = 2108; - public static final int ExpeditionTakeRewardReq = 2124; - public static final int ExpeditionTakeRewardRsp = 2168; - public static final int FindHilichurlAcceptQuestNotify = 8292; - public static final int FindHilichurlFinishSecondQuestNotify = 8799; - public static final int FinishDeliveryNotify = 2003; - public static final int FinishedParentQuestNotify = 415; - public static final int FinishedParentQuestUpdateNotify = 437; - public static final int FinishMainCoopReq = 1963; - public static final int FinishMainCoopRsp = 1951; - public static final int FishAttractNotify = 5821; - public static final int FishBaitGoneNotify = 5846; - public static final int FishBattleBeginReq = 5815; - public static final int FishBattleBeginRsp = 5827; + public static final int DungeonCandidateTeamRefuseNotify = 950; + public static final int DungeonCandidateTeamReplyInviteReq = 928; + public static final int DungeonCandidateTeamReplyInviteRsp = 976; + public static final int DungeonCandidateTeamSetChangingAvatarReq = 908; + public static final int DungeonCandidateTeamSetChangingAvatarRsp = 904; + public static final int DungeonCandidateTeamSetReadyReq = 972; + public static final int DungeonCandidateTeamSetReadyRsp = 959; + public static final int DungeonChallengeBeginNotify = 990; + public static final int DungeonChallengeFinishNotify = 986; + public static final int DungeonDataNotify = 945; + public static final int DungeonDieOptionReq = 927; + public static final int DungeonDieOptionRsp = 907; + public static final int DungeonEntryInfoReq = 909; + public static final int DungeonEntryInfoRsp = 931; + public static final int DungeonEntryToBeExploreNotify = 3414; + public static final int DungeonFollowNotify = 924; + public static final int DungeonGetStatueDropReq = 938; + public static final int DungeonGetStatueDropRsp = 906; + public static final int DungeonInterruptChallengeReq = 934; + public static final int DungeonInterruptChallengeRsp = 902; + public static final int DungeonPlayerDieNotify = 955; + public static final int DungeonPlayerDieReq = 997; + public static final int DungeonPlayerDieRsp = 998; + public static final int DungeonRestartInviteNotify = 977; + public static final int DungeonRestartInviteReplyNotify = 989; + public static final int DungeonRestartInviteReplyReq = 943; + public static final int DungeonRestartInviteReplyRsp = 987; + public static final int DungeonRestartReq = 993; + public static final int DungeonRestartResultNotify = 978; + public static final int DungeonRestartRsp = 960; + public static final int DungeonReviseLevelNotify = 905; + public static final int DungeonSettleNotify = 982; + public static final int DungeonShowReminderNotify = 930; + public static final int DungeonSlipRevivePointActivateReq = 983; + public static final int DungeonSlipRevivePointActivateRsp = 903; + public static final int DungeonWayPointActivateReq = 935; + public static final int DungeonWayPointActivateRsp = 949; + public static final int DungeonWayPointNotify = 985; + public static final int EchoNotify = 38; + public static final int EchoShellTakeRewardReq = 8074; + public static final int EchoShellTakeRewardRsp = 8446; + public static final int EchoShellUpdateNotify = 8077; + public static final int EffigyChallengeInfoNotify = 2153; + public static final int EffigyChallengeResultNotify = 2064; + public static final int EndCameraSceneLookNotify = 234; + public static final int EnterChessDungeonReq = 8571; + public static final int EnterChessDungeonRsp = 8819; + public static final int EnterFishingReq = 5818; + public static final int EnterFishingRsp = 5809; + public static final int EnterMechanicusDungeonReq = 3955; + public static final int EnterMechanicusDungeonRsp = 3927; + public static final int EnterRoguelikeDungeonNotify = 8646; + public static final int EnterSceneDoneReq = 279; + public static final int EnterSceneDoneRsp = 269; + public static final int EnterScenePeerNotify = 257; + public static final int EnterSceneReadyReq = 244; + public static final int EnterSceneReadyRsp = 252; + public static final int EnterSceneWeatherAreaNotify = 284; + public static final int EnterTransPointRegionNotify = 298; + public static final int EnterTrialAvatarActivityDungeonReq = 2057; + public static final int EnterTrialAvatarActivityDungeonRsp = 2021; + public static final int EnterWorldAreaReq = 222; + public static final int EnterWorldAreaRsp = 254; + public static final int EntityAiKillSelfNotify = 378; + public static final int EntityAiSyncNotify = 343; + public static final int EntityAuthorityChangeNotify = 358; + public static final int EntityConfigHashNotify = 3271; + public static final int EntityFightPropChangeReasonNotify = 1285; + public static final int EntityFightPropNotify = 1241; + public static final int EntityFightPropUpdateNotify = 1237; + public static final int EntityForceSyncReq = 246; + public static final int EntityForceSyncRsp = 233; + public static final int EntityJumpNotify = 224; + public static final int EntityMoveRoomNotify = 3209; + public static final int EntityPropNotify = 1209; + public static final int EntityTagChangeNotify = 3273; + public static final int EquipRoguelikeRuneReq = 8510; + public static final int EquipRoguelikeRuneRsp = 8516; + public static final int EvtAiSyncCombatThreatInfoNotify = 360; + public static final int EvtAiSyncSkillCdNotify = 333; + public static final int EvtAnimatorParameterNotify = 331; + public static final int EvtAnimatorStateChangedNotify = 355; + public static final int EvtAvatarEnterFocusNotify = 306; + public static final int EvtAvatarExitFocusNotify = 319; + public static final int EvtAvatarLockChairReq = 308; + public static final int EvtAvatarLockChairRsp = 304; + public static final int EvtAvatarSitDownNotify = 359; + public static final int EvtAvatarStandUpNotify = 384; + public static final int EvtAvatarUpdateFocusNotify = 312; + public static final int EvtBeingHitNotify = 309; + public static final int EvtBeingHitsCombineNotify = 336; + public static final int EvtBulletDeactiveNotify = 330; + public static final int EvtBulletHitNotify = 307; + public static final int EvtBulletMoveNotify = 338; + public static final int EvtCostStaminaNotify = 349; + public static final int EvtCreateGadgetNotify = 332; + public static final int EvtDestroyGadgetNotify = 317; + public static final int EvtDestroyServerGadgetNotify = 389; + public static final int EvtDoSkillSuccNotify = 337; + public static final int EvtEntityRenderersChangedNotify = 354; + public static final int EvtEntityStartDieEndNotify = 397; + public static final int EvtFaceToDirNotify = 335; + public static final int EvtFaceToEntityNotify = 385; + public static final int EvtRushMoveNotify = 327; + public static final int EvtSetAttackTargetNotify = 382; + public static final int ExclusiveRuleNotify = 123; + public static final int ExecuteGadgetLuaReq = 267; + public static final int ExecuteGadgetLuaRsp = 271; + public static final int ExecuteGroupTriggerReq = 277; + public static final int ExecuteGroupTriggerRsp = 243; + public static final int ExitFishingReq = 5814; + public static final int ExitFishingRsp = 5812; + public static final int ExitSceneWeatherAreaNotify = 270; + public static final int ExitTransPointRegionNotify = 245; + public static final int ExpeditionChallengeEnterRegionNotify = 2050; + public static final int ExpeditionChallengeFinishedNotify = 2034; + public static final int ExpeditionRecallReq = 2122; + public static final int ExpeditionRecallRsp = 2156; + public static final int ExpeditionStartReq = 2026; + public static final int ExpeditionStartRsp = 2163; + public static final int ExpeditionTakeRewardReq = 2173; + public static final int ExpeditionTakeRewardRsp = 2196; + public static final int FindHilichurlAcceptQuestNotify = 8465; + public static final int FindHilichurlFinishSecondQuestNotify = 8981; + public static final int FinishDeliveryNotify = 2158; + public static final int FinishedParentQuestNotify = 437; + public static final int FinishedParentQuestUpdateNotify = 432; + public static final int FinishMainCoopReq = 1978; + public static final int FinishMainCoopRsp = 1953; + public static final int FireworkReq = 6068; + public static final int FireworkNotify = 6079; + public static final int FireworkRsp = 5918; + public static final int FireworkSetReq = 6099; + public static final int FireworkSetNotify = 5934; + public static final int FireworkSetRsp = 5969; + public static final int FishAttractNotify = 5846; + public static final int FishBaitGoneNotify = 5827; + public static final int FishBattleBeginReq = 5802; + public static final int FishBattleBeginRsp = 5813; public static final int FishBattleEndReq = 5837; - public static final int FishBattleEndRsp = 5806; - public static final int FishBiteReq = 5843; - public static final int FishBiteRsp = 5826; - public static final int FishCastRodReq = 5813; - public static final int FishCastRodRsp = 5801; - public static final int FishChosenNotify = 5817; - public static final int FishEscapeNotify = 5836; - public static final int FishingGallerySettleNotify = 8870; - public static final int FishPoolDataNotify = 5850; - public static final int FleurFairBalloonSettleNotify = 2064; - public static final int FleurFairBuffEnergyNotify = 5392; - public static final int FleurFairFallSettleNotify = 2040; - public static final int FleurFairFinishGalleryStageNotify = 5323; - public static final int FleurFairMusicGameSettleReq = 2105; - public static final int FleurFairMusicGameSettleRsp = 2179; - public static final int FleurFairMusicGameStartReq = 2146; - public static final int FleurFairMusicGameStartRsp = 2089; - public static final int FleurFairReplayMiniGameReq = 2022; - public static final int FleurFairReplayMiniGameRsp = 2033; - public static final int FleurFairStageSettleNotify = 5358; - public static final int FlightActivityRestartReq = 2115; - public static final int FlightActivityRestartRsp = 2070; - public static final int FlightActivitySettleNotify = 2045; - public static final int FocusAvatarReq = 1710; - public static final int FocusAvatarRsp = 1772; - public static final int ForceAddPlayerFriendReq = 4084; - public static final int ForceAddPlayerFriendRsp = 4012; - public static final int ForceDragAvatarNotify = 3056; - public static final int ForceDragBackTransferNotify = 3171; - public static final int ForgeDataNotify = 677; - public static final int ForgeFormulaDataNotify = 625; - public static final int ForgeGetQueueDataReq = 681; - public static final int ForgeGetQueueDataRsp = 627; - public static final int ForgeQueueDataNotify = 617; - public static final int ForgeQueueManipulateReq = 692; - public static final int ForgeQueueManipulateRsp = 658; - public static final int ForgeStartReq = 602; - public static final int ForgeStartRsp = 652; - public static final int FoundationNotify = 874; - public static final int FoundationReq = 855; - public static final int FoundationRsp = 846; - public static final int FriendInfoChangeNotify = 4085; - public static final int FunitureMakeMakeInfoChangeNotify = 4523; - public static final int FurnitureCurModuleArrangeCountNotify = 4770; - public static final int FurnitureMakeBeHelpedNotify = 4825; - public static final int FurnitureMakeCancelReq = 4495; - public static final int FurnitureMakeCancelRsp = 4814; - public static final int FurnitureMakeFinishNotify = 4707; - public static final int FurnitureMakeHelpReq = 4779; - public static final int FurnitureMakeHelpRsp = 4455; - public static final int FurnitureMakeReq = 4885; - public static final int FurnitureMakeRsp = 4819; - public static final int FurnitureMakeStartReq = 4518; - public static final int FurnitureMakeStartRsp = 4521; - public static final int GachaOpenWishNotify = 1544; - public static final int GachaSimpleInfoNotify = 1545; - public static final int GachaWishReq = 1537; - public static final int GachaWishRsp = 1593; - public static final int GadgetAutoPickDropInfoNotify = 888; - public static final int GadgetChainLevelChangeNotify = 826; - public static final int GadgetChainLevelUpdateNotify = 883; - public static final int GadgetCustomTreeInfoNotify = 873; - public static final int GadgetGeneralRewardInfoNotify = 897; - public static final int GadgetInteractReq = 860; - public static final int GadgetInteractRsp = 833; - public static final int GadgetPlayDataNotify = 879; - public static final int GadgetPlayStartNotify = 875; - public static final int GadgetPlayStopNotify = 834; - public static final int GadgetPlayUidOpNotify = 891; - public static final int GadgetStateNotify = 810; - public static final int GadgetTalkChangeNotify = 856; - public static final int GalleryBalloonScoreNotify = 5510; - public static final int GalleryBalloonShootNotify = 5533; - public static final int GalleryBounceConjuringHitNotify = 5555; - public static final int GalleryBrokenFloorFallNotify = 5591; - public static final int GalleryBulletHitNotify = 5579; - public static final int GalleryFallCatchNotify = 5537; - public static final int GalleryFallScoreNotify = 5593; - public static final int GalleryFlowerCatchNotify = 5575; - public static final int GalleryPreStartNotify = 5534; - public static final int GalleryStartNotify = 5560; - public static final int GalleryStopNotify = 5515; - public static final int GallerySumoKillMonsterNotify = 5546; - public static final int GetActivityInfoReq = 2164; - public static final int GetActivityInfoRsp = 2023; - public static final int GetActivityScheduleReq = 2011; - public static final int GetActivityScheduleRsp = 2170; - public static final int GetActivityShopSheetInfoReq = 744; - public static final int GetActivityShopSheetInfoRsp = 745; - public static final int GetAllActivatedBargainDataReq = 480; - public static final int GetAllActivatedBargainDataRsp = 464; - public static final int GetAllH5ActivityInfoReq = 5675; - public static final int GetAllH5ActivityInfoRsp = 5685; - public static final int GetAllMailReq = 1479; - public static final int GetAllMailRsp = 1491; - public static final int GetAllSceneGalleryInfoReq = 5544; - public static final int GetAllSceneGalleryInfoRsp = 5545; - public static final int GetAllUnlockNameCardReq = 4065; - public static final int GetAllUnlockNameCardRsp = 4003; - public static final int GetAreaExplorePointReq = 227; - public static final int GetAreaExplorePointRsp = 202; - public static final int GetAuthkeyReq = 1445; - public static final int GetAuthkeyRsp = 1475; - public static final int GetAuthSalesmanInfoReq = 2031; - public static final int GetAuthSalesmanInfoRsp = 2175; - public static final int GetBargainDataReq = 467; + public static final int FishBattleEndRsp = 5832; + public static final int FishBiteReq = 5816; + public static final int FishBiteRsp = 5801; + public static final int FishCastRodReq = 5828; + public static final int FishCastRodRsp = 5803; + public static final int FishChosenNotify = 5826; + public static final int FishEscapeNotify = 5847; + public static final int FishingGallerySettleNotify = 8896; + public static final int FishPoolDataNotify = 5811; + public static final int FleurFairBalloonSettleNotify = 2139; + public static final int FleurFairBuffEnergyNotify = 5359; + public static final int FleurFairFallSettleNotify = 2097; + public static final int FleurFairFinishGalleryStageNotify = 5370; + public static final int FleurFairMusicGameSettleReq = 2115; + public static final int FleurFairMusicGameSettleRsp = 2124; + public static final int FleurFairMusicGameStartReq = 2171; + public static final int FleurFairMusicGameStartRsp = 2149; + public static final int FleurFairReplayMiniGameReq = 2152; + public static final int FleurFairReplayMiniGameRsp = 2101; + public static final int FleurFairStageSettleNotify = 5384; + public static final int FlightActivityRestartReq = 2164; + public static final int FlightActivityRestartRsp = 2002; + public static final int FlightActivitySettleNotify = 2084; + public static final int FocusAvatarReq = 1652; + public static final int FocusAvatarRsp = 1612; + public static final int ForceAddPlayerFriendReq = 4077; + public static final int ForceAddPlayerFriendRsp = 4043; + public static final int ForceDragAvatarNotify = 3425; + public static final int ForceDragBackTransferNotify = 3088; + public static final int ForgeDataNotify = 648; + public static final int ForgeFormulaDataNotify = 673; + public static final int ForgeGetQueueDataReq = 636; + public static final int ForgeGetQueueDataRsp = 628; + public static final int ForgeQueueDataNotify = 633; + public static final int ForgeQueueManipulateReq = 659; + public static final int ForgeQueueManipulateRsp = 684; + public static final int ForgeStartReq = 676; + public static final int ForgeStartRsp = 672; + public static final int FoundationNotify = 890; + public static final int FoundationReq = 898; + public static final int FoundationRsp = 845; + public static final int FriendInfoChangeNotify = 4088; + public static final int FunitureMakeMakeInfoChangeNotify = 4488; + public static final int FurnitureCurModuleArrangeCountNotify = 4681; + public static final int FurnitureMakeBeHelpedNotify = 4626; + public static final int FurnitureMakeCancelReq = 4834; + public static final int FurnitureMakeCancelRsp = 4660; + public static final int FurnitureMakeFinishNotify = 4557; + public static final int FurnitureMakeHelpReq = 4580; + public static final int FurnitureMakeHelpRsp = 4722; + public static final int FurnitureMakeReq = 4551; + public static final int FurnitureMakeRsp = 4530; + public static final int FurnitureMakeStartReq = 4582; + public static final int FurnitureMakeStartRsp = 4463; + public static final int GachaOpenWishNotify = 1585; + public static final int GachaSimpleInfoNotify = 1535; + public static final int GachaWishReq = 1532; + public static final int GachaWishRsp = 1517; + public static final int GadgetAutoPickDropInfoNotify = 830; + public static final int GadgetChainLevelChangeNotify = 824; + public static final int GadgetChainLevelUpdateNotify = 863; + public static final int GadgetCustomTreeInfoNotify = 822; + public static final int GadgetGeneralRewardInfoNotify = 807; + public static final int GadgetInteractReq = 809; + public static final int GadgetInteractRsp = 831; + public static final int GadgetPlayDataNotify = 855; + public static final int GadgetPlayStartNotify = 849; + public static final int GadgetPlayStopNotify = 882; + public static final int GadgetPlayUidOpNotify = 827; + public static final int GadgetStateNotify = 841; + public static final int GadgetTalkChangeNotify = 886; + public static final int GalleryBalloonScoreNotify = 5541; + public static final int GalleryBalloonShootNotify = 5531; + public static final int GalleryBounceConjuringHitNotify = 5598; + public static final int GalleryBrokenFloorFallNotify = 5527; + public static final int GalleryBulletHitNotify = 5555; + public static final int GalleryFallCatchNotify = 5532; + public static final int GalleryFallScoreNotify = 5517; + public static final int GalleryFlowerCatchNotify = 5549; + public static final int GalleryPreStartNotify = 5582; + public static final int GalleryStartNotify = 5509; + public static final int GalleryStopNotify = 5537; + public static final int GallerySumoKillMonsterNotify = 5545; + public static final int GetActivityInfoReq = 2067; + public static final int GetActivityInfoRsp = 2144; + public static final int GetActivityScheduleReq = 2049; + public static final int GetActivityScheduleRsp = 2044; + public static final int GetActivityShopSheetInfoReq = 785; + public static final int GetActivityShopSheetInfoRsp = 735; + public static final int GetAllActivatedBargainDataReq = 413; + public static final int GetAllActivatedBargainDataRsp = 442; + public static final int GetAllH5ActivityInfoReq = 5659; + public static final int GetAllH5ActivityInfoRsp = 5668; + public static final int GetAllMailReq = 1455; + public static final int GetAllMailRsp = 1427; + public static final int GetAllSceneGalleryInfoReq = 5585; + public static final int GetAllSceneGalleryInfoRsp = 5535; + public static final int GetAllUnlockNameCardReq = 4012; + public static final int GetAllUnlockNameCardRsp = 4058; + public static final int GetAreaExplorePointReq = 228; + public static final int GetAreaExplorePointRsp = 276; + public static final int GetAuthkeyReq = 1435; + public static final int GetAuthkeyRsp = 1449; + public static final int GetAuthSalesmanInfoReq = 2161; + public static final int GetAuthSalesmanInfoRsp = 2039; + public static final int GetBargainDataReq = 450; public static final int GetBargainDataRsp = 420; - public static final int GetBattlePassProductReq = 2643; - public static final int GetBattlePassProductRsp = 2626; - public static final int GetBlossomBriefInfoListReq = 2760; - public static final int GetBlossomBriefInfoListRsp = 2733; - public static final int GetBonusActivityRewardReq = 2528; - public static final int GetBonusActivityRewardRsp = 2555; - public static final int GetChatEmojiCollectionReq = 4057; - public static final int GetChatEmojiCollectionRsp = 4043; - public static final int GetCityHuntingOfferReq = 4345; - public static final int GetCityHuntingOfferRsp = 4348; - public static final int GetCityReputationInfoReq = 2860; - public static final int GetCityReputationInfoRsp = 2833; - public static final int GetCityReputationMapInfoReq = 2891; - public static final int GetCityReputationMapInfoRsp = 2897; - public static final int GetCompoundDataReq = 127; - public static final int GetCompoundDataRsp = 102; - public static final int GetDailyDungeonEntryInfoReq = 913; - public static final int GetDailyDungeonEntryInfoRsp = 936; - public static final int GetDungeonEntryExploreConditionReq = 3208; - public static final int GetDungeonEntryExploreConditionRsp = 3391; - public static final int GetExpeditionAssistInfoListReq = 2017; - public static final int GetExpeditionAssistInfoListRsp = 2099; - public static final int GetFriendShowAvatarInfoReq = 4061; - public static final int GetFriendShowAvatarInfoRsp = 4038; - public static final int GetFriendShowNameCardInfoReq = 4032; - public static final int GetFriendShowNameCardInfoRsp = 4051; - public static final int GetFurnitureCurModuleArrangeCountReq = 4618; - public static final int GetGachaInfoReq = 1560; - public static final int GetGachaInfoRsp = 1533; - public static final int GetHomeLevelUpRewardReq = 4508; - public static final int GetHomeLevelUpRewardRsp = 4864; - public static final int GetHuntingOfferRewardReq = 4313; - public static final int GetHuntingOfferRewardRsp = 4301; - public static final int GetInvestigationMonsterReq = 1928; - public static final int GetInvestigationMonsterRsp = 1921; - public static final int GetMailItemReq = 1415; - public static final int GetMailItemRsp = 1437; - public static final int GetMapAreaReq = 3269; - public static final int GetMapAreaRsp = 3366; - public static final int GetMapMarkTipsReq = 3307; - public static final int GetMapMarkTipsRsp = 3040; - public static final int GetMechanicusInfoReq = 3960; - public static final int GetMechanicusInfoRsp = 3933; - public static final int GetNextResourceInfoReq = 139; - public static final int GetNextResourceInfoRsp = 187; - public static final int GetOnlinePlayerInfoReq = 46; - public static final int GetOnlinePlayerInfoRsp = 74; - public static final int GetOnlinePlayerListReq = 45; - public static final int GetOnlinePlayerListRsp = 75; - public static final int GetOpActivityInfoReq = 5160; - public static final int GetOpActivityInfoRsp = 5133; - public static final int GetPlayerAskFriendListReq = 4054; - public static final int GetPlayerAskFriendListRsp = 4035; - public static final int GetPlayerBlacklistReq = 4002; - public static final int GetPlayerBlacklistRsp = 4052; - public static final int GetPlayerFriendListReq = 4060; - public static final int GetPlayerFriendListRsp = 4033; - public static final int GetPlayerHomeCompInfoReq = 4540; - public static final int GetPlayerMpModeAvailabilityReq = 1843; - public static final int GetPlayerMpModeAvailabilityRsp = 1826; - public static final int GetPlayerSocialDetailReq = 4075; - public static final int GetPlayerSocialDetailRsp = 4034; - public static final int GetPlayerTokenReq = 160; - public static final int GetPlayerTokenRsp = 133; - public static final int GetPushTipsRewardReq = 2265; - public static final int GetPushTipsRewardRsp = 2203; - public static final int GetQuestTalkHistoryReq = 445; - public static final int GetQuestTalkHistoryRsp = 475; - public static final int GetRecentMpPlayerListReq = 4066; - public static final int GetRecentMpPlayerListRsp = 4073; - public static final int GetRegionSearchReq = 5613; - public static final int GetReunionMissionInfoReq = 5093; - public static final int GetReunionMissionInfoRsp = 5076; - public static final int GetReunionPrivilegeInfoReq = 5089; - public static final int GetReunionPrivilegeInfoRsp = 5071; - public static final int GetReunionSignInInfoReq = 5063; - public static final int GetReunionSignInInfoRsp = 5051; - public static final int GetSceneAreaReq = 262; - public static final int GetSceneAreaRsp = 289; - public static final int GetSceneNpcPositionReq = 515; - public static final int GetSceneNpcPositionRsp = 537; - public static final int GetScenePerformanceReq = 3217; - public static final int GetScenePerformanceRsp = 3319; - public static final int GetScenePointReq = 288; - public static final int GetScenePointRsp = 228; - public static final int GetShopmallDataReq = 737; - public static final int GetShopmallDataRsp = 793; - public static final int GetShopReq = 760; - public static final int GetShopRsp = 733; - public static final int GetSignInRewardReq = 2537; - public static final int GetSignInRewardRsp = 2593; - public static final int GetWidgetSlotReq = 4258; - public static final int GetWidgetSlotRsp = 4294; - public static final int GetWorldMpInfoReq = 3439; - public static final int GetWorldMpInfoRsp = 3424; - public static final int GiveUpRoguelikeDungeonCardReq = 8425; - public static final int GiveUpRoguelikeDungeonCardRsp = 8976; - public static final int GivingRecordChangeNotify = 172; - public static final int GivingRecordNotify = 153; - public static final int GMShowNavMeshReq = 2384; - public static final int GMShowNavMeshRsp = 2312; - public static final int GMShowObstacleReq = 2332; - public static final int GMShowObstacleRsp = 2351; - public static final int GmTalkNotify = 3; - public static final int GmTalkReq = 33; - public static final int GmTalkRsp = 10; - public static final int GrantRewardNotify = 680; - public static final int GroupLinkAllNotify = 5785; - public static final int GroupLinkChangeNotify = 5775; - public static final int GroupLinkDeleteNotify = 5795; - public static final int GroupSuiteNotify = 3368; - public static final int GroupUnloadNotify = 3019; - public static final int GuestBeginEnterSceneNotify = 3033; - public static final int GuestPostEnterSceneNotify = 3198; - public static final int H5ActivityIdsNotify = 5695; - public static final int HideAndSeekPlayerReadyNotify = 5330; - public static final int HideAndSeekPlayerSetAvatarNotify = 5347; - public static final int HideAndSeekSelectAvatarReq = 5313; - public static final int HideAndSeekSelectAvatarRsp = 5336; - public static final int HideAndSeekSelectSkillReq = 8689; - public static final int HideAndSeekSelectSkillRsp = 8948; - public static final int HideAndSeekSetReadyReq = 5324; - public static final int HideAndSeekSetReadyRsp = 5361; - public static final int HideAndSeekSettleNotify = 5338; - public static final int HitClientTrivialNotify = 250; - public static final int HitTreeNotify = 3432; - public static final int HomeAvatarAllFinishRewardNotify = 4612; - public static final int HomeAvatarCostumeChangeNotify = 4888; - public static final int HomeAvatarRewardEventGetReq = 4568; - public static final int HomeAvatarRewardEventGetRsp = 4453; - public static final int HomeAvatarRewardEventNotify = 4801; - public static final int HomeAvatarSummonAllEventNotify = 4575; - public static final int HomeAvatarSummonEventReq = 4871; - public static final int HomeAvatarSummonEventRsp = 4895; - public static final int HomeAvatarSummonFinishReq = 4654; - public static final int HomeAvatarSummonFinishRsp = 4503; - public static final int HomeAvatarTalkFinishInfoNotify = 4800; - public static final int HomeAvatarTalkReq = 4610; - public static final int HomeAvatarTalkRsp = 4507; - public static final int HomeAvtarAllFinishRewardNotify = 4546; - public static final int HomeBasicInfoNotify = 4869; - public static final int HomeBlockNotify = 4784; - public static final int HomeChangeEditModeReq = 4483; - public static final int HomeChangeEditModeRsp = 4880; - public static final int HomeChangeModuleReq = 4604; - public static final int HomeChangeModuleRsp = 4631; - public static final int HomeChooseModuleReq = 4567; - public static final int HomeChooseModuleRsp = 4633; + public static final int GetBattlePassProductReq = 2616; + public static final int GetBattlePassProductRsp = 2601; + public static final int GetBlossomBriefInfoListReq = 2709; + public static final int GetBlossomBriefInfoListRsp = 2731; + public static final int GetBonusActivityRewardReq = 2597; + public static final int GetBonusActivityRewardRsp = 2598; + public static final int GetChatEmojiCollectionReq = 4005; + public static final int GetChatEmojiCollectionRsp = 4010; + public static final int GetCityHuntingOfferReq = 4343; + public static final int GetCityHuntingOfferRsp = 4304; + public static final int GetCityReputationInfoReq = 2809; + public static final int GetCityReputationInfoRsp = 2831; + public static final int GetCityReputationMapInfoReq = 2827; + public static final int GetCityReputationMapInfoRsp = 2807; + public static final int GetCompoundDataReq = 128; + public static final int GetCompoundDataRsp = 176; + public static final int GetDailyDungeonEntryInfoReq = 929; + public static final int GetDailyDungeonEntryInfoRsp = 925; + public static final int GetDungeonEntryExploreConditionReq = 3136; + public static final int GetDungeonEntryExploreConditionRsp = 3099; + public static final int GetExpeditionAssistInfoListReq = 2181; + public static final int GetExpeditionAssistInfoListRsp = 2045; + public static final int GetFriendShowAvatarInfoReq = 4003; + public static final int GetFriendShowAvatarInfoRsp = 4034; + public static final int GetFriendShowNameCardInfoReq = 4093; + public static final int GetFriendShowNameCardInfoRsp = 4060; + public static final int GetFurnitureCurModuleArrangeCountReq = 4603; + public static final int GetGachaInfoReq = 1509; + public static final int GetGachaInfoRsp = 1531; + public static final int GetHomeLevelUpRewardReq = 4747; + public static final int GetHomeLevelUpRewardRsp = 4517; + public static final int GetHuntingOfferRewardReq = 4328; + public static final int GetHuntingOfferRewardRsp = 4303; + public static final int GetInvestigationMonsterReq = 1902; + public static final int GetInvestigationMonsterRsp = 1911; + public static final int GetMailItemReq = 1437; + public static final int GetMailItemRsp = 1432; + public static final int GetMapAreaReq = 3466; + public static final int GetMapAreaRsp = 3012; + public static final int GetMapMarkTipsReq = 3329; + public static final int GetMapMarkTipsRsp = 3118; + public static final int GetMechanicusInfoReq = 3909; + public static final int GetMechanicusInfoRsp = 3931; + public static final int GetNextResourceInfoReq = 153; + public static final int GetNextResourceInfoRsp = 139; + public static final int GetOnlinePlayerInfoReq = 45; + public static final int GetOnlinePlayerInfoRsp = 90; + public static final int GetOnlinePlayerListReq = 35; + public static final int GetOnlinePlayerListRsp = 49; + public static final int GetOpActivityInfoReq = 5109; + public static final int GetOpActivityInfoRsp = 5131; + public static final int GetPlayerAskFriendListReq = 4008; + public static final int GetPlayerAskFriendListRsp = 4004; + public static final int GetPlayerBlacklistReq = 4076; + public static final int GetPlayerBlacklistRsp = 4072; + public static final int GetPlayerFriendListReq = 4009; + public static final int GetPlayerFriendListRsp = 4031; + public static final int GetPlayerHomeCompInfoReq = 4845; + public static final int GetPlayerMpModeAvailabilityReq = 1816; + public static final int GetPlayerMpModeAvailabilityRsp = 1801; + public static final int GetPlayerSocialDetailReq = 4049; + public static final int GetPlayerSocialDetailRsp = 4082; + public static final int GetPlayerTokenReq = 109; + public static final int GetPlayerTokenRsp = 131; + public static final int GetPushTipsRewardReq = 2212; + public static final int GetPushTipsRewardRsp = 2258; + public static final int GetQuestTalkHistoryReq = 435; + public static final int GetQuestTalkHistoryRsp = 449; + public static final int GetRecentMpPlayerListReq = 4011; + public static final int GetRecentMpPlayerListRsp = 4022; + public static final int GetRegionSearchReq = 5628; + public static final int GetReunionMissionInfoReq = 5066; + public static final int GetReunionMissionInfoRsp = 5051; + public static final int GetReunionPrivilegeInfoReq = 5062; + public static final int GetReunionPrivilegeInfoRsp = 5096; + public static final int GetReunionSignInInfoReq = 5078; + public static final int GetReunionSignInInfoRsp = 5053; + public static final int GetSceneAreaReq = 238; + public static final int GetSceneAreaRsp = 206; + public static final int GetSceneNpcPositionReq = 537; + public static final int GetSceneNpcPositionRsp = 532; + public static final int GetScenePerformanceReq = 3340; + public static final int GetScenePerformanceRsp = 3447; + public static final int GetScenePointReq = 230; + public static final int GetScenePointRsp = 297; + public static final int GetShopmallDataReq = 732; + public static final int GetShopmallDataRsp = 717; + public static final int GetShopReq = 709; + public static final int GetShopRsp = 731; + public static final int GetSignInRewardReq = 2532; + public static final int GetSignInRewardRsp = 2517; + public static final int GetWidgetSlotReq = 4267; + public static final int GetWidgetSlotRsp = 4300; + public static final int GetWorldMpInfoReq = 3264; + public static final int GetWorldMpInfoRsp = 3179; + public static final int GiveUpRoguelikeDungeonCardReq = 8977; + public static final int GiveUpRoguelikeDungeonCardRsp = 8583; + public static final int GivingRecordChangeNotify = 189; + public static final int GivingRecordNotify = 187; + public static final int GMShowNavMeshReq = 2377; + public static final int GMShowNavMeshRsp = 2343; + public static final int GMShowObstacleReq = 2393; + public static final int GMShowObstacleRsp = 2360; + public static final int GmTalkNotify = 58; + public static final int GmTalkReq = 31; + public static final int GmTalkRsp = 41; + public static final int GrantRewardNotify = 613; + public static final int GroupLinkAllNotify = 5768; + public static final int GroupLinkChangeNotify = 5759; + public static final int GroupLinkDeleteNotify = 5793; + public static final int GroupSuiteNotify = 3476; + public static final int GroupUnloadNotify = 3416; + public static final int GuestBeginEnterSceneNotify = 3125; + public static final int GuestPostEnterSceneNotify = 3379; + public static final int H5ActivityIdsNotify = 5693; + public static final int HideAndSeekPlayerReadyNotify = 5302; + public static final int HideAndSeekPlayerSetAvatarNotify = 5316; + public static final int HideAndSeekSelectAvatarReq = 5329; + public static final int HideAndSeekSelectAvatarRsp = 5325; + public static final int HideAndSeekSelectSkillReq = 8307; + public static final int HideAndSeekSelectSkillRsp = 8227; + public static final int HideAndSeekSetReadyReq = 5383; + public static final int HideAndSeekSetReadyRsp = 5303; + public static final int HideAndSeekSettleNotify = 5334; + public static final int HitClientTrivialNotify = 218; + public static final int HitTreeNotify = 3222; + public static final int HomeAvatarAllFinishRewardNotify = 4648; + public static final int HomeAvatarCostumeChangeNotify = 4685; + public static final int HomeAvatarRewardEventGetReq = 4775; + public static final int HomeAvatarRewardEventGetRsp = 4873; + public static final int HomeAvatarRewardEventNotify = 4789; + public static final int HomeAvatarSummonAllEventNotify = 4617; + public static final int HomeAvatarSummonEventReq = 4615; + public static final int HomeAvatarSummonEventRsp = 4498; + public static final int HomeAvatarSummonFinishReq = 4748; + public static final int HomeAvatarSummonFinishRsp = 4782; + public static final int HomeAvatarTalkFinishInfoNotify = 4502; + public static final int HomeAvatarTalkReq = 4712; + public static final int HomeAvatarTalkRsp = 4700; + public static final int HomeAvtarAllFinishRewardNotify = 4849; + public static final int HomeBasicInfoNotify = 4872; + public static final int HomeBlockNotify = 4542; + public static final int HomeChangeEditModeReq = 4625; + public static final int HomeChangeEditModeRsp = 4885; + public static final int HomeChangeModuleReq = 4688; + public static final int HomeChangeModuleRsp = 4821; + public static final int HomeChooseModuleReq = 4479; + public static final int HomeChooseModuleRsp = 4745; public static final int HomeComfortInfoNotify = 4649; - public static final int HomeCustomFurnitureInfoNotify = 4636; - public static final int HomeEditCustomFurnitureReq = 4621; - public static final int HomeEditCustomFurnitureRsp = 4804; - public static final int HomeFishFarmingInfoNotify = 4893; - public static final int HomeGetArrangementInfoReq = 4480; - public static final int HomeGetArrangementInfoRsp = 4781; - public static final int HomeGetBasicInfoReq = 4839; - public static final int HomeGetFishFarmingInfoReq = 4848; - public static final int HomeGetFishFarmingInfoRsp = 4451; - public static final int HomeGetOnlineStatusReq = 4673; - public static final int HomeGetOnlineStatusRsp = 4626; - public static final int HomeKickPlayerReq = 4547; - public static final int HomeKickPlayerRsp = 4897; - public static final int HomeLimitedShopBuyGoodsReq = 4620; - public static final int HomeLimitedShopBuyGoodsRsp = 4667; - public static final int HomeLimitedShopGoodsListReq = 4706; - public static final int HomeLimitedShopGoodsListRsp = 4587; - public static final int HomeLimitedShopInfoChangeNotify = 4691; - public static final int HomeLimitedShopInfoNotify = 4679; - public static final int HomeLimitedShopInfoReq = 4715; - public static final int HomeLimitedShopInfoRsp = 4808; - public static final int HomeMarkPointNotify = 4764; - public static final int HomeModuleSeenReq = 4642; - public static final int HomeModuleSeenRsp = 4688; - public static final int HomeModuleUnlockNotify = 4778; - public static final int HomePlantFieldNotify = 4529; - public static final int HomePlantInfoNotify = 4832; - public static final int HomePlantInfoReq = 4771; - public static final int HomePlantInfoRsp = 4806; - public static final int HomePlantSeedReq = 4730; - public static final int HomePlantSeedRsp = 4857; - public static final int HomePlantWeedReq = 4760; - public static final int HomePlantWeedRsp = 4463; - public static final int HomePriorCheckNotify = 4601; - public static final int HomeResourceNotify = 4513; - public static final int HomeResourceTakeFetterExpReq = 4884; - public static final int HomeResourceTakeFetterExpRsp = 4608; - public static final int HomeResourceTakeHomeCoinReq = 4812; - public static final int HomeResourceTakeHomeCoinRsp = 4481; - public static final int HomeSceneInitFinishReq = 4520; - public static final int HomeSceneInitFinishRsp = 4605; - public static final int HomeSceneJumpReq = 4862; - public static final int HomeSceneJumpRsp = 4663; - public static final int HomeTransferReq = 4656; - public static final int HomeTransferRsp = 4669; - public static final int HomeUpdateArrangementInfoReq = 4632; - public static final int HomeUpdateArrangementInfoRsp = 4820; - public static final int HomeUpdateFishFarmingInfoReq = 4810; - public static final int HomeUpdateFishFarmingInfoRsp = 4500; - public static final int HostPlayerNotify = 310; - public static final int HuntingFailNotify = 4315; + public static final int HomeCustomFurnitureInfoNotify = 4482; + public static final int HomeEditCustomFurnitureReq = 4516; + public static final int HomeEditCustomFurnitureRsp = 4871; + public static final int HomeFishFarmingInfoNotify = 4682; + public static final int HomeGetArrangementInfoReq = 4848; + public static final int HomeGetArrangementInfoRsp = 4456; + public static final int HomeGetBasicInfoReq = 4535; + public static final int HomeGetFishFarmingInfoReq = 4455; + public static final int HomeGetFishFarmingInfoRsp = 4889; + public static final int HomeGetOnlineStatusReq = 4796; + public static final int HomeGetOnlineStatusRsp = 4554; + public static final int HomeKickPlayerReq = 4809; + public static final int HomeKickPlayerRsp = 4752; + public static final int HomeLimitedShopBuyGoodsReq = 4638; + public static final int HomeLimitedShopBuyGoodsRsp = 4790; + public static final int HomeLimitedShopGoodsListReq = 4579; + public static final int HomeLimitedShopGoodsListRsp = 4846; + public static final int HomeLimitedShopInfoChangeNotify = 4814; + public static final int HomeLimitedShopInfoNotify = 4621; + public static final int HomeLimitedShopInfoReq = 4616; + public static final int HomeLimitedShopInfoRsp = 4585; + public static final int HomeMarkPointNotify = 4746; + public static final int HomeModuleSeenReq = 4546; + public static final int HomeModuleSeenRsp = 4526; + public static final int HomeModuleUnlockNotify = 4781; + public static final int HomePlantFieldNotify = 4466; + public static final int HomePlantInfoNotify = 4835; + public static final int HomePlantInfoReq = 4833; + public static final int HomePlantInfoRsp = 4859; + public static final int HomePlantSeedReq = 4614; + public static final int HomePlantSeedRsp = 4804; + public static final int HomePlantWeedReq = 4877; + public static final int HomePlantWeedRsp = 4575; + public static final int HomePriorCheckNotify = 4690; + public static final int HomeResourceNotify = 4806; + public static final int HomeResourceTakeFetterExpReq = 4840; + public static final int HomeResourceTakeFetterExpRsp = 4500; + public static final int HomeResourceTakeHomeCoinReq = 4763; + public static final int HomeResourceTakeHomeCoinRsp = 4658; + public static final int HomeSceneInitFinishReq = 4552; + public static final int HomeSceneInitFinishRsp = 4592; + public static final int HomeSceneJumpReq = 4659; + public static final int HomeSceneJumpRsp = 4570; + public static final int HomeTransferReq = 4880; + public static final int HomeTransferRsp = 4767; + public static final int HomeUnknown1Notify = 4528; + public static final int HomeUnknown2Req = 4857; + public static final int HomeUnknown2Rsp = 4670; + public static final int HomeUpdateArrangementInfoReq = 4472; + public static final int HomeUpdateArrangementInfoRsp = 4822; + public static final int HomeUpdateFishFarmingInfoReq = 4604; + public static final int HomeUpdateFishFarmingInfoRsp = 4856; + public static final int HostPlayerNotify = 341; + public static final int HuntingFailNotify = 4302; public static final int HuntingGiveUpReq = 4337; - public static final int HuntingGiveUpRsp = 4306; - public static final int HuntingOngoingNotify = 4327; - public static final int HuntingRevealClueNotify = 4336; - public static final int HuntingRevealFinalNotify = 4343; - public static final int HuntingStartNotify = 4317; - public static final int HuntingSuccessNotify = 4326; - public static final int InBattleMechanicusBuildingPointsNotify = 5344; - public static final int InBattleMechanicusCardResultNotify = 5388; - public static final int InBattleMechanicusConfirmCardNotify = 5397; - public static final int InBattleMechanicusConfirmCardReq = 5379; - public static final int InBattleMechanicusConfirmCardRsp = 5391; - public static final int InBattleMechanicusExcapeMonsterNotify = 5337; - public static final int InBattleMechanicusLeftMonsterNotify = 5393; - public static final int InBattleMechanicusPickCardNotify = 5334; - public static final int InBattleMechanicusPickCardReq = 5345; - public static final int InBattleMechanicusPickCardRsp = 5375; - public static final int InBattleMechanicusSettleNotify = 5355; - public static final int InteractDailyDungeonInfoNotify = 947; - public static final int InterruptGalleryReq = 5597; - public static final int InterruptGalleryRsp = 5588; - public static final int InvestigationMonsterUpdateNotify = 1918; - public static final int ItemAddHintNotify = 637; - public static final int ItemCdGroupTimeNotify = 666; - public static final int ItemExceedLimitNotify = 639; - public static final int ItemGivingReq = 170; - public static final int ItemGivingRsp = 154; - public static final int JoinHomeWorldFailNotify = 4502; - public static final int JoinPlayerFailNotify = 295; - public static final int JoinPlayerSceneReq = 239; - public static final int JoinPlayerSceneRsp = 287; - public static final int KeepAliveNotify = 60; - public static final int LeaveSceneReq = 233; - public static final int LeaveSceneRsp = 210; - public static final int LeaveWorldNotify = 3203; - public static final int LevelupCityReq = 253; - public static final int LevelupCityRsp = 272; - public static final int LifeStateChangeNotify = 1233; + public static final int HuntingGiveUpRsp = 4332; + public static final int HuntingOngoingNotify = 4313; + public static final int HuntingRevealClueNotify = 4347; + public static final int HuntingRevealFinalNotify = 4316; + public static final int HuntingStartNotify = 4326; + public static final int HuntingSuccessNotify = 4301; + public static final int InBattleMechanicusBuildingPointsNotify = 5385; + public static final int InBattleMechanicusCardResultNotify = 5330; + public static final int InBattleMechanicusConfirmCardNotify = 5307; + public static final int InBattleMechanicusConfirmCardReq = 5355; + public static final int InBattleMechanicusConfirmCardRsp = 5327; + public static final int InBattleMechanicusExcapeMonsterNotify = 5332; + public static final int InBattleMechanicusLeftMonsterNotify = 5317; + public static final int InBattleMechanicusPickCardNotify = 5382; + public static final int InBattleMechanicusPickCardReq = 5335; + public static final int InBattleMechanicusPickCardRsp = 5349; + public static final int InBattleMechanicusSettleNotify = 5398; + public static final int InteractDailyDungeonInfoNotify = 916; + public static final int InterruptGalleryReq = 5507; + public static final int InterruptGalleryRsp = 5530; + public static final int InvestigationMonsterUpdateNotify = 1922; + public static final int ItemAddHintNotify = 632; + public static final int ItemCdGroupTimeNotify = 611; + public static final int ItemGivingReq = 178; + public static final int ItemGivingRsp = 108; + public static final int JoinHomeWorldFailNotify = 4863; + public static final int JoinPlayerFailNotify = 268; + public static final int JoinPlayerSceneReq = 253; + public static final int JoinPlayerSceneRsp = 239; + public static final int KeepAliveNotify = 9; + public static final int LeaveSceneReq = 231; + public static final int LeaveSceneRsp = 241; + public static final int LeaveWorldNotify = 3420; + public static final int LevelupCityReq = 287; + public static final int LevelupCityRsp = 289; + public static final int LifeStateChangeNotify = 1231; public static final int LiveEndNotify = 801; public static final int LiveStartNotify = 820; - public static final int LoadActivityTerrainNotify = 2129; - public static final int LuaEnvironmentEffectNotify = 3175; - public static final int LuaSetOptionNotify = 353; - public static final int LunaRiteAreaFinishNotify = 8822; - public static final int LunaRiteGroupBundleRegisterNotify = 8956; - public static final int LunaRiteHintPointRemoveNotify = 8544; - public static final int LunaRiteHintPointReq = 8173; - public static final int LunaRiteHintPointRsp = 8129; - public static final int LunaRiteSacrificeReq = 8364; - public static final int LunaRiteSacrificeRsp = 8328; - public static final int LunaRiteTakeSacrificeRewardReq = 8987; - public static final int LunaRiteTakeSacrificeRewardRsp = 8352; - public static final int MailChangeNotify = 1433; - public static final int MainCoopUpdateNotify = 1975; - public static final int MapAreaChangeNotify = 3055; - public static final int MarkEntityInMinMapNotify = 230; - public static final int MarkMapReq = 3053; - public static final int MarkMapRsp = 3139; - public static final int MarkNewNotify = 1291; - public static final int MarkTargetInvestigationMonsterNotify = 1924; - public static final int MassiveEntityElementOpBatchNotify = 384; - public static final int MassiveEntityStateChangedNotify = 361; - public static final int MaterialDeleteReturnNotify = 632; - public static final int MaterialDeleteUpdateNotify = 612; - public static final int McoinExchangeHcoinReq = 653; - public static final int McoinExchangeHcoinRsp = 672; - public static final int MechanicusCandidateTeamCreateReq = 3928; - public static final int MechanicusCandidateTeamCreateRsp = 3955; - public static final int MechanicusCloseNotify = 3993; - public static final int MechanicusCoinNotify = 3915; - public static final int MechanicusLevelupGearReq = 3975; - public static final int MechanicusLevelupGearRsp = 3934; - public static final int MechanicusOpenNotify = 3937; - public static final int MechanicusSequenceOpenNotify = 3910; - public static final int MechanicusUnlockGearReq = 3944; - public static final int MechanicusUnlockGearRsp = 3945; - public static final int MeetNpcReq = 544; - public static final int MeetNpcRsp = 545; - public static final int MetNpcIdListNotify = 593; - public static final int MiracleRingDataNotify = 5245; - public static final int MiracleRingDeliverItemReq = 5217; - public static final int MiracleRingDeliverItemRsp = 5236; - public static final int MiracleRingDestroyNotify = 5243; - public static final int MiracleRingDropResultNotify = 5201; - public static final int MiracleRingTakeRewardReq = 5248; - public static final int MiracleRingTakeRewardRsp = 5213; - public static final int MistTrialDunegonFailNotify = 8337; - public static final int MistTrialGetChallengeMissionReq = 8250; - public static final int MistTrialGetChallengeMissionRsp = 8894; - public static final int MistTrialSelectAvatarAndEnterDungeonReq = 8186; - public static final int MistTrialSelectAvatarAndEnterDungeonRsp = 8522; - public static final int MonsterAIConfigHashNotify = 3024; - public static final int MonsterAlertChangeNotify = 380; - public static final int MonsterForceAlertNotify = 364; - public static final int MonsterPointArrayRouteUpdateNotify = 3292; - public static final int MonsterSummonTagNotify = 1360; - public static final int MpBlockNotify = 1824; - public static final int MpPlayGuestReplyInviteReq = 1850; - public static final int MpPlayGuestReplyInviteRsp = 1822; - public static final int MpPlayGuestReplyNotify = 1802; - public static final int MpPlayInviteResultNotify = 1830; - public static final int MpPlayOwnerCheckReq = 1812; - public static final int MpPlayOwnerCheckRsp = 1839; - public static final int MpPlayOwnerInviteNotify = 1831; - public static final int MpPlayOwnerStartInviteReq = 1821; - public static final int MpPlayOwnerStartInviteRsp = 1846; - public static final int MpPlayPrepareInterruptNotify = 1838; - public static final int MpPlayPrepareNotify = 1833; - public static final int MultistagePlayEndNotify = 5307; - public static final int MultistagePlayFinishStageReq = 5333; - public static final int MultistagePlayFinishStageRsp = 5328; - public static final int MultistagePlayInfoNotify = 5360; - public static final int MultistagePlaySettleNotify = 5318; - public static final int MultistagePlayStageEndNotify = 5321; - public static final int MusicGameSettleReq = 8851; - public static final int MusicGameSettleRsp = 8028; - public static final int MusicGameStartReq = 8760; - public static final int MusicGameStartRsp = 8922; - public static final int NavMeshStatsNotify = 2353; - public static final int NormalUidOpNotify = 5735; - public static final int NpcTalkReq = 560; - public static final int NpcTalkRsp = 533; - public static final int ObstacleModifyNotify = 2310; - public static final int OfferingInteractReq = 2916; - public static final int OfferingInteractRsp = 2912; - public static final int OneoffGatherPointDetectorDataNotify = 4289; - public static final int OpActivityDataNotify = 5110; - public static final int OpActivityStateNotify = 2560; - public static final int OpActivityUpdateNotify = 5115; - public static final int OpenBlossomCircleCampGuideNotify = 2744; - public static final int OpenStateChangeNotify = 165; - public static final int OpenStateUpdateNotify = 109; - public static final int OrderDisplayNotify = 4101; - public static final int OrderFinishNotify = 4145; - public static final int OtherPlayerEnterHomeNotify = 4591; - public static final int PacketHead = 13371337; - public static final int PathfindingEnterSceneReq = 2337; - public static final int PathfindingEnterSceneRsp = 2393; - public static final int PathfindingPingNotify = 2315; - public static final int PersonalLineAllDataReq = 408; - public static final int PersonalLineAllDataRsp = 417; - public static final int PersonalLineNewUnlockNotify = 423; - public static final int PersonalSceneJumpReq = 286; - public static final int PersonalSceneJumpRsp = 277; - public static final int PingReq = 37; - public static final int PingRsp = 93; - public static final int PlantFlowerAcceptAllGiveFlowerReq = 8775; - public static final int PlantFlowerAcceptAllGiveFlowerRsp = 8174; - public static final int PlantFlowerAcceptGiveFlowerReq = 8525; - public static final int PlantFlowerAcceptGiveFlowerRsp = 8957; - public static final int PlantFlowerEditFlowerCombinationReq = 8347; - public static final int PlantFlowerEditFlowerCombinationRsp = 8625; - public static final int PlantFlowerGetCanGiveFriendFlowerReq = 8617; - public static final int PlantFlowerGetCanGiveFriendFlowerRsp = 8091; - public static final int PlantFlowerGetFriendFlowerWishListReq = 8893; - public static final int PlantFlowerGetFriendFlowerWishListRsp = 8476; - public static final int PlantFlowerGetRecvFlowerListReq = 8459; - public static final int PlantFlowerGetRecvFlowerListRsp = 8597; - public static final int PlantFlowerGetSeedInfoReq = 8535; - public static final int PlantFlowerGetSeedInfoRsp = 8584; - public static final int PlantFlowerGiveFriendFlowerReq = 8934; - public static final int PlantFlowerGiveFriendFlowerRsp = 8456; - public static final int PlantFlowerHaveRecvFlowerNotify = 8711; - public static final int PlantFlowerSetFlowerWishReq = 8601; - public static final int PlantFlowerSetFlowerWishRsp = 8550; - public static final int PlantFlowerTakeSeedRewardReq = 8317; - public static final int PlantFlowerTakeSeedRewardRsp = 8152; - public static final int PlatformChangeRouteNotify = 257; - public static final int PlatformStartRouteNotify = 254; - public static final int PlatformStopRouteNotify = 235; - public static final int PlayerAllowEnterMpAfterAgreeMatchNotify = 4176; - public static final int PlayerApplyEnterHomeNotify = 4614; - public static final int PlayerApplyEnterHomeResultNotify = 4580; - public static final int PlayerApplyEnterHomeResultReq = 4603; - public static final int PlayerApplyEnterHomeResultRsp = 4849; - public static final int PlayerApplyEnterMpAfterMatchAgreedNotify = 4177; - public static final int PlayerApplyEnterMpNotify = 1835; - public static final int PlayerApplyEnterMpReq = 1825; - public static final int PlayerApplyEnterMpResultNotify = 1848; - public static final int PlayerApplyEnterMpResultReq = 1813; - public static final int PlayerApplyEnterMpResultRsp = 1801; - public static final int PlayerApplyEnterMpRsp = 1845; - public static final int PlayerCancelMatchReq = 4198; - public static final int PlayerCancelMatchRsp = 4163; - public static final int PlayerChatCDNotify = 3173; - public static final int PlayerChatNotify = 3485; - public static final int PlayerChatReq = 3403; - public static final int PlayerChatRsp = 3045; - public static final int PlayerCompoundMaterialReq = 173; - public static final int PlayerCompoundMaterialRsp = 163; - public static final int PlayerConfirmMatchReq = 4186; - public static final int PlayerConfirmMatchRsp = 4193; - public static final int PlayerCookArgsReq = 135; - public static final int PlayerCookArgsRsp = 157; - public static final int PlayerCookReq = 103; - public static final int PlayerCookRsp = 167; - public static final int PlayerDataNotify = 145; - public static final int PlayerEnterDungeonReq = 910; - public static final int PlayerEnterDungeonRsp = 915; - public static final int PlayerEnterSceneInfoNotify = 294; - public static final int PlayerEnterSceneNotify = 260; - public static final int PlayerEyePointStateNotify = 3461; - public static final int PlayerFishingDataNotify = 5831; - public static final int PlayerForceExitReq = 125; - public static final int PlayerForceExitRsp = 149; - public static final int PlayerGameTimeNotify = 179; - public static final int PlayerGeneralMatchConfirmNotify = 4156; + public static final int LoadActivityTerrainNotify = 2175; + public static final int LuaEnvironmentEffectNotify = 3289; + public static final int LuaSetOptionNotify = 387; + public static final int LunaRiteAreaFinishNotify = 8107; + public static final int LunaRiteGroupBundleRegisterNotify = 8327; + public static final int LunaRiteHintPointRemoveNotify = 8420; + public static final int LunaRiteHintPointReq = 8342; + public static final int LunaRiteHintPointRsp = 8481; + public static final int LunaRiteSacrificeReq = 8062; + public static final int LunaRiteSacrificeRsp = 8401; + public static final int LunaRiteTakeSacrificeRewardReq = 8669; + public static final int LunaRiteTakeSacrificeRewardRsp = 8252; + public static final int MailChangeNotify = 1431; + public static final int MainCoopUpdateNotify = 1959; + public static final int MapAreaChangeNotify = 3103; + public static final int MarkEntityInMinMapNotify = 202; + public static final int MarkMapReq = 3208; + public static final int MarkMapRsp = 3421; + public static final int MarkNewNotify = 1227; + public static final int MarkTargetInvestigationMonsterNotify = 1928; + public static final int MassiveEntityElementOpBatchNotify = 377; + public static final int MassiveEntityStateChangedNotify = 303; + public static final int MaterialDeleteReturnNotify = 693; + public static final int MaterialDeleteUpdateNotify = 643; + public static final int McoinExchangeHcoinReq = 687; + public static final int McoinExchangeHcoinRsp = 689; + public static final int MechanicusCandidateTeamCreateReq = 3997; + public static final int MechanicusCandidateTeamCreateRsp = 3998; + public static final int MechanicusCloseNotify = 3917; + public static final int MechanicusCoinNotify = 3937; + public static final int MechanicusLevelupGearReq = 3949; + public static final int MechanicusLevelupGearRsp = 3982; + public static final int MechanicusOpenNotify = 3932; + public static final int MechanicusSequenceOpenNotify = 3941; + public static final int MechanicusUnlockGearReq = 3985; + public static final int MechanicusUnlockGearRsp = 3935; + public static final int MeetNpcReq = 585; + public static final int MeetNpcRsp = 535; + public static final int MetNpcIdListNotify = 517; + public static final int MiracleRingDataNotify = 5243; + public static final int MiracleRingDeliverItemReq = 5226; + public static final int MiracleRingDeliverItemRsp = 5247; + public static final int MiracleRingDestroyNotify = 5216; + public static final int MiracleRingDropResultNotify = 5203; + public static final int MiracleRingTakeRewardReq = 5204; + public static final int MiracleRingTakeRewardRsp = 5228; + public static final int MistTrialDunegonFailNotify = 8580; + public static final int MistTrialGetChallengeMissionReq = 8668; + public static final int MistTrialGetChallengeMissionRsp = 8385; + public static final int MistTrialSelectAvatarAndEnterDungeonReq = 8318; + public static final int MistTrialSelectAvatarAndEnterDungeonRsp = 8403; + public static final int MonsterAIConfigHashNotify = 3121; + public static final int MonsterAlertChangeNotify = 313; + public static final int MonsterForceAlertNotify = 342; + public static final int MonsterPointArrayRouteUpdateNotify = 3138; + public static final int MonsterSummonTagNotify = 1309; + public static final int MpBlockNotify = 1808; + public static final int MpPlayGuestReplyInviteReq = 1811; + public static final int MpPlayGuestReplyInviteRsp = 1841; + public static final int MpPlayGuestReplyNotify = 1805; + public static final int MpPlayInviteResultNotify = 1806; + public static final int MpPlayOwnerCheckReq = 1814; + public static final int MpPlayOwnerCheckRsp = 1812; + public static final int MpPlayOwnerInviteNotify = 1815; + public static final int MpPlayOwnerStartInviteReq = 1846; + public static final int MpPlayOwnerStartInviteRsp = 1827; + public static final int MpPlayPrepareInterruptNotify = 1848; + public static final int MpPlayPrepareNotify = 1839; + public static final int MultistagePlayEndNotify = 5375; + public static final int MultistagePlayFinishStageReq = 5331; + public static final int MultistagePlayFinishStageRsp = 5397; + public static final int MultistagePlayInfoNotify = 5309; + public static final int MultistagePlaySettleNotify = 5314; + public static final int MultistagePlayStageEndNotify = 5340; + public static final int MusicGameCreateBeatmapReq = 6326; + public static final int MusicGameCreateBeatmapRsp = 6347; + public static final int MusicGameGetBeatmapReq = 6318; + public static final int MusicGameGetBeatmapRsp = 6309; + public static final int MusicGameSearchBeatmapReq = 6343; + public static final int MusicGameSearchBeatmapRsp = 6304; + public static final int MusicGameSettleReq = 8745; + public static final int MusicGameSettleRsp = 8288; + public static final int MusicGameStartReq = 8927; + public static final int MusicGameStartRsp = 8101; + public static final int MusicCustomReq = 6318; + public static final int MusicCustomRsp = 6309; + public static final int MusicGameStoreSubmitReq = 6326; + public static final int MusicGameStoreSubmitRsp = 6347; + public static final int MusicGameStoreSubmitNotify = 6337; + public static final int MusicGameStartToPlayOthersBeatmapReq = 6302; + public static final int MusicGameStartToPlayOthersBeatmapRsp = 6313; + public static final int NavMeshStatsNotify = 2387; + public static final int NormalUidOpNotify = 5718; + public static final int NpcTalkReq = 509; + public static final int NpcTalkRsp = 531; + public static final int ObstacleModifyNotify = 2341; + public static final int OfferingInteractReq = 2908; + public static final int OfferingInteractRsp = 2923; + public static final int OneoffGatherPointDetectorDataNotify = 4262; + public static final int OpActivityDataNotify = 5141; + public static final int OpActivityStateNotify = 2509; + public static final int OpActivityUpdateNotify = 5137; + public static final int OpenBlossomCircleCampGuideNotify = 2785; + public static final int OpenStateChangeNotify = 112; + public static final int OpenStateUpdateNotify = 119; + public static final int OrderDisplayNotify = 4103; + public static final int OrderFinishNotify = 4143; + public static final int OtherPlayerEnterHomeNotify = 4609; + public static final int PathfindingEnterSceneReq = 2332; + public static final int PathfindingEnterSceneRsp = 2317; + public static final int PathfindingPingNotify = 2337; + public static final int PersonalLineAllDataReq = 446; + public static final int PersonalLineAllDataRsp = 433; + public static final int PersonalLineNewUnlockNotify = 470; + public static final int PersonalSceneJumpReq = 266; + public static final int PersonalSceneJumpRsp = 248; + public static final int PingReq = 32; + public static final int PingRsp = 17; + public static final int PlantFlowerAcceptAllGiveFlowerReq = 8017; + public static final int PlantFlowerAcceptAllGiveFlowerRsp = 8831; + public static final int PlantFlowerAcceptGiveFlowerReq = 8137; + public static final int PlantFlowerAcceptGiveFlowerRsp = 8431; + public static final int PlantFlowerEditFlowerCombinationReq = 8506; + public static final int PlantFlowerEditFlowerCombinationRsp = 8335; + public static final int PlantFlowerGetCanGiveFriendFlowerReq = 8648; + public static final int PlantFlowerGetCanGiveFriendFlowerRsp = 8507; + public static final int PlantFlowerGetFriendFlowerWishListReq = 8840; + public static final int PlantFlowerGetFriendFlowerWishListRsp = 8553; + public static final int PlantFlowerGetRecvFlowerListReq = 8914; + public static final int PlantFlowerGetRecvFlowerListRsp = 8929; + public static final int PlantFlowerGetSeedInfoReq = 8913; + public static final int PlantFlowerGetSeedInfoRsp = 8932; + public static final int PlantFlowerGiveFriendFlowerReq = 8836; + public static final int PlantFlowerGiveFriendFlowerRsp = 8893; + public static final int PlantFlowerHaveRecvFlowerNotify = 8174; + public static final int PlantFlowerSetFlowerWishReq = 8650; + public static final int PlantFlowerSetFlowerWishRsp = 8588; + public static final int PlantFlowerTakeSeedRewardReq = 8182; + public static final int PlantFlowerTakeSeedRewardRsp = 8386; + public static final int PlatformChangeRouteNotify = 205; + public static final int PlatformStartRouteNotify = 208; + public static final int PlatformStopRouteNotify = 204; + public static final int PlayerAllowEnterMpAfterAgreeMatchNotify = 4151; + public static final int PlayerApplyEnterHomeNotify = 4504; + public static final int PlayerApplyEnterHomeResultNotify = 4766; + public static final int PlayerApplyEnterHomeResultReq = 4568; + public static final int PlayerApplyEnterHomeResultRsp = 4697; + public static final int PlayerApplyEnterMpAfterMatchAgreedNotify = 4163; + public static final int PlayerApplyEnterMpNotify = 1818; + public static final int PlayerApplyEnterMpReq = 1809; + public static final int PlayerApplyEnterMpResultNotify = 1804; + public static final int PlayerApplyEnterMpResultReq = 1828; + public static final int PlayerApplyEnterMpResultRsp = 1803; + public static final int PlayerApplyEnterMpRsp = 1843; + public static final int PlayerCancelMatchReq = 4154; + public static final int PlayerCancelMatchRsp = 4178; + public static final int PlayerChatCDNotify = 3464; + public static final int PlayerChatNotify = 3295; + public static final int PlayerChatReq = 3378; + public static final int PlayerChatRsp = 3321; + public static final int PlayerCompoundMaterialReq = 122; + public static final int PlayerCompoundMaterialRsp = 154; + public static final int PlayerConfirmMatchReq = 4197; + public static final int PlayerConfirmMatchRsp = 4166; + public static final int PlayerCookArgsReq = 104; + public static final int PlayerCookArgsRsp = 105; + public static final int PlayerCookReq = 158; + public static final int PlayerCookRsp = 150; + public static final int PlayerDataNotify = 135; + public static final int PlayerEnterDungeonReq = 941; + public static final int PlayerEnterDungeonRsp = 937; + public static final int PlayerEnterSceneInfoNotify = 274; + public static final int PlayerEnterSceneNotify = 209; + public static final int PlayerEyePointStateNotify = 3376; + public static final int PlayerFishingDataNotify = 5815; + public static final int PlayerForceExitReq = 173; + public static final int PlayerForceExitRsp = 161; + public static final int PlayerGameTimeNotify = 155; + public static final int PlayerGeneralMatchConfirmNotify = 4182; public static final int PlayerGeneralMatchDismissNotify = 4187; - public static final int PlayerGetForceQuitBanInfoReq = 4162; - public static final int PlayerGetForceQuitBanInfoRsp = 4189; - public static final int PlayerHomeCompInfoNotify = 4863; - public static final int PlayerInjectFixNotify = 185; - public static final int PlayerInvestigationAllInfoNotify = 1920; - public static final int PlayerInvestigationNotify = 1901; - public static final int PlayerInvestigationTargetNotify = 1919; - public static final int PlayerLevelRewardUpdateNotify = 112; - public static final int PlayerLoginReq = 110; - public static final int PlayerLoginRsp = 115; - public static final int PlayerLogoutNotify = 144; - public static final int PlayerLogoutReq = 137; - public static final int PlayerLogoutRsp = 193; - public static final int PlayerLuaShellNotify = 143; - public static final int PlayerMatchAgreedResultNotify = 4165; - public static final int PlayerMatchInfoNotify = 4195; - public static final int PlayerMatchStopNotify = 4151; - public static final int PlayerMatchSuccNotify = 4167; - public static final int PlayerOfferingDataNotify = 2915; - public static final int PlayerOfferingReq = 2914; - public static final int PlayerOfferingRsp = 2917; - public static final int PlayerPreEnterMpNotify = 1836; - public static final int PlayerPropChangeNotify = 156; - public static final int PlayerPropChangeReasonNotify = 1234; - public static final int PlayerPropNotify = 191; - public static final int PlayerQuitDungeonReq = 937; - public static final int PlayerQuitDungeonRsp = 993; - public static final int PlayerQuitFromHomeNotify = 4757; - public static final int PlayerQuitFromMpNotify = 1817; + public static final int PlayerGetForceQuitBanInfoReq = 4164; + public static final int PlayerGetForceQuitBanInfoRsp = 4162; + public static final int PlayerHomeCompInfoNotify = 4563; + public static final int PlayerInjectFixNotify = 188; + public static final int PlayerInvestigationAllInfoNotify = 1905; + public static final int PlayerInvestigationNotify = 1927; + public static final int PlayerInvestigationTargetNotify = 1906; + public static final int PlayerLevelRewardUpdateNotify = 143; + public static final int PlayerLoginReq = 141; + public static final int PlayerLoginRsp = 137; + public static final int PlayerLogoutNotify = 185; + public static final int PlayerLogoutReq = 132; + public static final int PlayerLogoutRsp = 117; + public static final int PlayerLuaShellNotify = 110; + public static final int PlayerMatchAgreedResultNotify = 4152; + public static final int PlayerMatchInfoNotify = 4193; + public static final int PlayerMatchStopNotify = 4153; + public static final int PlayerMatchSuccNotify = 4176; + public static final int PlayerOfferingDataNotify = 2901; + public static final int PlayerOfferingReq = 2906; + public static final int PlayerOfferingRsp = 2911; + public static final int PlayerPreEnterMpNotify = 1847; + public static final int PlayerPropChangeNotify = 186; + public static final int PlayerPropChangeReasonNotify = 1282; + public static final int PlayerPropNotify = 127; + public static final int PlayerQuitDungeonReq = 932; + public static final int PlayerQuitDungeonRsp = 917; + public static final int PlayerQuitFromHomeNotify = 4776; + public static final int PlayerQuitFromMpNotify = 1826; public static final int PlayerRandomCookReq = 120; - public static final int PlayerRandomCookRsp = 180; - public static final int PlayerRechargeDataNotify = 4113; - public static final int PlayerReportReq = 4092; - public static final int PlayerReportRsp = 4058; - public static final int PlayerRoutineDataNotify = 3535; - public static final int PlayerSetLanguageReq = 123; - public static final int PlayerSetLanguageRsp = 113; - public static final int PlayerSetOnlyMPWithPSPlayerReq = 1815; - public static final int PlayerSetOnlyMPWithPSPlayerRsp = 1827; - public static final int PlayerSetPauseReq = 192; - public static final int PlayerSetPauseRsp = 158; - public static final int PlayerStartMatchReq = 4185; - public static final int PlayerStartMatchRsp = 4175; - public static final int PlayerStoreNotify = 660; - public static final int PlayerTimeNotify = 152; - public static final int PlayerWorldSceneInfoListNotify = 3386; - public static final int PostEnterSceneReq = 3390; - public static final int PostEnterSceneRsp = 3213; - public static final int PrivateChatNotify = 4960; - public static final int PrivateChatReq = 5010; - public static final int PrivateChatRsp = 4983; - public static final int PrivateChatSetSequenceReq = 4965; - public static final int PrivateChatSetSequenceRsp = 4987; - public static final int ProfilePictureChangeNotify = 4053; - public static final int ProjectorOptionReq = 880; - public static final int ProjectorOptionRsp = 864; - public static final int ProudSkillChangeNotify = 1079; - public static final int ProudSkillExtraLevelNotify = 1028; - public static final int ProudSkillUpgradeReq = 1075; - public static final int ProudSkillUpgradeRsp = 1034; - public static final int PSNBlackListNotify = 4070; - public static final int PSNFriendListNotify = 4072; + public static final int PlayerRandomCookRsp = 113; + public static final int PlayerRechargeDataNotify = 4128; + public static final int PlayerReportReq = 4059; + public static final int PlayerReportRsp = 4084; + public static final int PlayerRoutineDataNotify = 3518; + public static final int PlayerSetLanguageReq = 170; + public static final int PlayerSetLanguageRsp = 129; + public static final int PlayerSetOnlyMPWithPSPlayerReq = 1802; + public static final int PlayerSetOnlyMPWithPSPlayerRsp = 1813; + public static final int PlayerSetPauseReq = 159; + public static final int PlayerSetPauseRsp = 184; + public static final int PlayerStartMatchReq = 4168; + public static final int PlayerStartMatchRsp = 4159; + public static final int PlayerStoreNotify = 609; + public static final int PlayerTimeNotify = 172; + public static final int PlayerWorldSceneInfoListNotify = 3172; + public static final int PostEnterSceneReq = 3097; + public static final int PostEnterSceneRsp = 3344; + public static final int PrivateChatNotify = 4991; + public static final int PrivateChatReq = 4959; + public static final int PrivateChatRsp = 4981; + public static final int PrivateChatSetSequenceReq = 4987; + public static final int PrivateChatSetSequenceRsp = 4982; + public static final int ProfilePictureChangeNotify = 4087; + public static final int ProjectorOptionReq = 813; + public static final int ProjectorOptionRsp = 842; + public static final int ProudSkillChangeNotify = 1055; + public static final int ProudSkillExtraLevelNotify = 1097; + public static final int ProudSkillUpgradeReq = 1049; + public static final int ProudSkillUpgradeRsp = 1082; + public static final int PSNBlackListNotify = 4078; + public static final int PSNFriendListNotify = 4089; public static final int PSPlayerApplyEnterMpReq = 1837; - public static final int PSPlayerApplyEnterMpRsp = 1806; - public static final int PullPrivateChatReq = 5043; - public static final int PullPrivateChatRsp = 4994; - public static final int PullRecentChatReq = 4995; - public static final int PullRecentChatRsp = 5025; - public static final int PushTipsAllDataNotify = 2226; - public static final int PushTipsChangeNotify = 2262; - public static final int PushTipsReadFinishReq = 2289; - public static final int PushTipsReadFinishRsp = 2209; + public static final int PSPlayerApplyEnterMpRsp = 1832; + public static final int PullPrivateChatReq = 4967; + public static final int PullPrivateChatRsp = 5035; + public static final int PullRecentChatReq = 4985; + public static final int PullRecentChatRsp = 4999; + public static final int PushTipsAllDataNotify = 2224; + public static final int PushTipsChangeNotify = 2238; + public static final int PushTipsReadFinishReq = 2206; + public static final int PushTipsReadFinishRsp = 2219; public static final int QueryCodexMonsterBeKilledNumReq = 4207; - public static final int QueryCodexMonsterBeKilledNumRsp = 4208; - public static final int QueryPathReq = 2360; - public static final int QueryPathRsp = 2333; - public static final int QuestCreateEntityReq = 434; - public static final int QuestCreateEntityRsp = 479; - public static final int QuestDelNotify = 410; - public static final int QuestDestroyEntityReq = 491; - public static final int QuestDestroyEntityRsp = 497; - public static final int QuestDestroyNpcReq = 426; - public static final int QuestDestroyNpcRsp = 462; - public static final int QuestGlobalVarNotify = 466; - public static final int QuestListNotify = 460; - public static final int QuestListUpdateNotify = 433; - public static final int QuestProgressUpdateNotify = 446; - public static final int QuestTransmitReq = 473; - public static final int QuestTransmitRsp = 463; - public static final int QuestUpdateQuestTimeVarNotify = 458; - public static final int QuestUpdateQuestVarNotify = 483; - public static final int QuestUpdateQuestVarReq = 474; - public static final int QuestUpdateQuestVarRsp = 456; - public static final int QuickUseWidgetReq = 4276; - public static final int QuickUseWidgetRsp = 4265; - public static final int ReadMailNotify = 1410; - public static final int ReadPrivateChatReq = 4984; - public static final int ReadPrivateChatRsp = 5029; - public static final int ReceivedTrialAvatarActivityRewardReq = 2093; - public static final int ReceivedTrialAvatarActivityRewardRsp = 2138; - public static final int RechargeReq = 4135; - public static final int RechargeRsp = 4125; - public static final int RedeemLegendaryKeyReq = 481; - public static final int RedeemLegendaryKeyRsp = 427; - public static final int RefreshBackgroundAvatarReq = 1744; - public static final int RefreshBackgroundAvatarRsp = 1719; - public static final int RefreshRoguelikeDungeonCardReq = 8433; - public static final int RefreshRoguelikeDungeonCardRsp = 8678; - public static final int RegionSearchChangeRegionNotify = 5625; - public static final int RegionSearchNotify = 5635; - public static final int ReliquaryDecomposeReq = 606; - public static final int ReliquaryDecomposeRsp = 659; - public static final int ReliquaryPromoteReq = 665; - public static final int ReliquaryPromoteRsp = 603; - public static final int ReliquaryUpgradeReq = 689; - public static final int ReliquaryUpgradeRsp = 609; - public static final int RemoveBlacklistReq = 4080; - public static final int RemoveBlacklistRsp = 4064; - public static final int RemoveRandTaskInfoNotify = 132; - public static final int ReportFightAntiCheatNotify = 357; - public static final int ReportTrackingIOInfoNotify = 4117; - public static final int RequestLiveInfoReq = 803; - public static final int RequestLiveInfoRsp = 867; - public static final int ResinCardDataUpdateNotify = 4126; - public static final int ResinChangeNotify = 623; - public static final int RestartEffigyChallengeReq = 2120; - public static final int RestartEffigyChallengeRsp = 2127; - public static final int ReunionActivateNotify = 5081; - public static final int ReunionBriefInfoReq = 5085; - public static final int ReunionBriefInfoRsp = 5075; - public static final int ReunionDailyRefreshNotify = 5072; - public static final int ReunionPrivilegeChangeNotify = 5100; - public static final int ReunionSettleNotify = 5096; - public static final int RobotPushPlayerDataNotify = 88; - public static final int RogueCellUpdateNotify = 8074; - public static final int RogueDungeonPlayerCellChangeNotify = 8784; - public static final int RogueHealAvatarsReq = 8959; - public static final int RogueHealAvatarsRsp = 8473; - public static final int RoguelikeCardGachaNotify = 8079; - public static final int RoguelikeEffectDataNotify = 8529; - public static final int RoguelikeEffectViewReq = 8396; - public static final int RoguelikeEffectViewRsp = 8040; - public static final int RoguelikeGiveUpReq = 8716; - public static final int RoguelikeGiveUpRsp = 8728; - public static final int RoguelikeMistClearNotify = 8471; - public static final int RoguelikeRefreshCardCostUpdateNotify = 8304; - public static final int RoguelikeResourceBonusPropUpdateNotify = 8312; - public static final int RoguelikeRuneRecordUpdateNotify = 8985; - public static final int RoguelikeSelectAvatarAndEnterDungeonReq = 8697; - public static final int RoguelikeSelectAvatarAndEnterDungeonRsp = 8377; - public static final int RoguelikeTakeStageFirstPassRewardReq = 8667; - public static final int RoguelikeTakeStageFirstPassRewardRsp = 8101; - public static final int RogueResumeDungeonReq = 8496; - public static final int RogueResumeDungeonRsp = 8759; - public static final int RogueSwitchAvatarReq = 8856; - public static final int RogueSwitchAvatarRsp = 8141; - public static final int SalesmanDeliverItemReq = 2091; - public static final int SalesmanDeliverItemRsp = 2171; - public static final int SalesmanTakeRewardReq = 2162; - public static final int SalesmanTakeRewardRsp = 2156; - public static final int SalesmanTakeSpecialRewardReq = 2082; - public static final int SalesmanTakeSpecialRewardRsp = 2173; - public static final int SaveCoopDialogReq = 1972; - public static final int SaveCoopDialogRsp = 1952; - public static final int SaveMainCoopReq = 1995; - public static final int SaveMainCoopRsp = 1998; - public static final int SceneAreaUnlockNotify = 209; - public static final int SceneAreaWeatherNotify = 213; - public static final int SceneAudioNotify = 3260; - public static final int SceneAvatarStaminaStepReq = 234; - public static final int SceneAvatarStaminaStepRsp = 279; - public static final int SceneCreateEntityReq = 267; + public static final int QueryCodexMonsterBeKilledNumRsp = 4205; + public static final int QueryPathReq = 2309; + public static final int QueryPathRsp = 2331; + public static final int QuestCreateEntityReq = 482; + public static final int QuestCreateEntityRsp = 455; + public static final int QuestDelNotify = 441; + public static final int QuestDestroyEntityReq = 427; + public static final int QuestDestroyEntityRsp = 407; + public static final int QuestDestroyNpcReq = 424; + public static final int QuestDestroyNpcRsp = 438; + public static final int QuestGlobalVarNotify = 411; + public static final int QuestListNotify = 409; + public static final int QuestListUpdateNotify = 431; + public static final int QuestProgressUpdateNotify = 445; + public static final int QuestTransmitReq = 422; + public static final int QuestTransmitRsp = 454; + public static final int QuestUpdateQuestTimeVarNotify = 484; + public static final int QuestUpdateQuestVarNotify = 463; + public static final int QuestUpdateQuestVarReq = 490; + public static final int QuestUpdateQuestVarRsp = 486; + public static final int QuickUseWidgetReq = 4251; + public static final int QuickUseWidgetRsp = 4252; + public static final int ReadMailNotify = 1441; + public static final int ReadPrivateChatReq = 5032; + public static final int ReadPrivateChatRsp = 5005; + public static final int ReceivedTrialAvatarActivityRewardReq = 2054; + public static final int ReceivedTrialAvatarActivityRewardRsp = 2199; + public static final int RechargeReq = 4118; + public static final int RechargeRsp = 4109; + public static final int RedeemLegendaryKeyReq = 436; + public static final int RedeemLegendaryKeyRsp = 428; + public static final int RefreshBackgroundAvatarReq = 1660; + public static final int RefreshBackgroundAvatarRsp = 1751; + public static final int RefreshRoguelikeDungeonCardReq = 8072; + public static final int RefreshRoguelikeDungeonCardRsp = 8644; + public static final int RegionSearchChangeRegionNotify = 5609; + public static final int RegionSearchNotify = 5618; + public static final int ReliquaryDecomposeReq = 615; + public static final int ReliquaryDecomposeRsp = 692; + public static final int ReliquaryPromoteReq = 612; + public static final int ReliquaryPromoteRsp = 658; + public static final int ReliquaryUpgradeReq = 606; + public static final int ReliquaryUpgradeRsp = 619; + public static final int RemoveBlacklistReq = 4013; + public static final int RemoveBlacklistRsp = 4042; + public static final int RemoveRandTaskInfoNotify = 193; + public static final int ReportFightAntiCheatNotify = 305; + public static final int ReportTrackingIOInfoNotify = 4126; + public static final int RequestLiveInfoReq = 858; + public static final int RequestLiveInfoRsp = 850; + public static final int ResinCardDataUpdateNotify = 4101; + public static final int ResinChangeNotify = 670; + public static final int RestartEffigyChallengeReq = 2023; + public static final int RestartEffigyChallengeRsp = 2133; + public static final int ReunionActivateNotify = 5065; + public static final int ReunionBriefInfoReq = 5068; + public static final int ReunionBriefInfoRsp = 5059; + public static final int ReunionDailyRefreshNotify = 5091; + public static final int ReunionPrivilegeChangeNotify = 5061; + public static final int ReunionSettleNotify = 5077; + public static final int RobotPushPlayerDataNotify = 30; + public static final int RogueCellUpdateNotify = 8022; + public static final int RogueDungeonPlayerCellChangeNotify = 8832; + public static final int RogueHealAvatarsReq = 8331; + public static final int RogueHealAvatarsRsp = 8937; + public static final int RoguelikeCardGachaNotify = 8618; + public static final int RoguelikeEffectDataNotify = 8606; + public static final int RoguelikeEffectViewReq = 8377; + public static final int RoguelikeEffectViewRsp = 8770; + public static final int RoguelikeGiveUpReq = 8988; + public static final int RoguelikeGiveUpRsp = 8009; + public static final int RoguelikeMistClearNotify = 8198; + public static final int RoguelikeRefreshCardCostUpdateNotify = 8912; + public static final int RoguelikeResourceBonusPropUpdateNotify = 8823; + public static final int RoguelikeRuneRecordUpdateNotify = 8497; + public static final int RoguelikeSelectAvatarAndEnterDungeonReq = 8975; + public static final int RoguelikeSelectAvatarAndEnterDungeonRsp = 8471; + public static final int RoguelikeTakeStageFirstPassRewardReq = 8205; + public static final int RoguelikeTakeStageFirstPassRewardRsp = 8409; + public static final int RogueResumeDungeonReq = 8417; + public static final int RogueResumeDungeonRsp = 8565; + public static final int RogueSwitchAvatarReq = 8930; + public static final int RogueSwitchAvatarRsp = 8556; + public static final int SalesmanDeliverItemReq = 2118; + public static final int SalesmanDeliverItemRsp = 2038; + public static final int SalesmanTakeRewardReq = 2007; + public static final int SalesmanTakeRewardRsp = 2100; + public static final int SalesmanTakeSpecialRewardReq = 2065; + public static final int SalesmanTakeSpecialRewardRsp = 2107; + public static final int SaveCoopDialogReq = 1991; + public static final int SaveCoopDialogRsp = 1955; + public static final int SaveMainCoopReq = 1993; + public static final int SaveMainCoopRsp = 1954; + public static final int SceneAreaUnlockNotify = 219; + public static final int SceneAreaWeatherNotify = 229; + public static final int SceneAudioNotify = 3430; + public static final int SceneAvatarStaminaStepReq = 282; + public static final int SceneAvatarStaminaStepRsp = 255; + public static final int SceneCreateEntityReq = 250; public static final int SceneCreateEntityRsp = 220; - public static final int SceneDataNotify = 3179; - public static final int SceneDestroyEntityReq = 280; - public static final int SceneDestroyEntityRsp = 264; - public static final int SceneEntitiesMoveCombineNotify = 3312; - public static final int SceneEntitiesMovesReq = 221; - public static final int SceneEntitiesMovesRsp = 207; - public static final int SceneEntityAppearNotify = 293; - public static final int SceneEntityDisappearNotify = 244; - public static final int SceneEntityDrownReq = 265; - public static final int SceneEntityDrownRsp = 203; - public static final int SceneEntityMoveNotify = 291; - public static final int SceneEntityMoveReq = 245; - public static final int SceneEntityMoveRsp = 275; - public static final int SceneEntityUpdateNotify = 3423; - public static final int SceneForceLockNotify = 266; + public static final int SceneDataNotify = 3117; + public static final int SceneDestroyEntityReq = 213; + public static final int SceneDestroyEntityRsp = 242; + public static final int SceneEntitiesMoveCombineNotify = 3298; + public static final int SceneEntitiesMovesReq = 240; + public static final int SceneEntitiesMovesRsp = 275; + public static final int SceneEntityAppearNotify = 217; + public static final int SceneEntityDisappearNotify = 285; + public static final int SceneEntityDrownReq = 212; + public static final int SceneEntityDrownRsp = 258; + public static final int SceneEntityMoveNotify = 227; + public static final int SceneEntityMoveReq = 235; + public static final int SceneEntityMoveRsp = 249; + public static final int SceneEntityUpdateNotify = 3089; + public static final int SceneForceLockNotify = 211; public static final int SceneForceUnlockNotify = 201; - public static final int SceneGalleryInfoNotify = 5528; - public static final int SceneInitFinishReq = 215; - public static final int SceneInitFinishRsp = 237; - public static final int SceneKickPlayerNotify = 259; - public static final int SceneKickPlayerReq = 204; - public static final int SceneKickPlayerRsp = 206; - public static final int ScenePlayBattleInfoListNotify = 4378; - public static final int ScenePlayBattleInfoNotify = 4410; - public static final int ScenePlayBattleInterruptNotify = 4441; - public static final int ScenePlayBattleResultNotify = 4447; - public static final int ScenePlayBattleUidOpNotify = 4438; - public static final int ScenePlayerInfoNotify = 236; - public static final int ScenePlayerLocationNotify = 297; - public static final int ScenePlayerSoundNotify = 243; - public static final int ScenePlayGuestReplyInviteReq = 4394; - public static final int ScenePlayGuestReplyInviteRsp = 4395; - public static final int ScenePlayGuestReplyNotify = 4425; - public static final int ScenePlayInfoListNotify = 4429; - public static final int ScenePlayInviteResultNotify = 4384; - public static final int ScenePlayOutofRegionNotify = 4405; - public static final int ScenePlayOwnerCheckReq = 4383; - public static final int ScenePlayOwnerCheckRsp = 4360; - public static final int ScenePlayOwnerInviteNotify = 4443; - public static final int ScenePlayOwnerStartInviteReq = 4365; - public static final int ScenePlayOwnerStartInviteRsp = 4387; - public static final int ScenePointUnlockNotify = 274; - public static final int SceneRouteChangeNotify = 270; - public static final int SceneTeamUpdateNotify = 1696; - public static final int SceneTimeNotify = 229; - public static final int SceneTransToPointReq = 256; - public static final int SceneTransToPointRsp = 283; - public static final int SceneWeatherForcastReq = 3167; - public static final int SceneWeatherForcastRsp = 3023; - public static final int SeaLampCoinNotify = 2152; - public static final int SeaLampContributeItemReq = 2075; - public static final int SeaLampContributeItemRsp = 2028; - public static final int SeaLampFlyLampNotify = 2062; - public static final int SeaLampFlyLampReq = 2052; - public static final int SeaLampFlyLampRsp = 2057; - public static final int SeaLampPopularityNotify = 2199; - public static final int SeaLampTakeContributionRewardReq = 2109; - public static final int SeaLampTakeContributionRewardRsp = 2132; - public static final int SeaLampTakePhaseRewardReq = 2122; - public static final int SeaLampTakePhaseRewardRsp = 2084; - public static final int SealBattleBeginNotify = 225; - public static final int SealBattleEndNotify = 249; - public static final int SealBattleProgressNotify = 285; - public static final int SeeMonsterReq = 299; - public static final int SeeMonsterRsp = 300; - public static final int SelectAsterMidDifficultyReq = 2065; - public static final int SelectAsterMidDifficultyRsp = 2058; - public static final int SelectEffigyChallengeConditionReq = 2061; - public static final int SelectEffigyChallengeConditionRsp = 2112; - public static final int SelectRoguelikeDungeonCardReq = 8964; - public static final int SelectRoguelikeDungeonCardRsp = 8572; - public static final int SelectWorktopOptionReq = 837; - public static final int SelectWorktopOptionRsp = 893; - public static final int ServerAnnounceNotify = 2103; - public static final int ServerAnnounceRevokeNotify = 2198; - public static final int ServerBuffChangeNotify = 332; + public static final int SceneGalleryInfoNotify = 5597; + public static final int SceneInitFinishReq = 237; + public static final int SceneInitFinishRsp = 232; + public static final int SceneKickPlayerNotify = 292; + public static final int SceneKickPlayerReq = 295; + public static final int SceneKickPlayerRsp = 215; + public static final int ScenePlayBattleInfoListNotify = 4447; + public static final int ScenePlayBattleInfoNotify = 4359; + public static final int ScenePlayBattleInterruptNotify = 4377; + public static final int ScenePlayBattleResultNotify = 4357; + public static final int ScenePlayBattleUidOpNotify = 4380; + public static final int ScenePlayerInfoNotify = 225; + public static final int ScenePlayerLocationNotify = 207; + public static final int ScenePlayerSoundNotify = 210; + public static final int ScenePlayGuestReplyInviteReq = 4435; + public static final int ScenePlayGuestReplyInviteRsp = 4385; + public static final int ScenePlayGuestReplyNotify = 4399; + public static final int ScenePlayInfoListNotify = 4405; + public static final int ScenePlayInviteResultNotify = 4432; + public static final int ScenePlayOutofRegionNotify = 4448; + public static final int ScenePlayOwnerCheckReq = 4381; + public static final int ScenePlayOwnerCheckRsp = 4391; + public static final int ScenePlayOwnerInviteNotify = 4367; + public static final int ScenePlayOwnerStartInviteReq = 4387; + public static final int ScenePlayOwnerStartInviteRsp = 4382; + public static final int ScenePointUnlockNotify = 290; + public static final int SceneRouteChangeNotify = 278; + public static final int SceneTeamUpdateNotify = 1699; + public static final int SceneTimeNotify = 262; + public static final int SceneTransToPointReq = 286; + public static final int SceneTransToPointRsp = 263; + public static final int SceneWeatherForcastReq = 3190; + public static final int SceneWeatherForcastRsp = 3063; + public static final int SeaLampCoinNotify = 2096; + public static final int SeaLampContributeItemReq = 2168; + public static final int SeaLampContributeItemRsp = 2159; + public static final int SeaLampFlyLampNotify = 2051; + public static final int SeaLampFlyLampReq = 2071; + public static final int SeaLampFlyLampRsp = 2019; + public static final int SeaLampPopularityNotify = 2112; + public static final int SeaLampTakeContributionRewardReq = 2069; + public static final int SeaLampTakeContributionRewardRsp = 2103; + public static final int SeaLampTakePhaseRewardReq = 2092; + public static final int SeaLampTakePhaseRewardRsp = 2160; + public static final int SealBattleBeginNotify = 273; + public static final int SealBattleEndNotify = 261; + public static final int SealBattleProgressNotify = 288; + public static final int SeeMonsterReq = 281; + public static final int SeeMonsterRsp = 264; + public static final int SelectAsterMidDifficultyReq = 2190; + public static final int SelectAsterMidDifficultyRsp = 2010; + public static final int SelectEffigyChallengeConditionReq = 2111; + public static final int SelectEffigyChallengeConditionRsp = 2068; + public static final int SelectRoguelikeDungeonCardReq = 8070; + public static final int SelectRoguelikeDungeonCardRsp = 8040; + public static final int SelectWorktopOptionReq = 832; + public static final int SelectWorktopOptionRsp = 817; + public static final int ServerAnnounceNotify = 2029; + public static final int ServerAnnounceRevokeNotify = 2141; + public static final int ServerBuffChangeNotify = 393; public static final int ServerCondMeetQuestListUpdateNotify = 401; - public static final int ServerDisconnectClientNotify = 186; - public static final int ServerGlobalValueChangeNotify = 1188; - public static final int ServerLogNotify = 79; - public static final int ServerMessageNotify = 5725; - public static final int ServerTimeNotify = 34; - public static final int ServerUpdateGlobalValueNotify = 1197; + public static final int ServerDisconnectClientNotify = 166; + public static final int ServerGlobalValueChangeNotify = 1130; + public static final int ServerLogNotify = 55; + public static final int ServerMessageNotify = 5709; + public static final int ServerTimeNotify = 82; + public static final int ServerUpdateGlobalValueNotify = 1107; public static final int SetBattlePassViewedReq = 2637; - public static final int SetBattlePassViewedRsp = 2606; - public static final int SetChatEmojiCollectionReq = 4086; - public static final int SetChatEmojiCollectionRsp = 4077; - public static final int SetCoopChapterViewedReq = 1980; - public static final int SetCoopChapterViewedRsp = 1988; - public static final int SetCurExpeditionChallengeIdReq = 2095; - public static final int SetCurExpeditionChallengeIdRsp = 2197; - public static final int SetEntityClientDataNotify = 3303; - public static final int SetEquipLockStateReq = 635; - public static final int SetEquipLockStateRsp = 657; - public static final int SetFriendEnterHomeOptionReq = 4613; - public static final int SetFriendEnterHomeOptionRsp = 4724; - public static final int SetFriendRemarkNameReq = 4023; - public static final int SetFriendRemarkNameRsp = 4013; - public static final int SetH5ActivityRedDotTimestampReq = 5698; - public static final int SetH5ActivityRedDotTimestampRsp = 5663; - public static final int SetIsAutoUnlockSpecificEquipReq = 687; - public static final int SetIsAutoUnlockSpecificEquipRsp = 604; - public static final int SetLimitOptimizationNotify = 8189; - public static final int SetNameCardReq = 4089; - public static final int SetNameCardRsp = 4009; - public static final int SetOpenStateReq = 162; - public static final int SetOpenStateRsp = 189; - public static final int SetPlayerBirthdayReq = 4097; - public static final int SetPlayerBirthdayRsp = 4088; - public static final int SetPlayerBornDataReq = 155; - public static final int SetPlayerBornDataRsp = 146; - public static final int SetPlayerHeadImageReq = 4046; - public static final int SetPlayerHeadImageRsp = 4074; - public static final int SetPlayerNameReq = 183; - public static final int SetPlayerNameRsp = 126; - public static final int SetPlayerPropReq = 188; - public static final int SetPlayerPropRsp = 128; - public static final int SetPlayerSignatureReq = 4028; - public static final int SetPlayerSignatureRsp = 4055; - public static final int SetSceneWeatherAreaReq = 271; - public static final int SetSceneWeatherAreaRsp = 205; - public static final int SetUpAvatarTeamReq = 1671; - public static final int SetUpAvatarTeamRsp = 1634; - public static final int SetUpLunchBoxWidgetReq = 4286; - public static final int SetUpLunchBoxWidgetRsp = 4293; - public static final int SetWidgetSlotReq = 4266; - public static final int SetWidgetSlotRsp = 4279; - public static final int ShowClientGuideNotify = 3190; - public static final int ShowClientTutorialNotify = 3374; - public static final int ShowCommonTipsNotify = 3277; - public static final int ShowMessageNotify = 15; - public static final int ShowTemplateReminderNotify = 3164; - public static final int SignInInfoReq = 2510; - public static final int SignInInfoRsp = 2515; - public static final int SocialDataNotify = 4063; - public static final int SpringUseReq = 1720; - public static final int SpringUseRsp = 1727; - public static final int StartArenaChallengeLevelReq = 2083; - public static final int StartArenaChallengeLevelRsp = 2097; - public static final int StartBuoyantCombatGalleryReq = 8313; - public static final int StartBuoyantCombatGalleryRsp = 8754; - public static final int StartCoopPointReq = 1956; - public static final int StartCoopPointRsp = 1962; - public static final int StartEffigyChallengeReq = 2159; - public static final int StartEffigyChallengeRsp = 2024; - public static final int StartFishingReq = 5845; - public static final int StartFishingRsp = 5848; - public static final int StartRogueEliteCellChallengeReq = 8620; - public static final int StartRogueEliteCellChallengeRsp = 8198; - public static final int StartRogueNormalCellChallengeReq = 8748; - public static final int StartRogueNormalCellChallengeRsp = 8630; - public static final int StoreItemChangeNotify = 610; - public static final int StoreItemDelNotify = 615; - public static final int StoreWeightLimitNotify = 633; - public static final int SummerTimeFloatSignalPositionNotify = 8389; - public static final int SummerTimeFloatSignalUpdateNotify = 8763; - public static final int SummerTimeSprintBoatRestartReq = 8682; - public static final int SummerTimeSprintBoatRestartRsp = 8562; - public static final int SummerTimeSprintBoatSettleNotify = 8150; - public static final int SumoDungeonSettleNotify = 8946; - public static final int SumoEnterDungeonNotify = 8540; - public static final int SumoLeaveDungeonNotify = 8460; - public static final int SumoRestartDungeonReq = 8602; - public static final int SumoRestartDungeonRsp = 8498; - public static final int SumoSaveTeamReq = 8874; - public static final int SumoSaveTeamRsp = 8287; - public static final int SumoSelectTeamAndEnterDungeonReq = 8605; - public static final int SumoSelectTeamAndEnterDungeonRsp = 8998; - public static final int SumoSetNoSwitchPunishTimeNotify = 8804; - public static final int SumoSwitchTeamReq = 8718; - public static final int SumoSwitchTeamRsp = 8356; - public static final int SyncScenePlayTeamEntityNotify = 3296; - public static final int SyncTeamEntityNotify = 338; - public static final int TakeAchievementGoalRewardReq = 2663; - public static final int TakeAchievementGoalRewardRsp = 2651; - public static final int TakeAchievementRewardReq = 2695; - public static final int TakeAchievementRewardRsp = 2698; - public static final int TakeAsterSpecialRewardReq = 2133; - public static final int TakeAsterSpecialRewardRsp = 2195; - public static final int TakeBattlePassMissionPointReq = 2617; - public static final int TakeBattlePassMissionPointRsp = 2636; - public static final int TakeBattlePassRewardReq = 2613; - public static final int TakeBattlePassRewardRsp = 2601; - public static final int TakeCityReputationExploreRewardReq = 2888; - public static final int TakeCityReputationExploreRewardRsp = 2828; - public static final int TakeCityReputationLevelRewardReq = 2810; - public static final int TakeCityReputationLevelRewardRsp = 2815; - public static final int TakeCityReputationParentQuestReq = 2893; - public static final int TakeCityReputationParentQuestRsp = 2844; - public static final int TakeCompoundOutputReq = 108; - public static final int TakeCompoundOutputRsp = 117; - public static final int TakeCoopRewardReq = 1996; - public static final int TakeCoopRewardRsp = 1981; - public static final int TakeDeliveryDailyRewardReq = 2126; - public static final int TakeDeliveryDailyRewardRsp = 2019; - public static final int TakeEffigyFirstPassRewardReq = 2113; - public static final int TakeEffigyFirstPassRewardRsp = 2008; - public static final int TakeEffigyRewardReq = 2143; - public static final int TakeEffigyRewardRsp = 2072; - public static final int TakeFirstShareRewardReq = 4008; - public static final int TakeFirstShareRewardRsp = 4017; - public static final int TakeFurnitureMakeReq = 4751; - public static final int TakeFurnitureMakeRsp = 4457; - public static final int TakeHuntingOfferReq = 4335; - public static final int TakeHuntingOfferRsp = 4325; - public static final int TakeInvestigationRewardReq = 1926; - public static final int TakeInvestigationRewardRsp = 1925; - public static final int TakeInvestigationTargetRewardReq = 1915; - public static final int TakeInvestigationTargetRewardRsp = 1929; - public static final int TakeMaterialDeleteReturnReq = 651; - public static final int TakeMaterialDeleteReturnRsp = 684; - public static final int TakeoffEquipReq = 655; - public static final int TakeoffEquipRsp = 646; - public static final int TakeOfferingLevelRewardReq = 2921; - public static final int TakeOfferingLevelRewardRsp = 2910; - public static final int TakePlayerLevelRewardReq = 151; - public static final int TakePlayerLevelRewardRsp = 184; - public static final int TakeRegionSearchRewardReq = 5645; - public static final int TakeRegionSearchRewardRsp = 5648; - public static final int TakeResinCardDailyRewardReq = 4136; - public static final int TakeResinCardDailyRewardRsp = 4143; - public static final int TakeReunionFirstGiftRewardReq = 5095; - public static final int TakeReunionFirstGiftRewardRsp = 5098; - public static final int TakeReunionMissionRewardReq = 5056; - public static final int TakeReunionMissionRewardRsp = 5062; - public static final int TakeReunionSignInRewardReq = 5067; - public static final int TakeReunionSignInRewardRsp = 5086; - public static final int TakeReunionWatcherRewardReq = 5065; - public static final int TakeReunionWatcherRewardRsp = 5077; - public static final int TaskVarNotify = 178; - public static final int TeamResonanceChangeNotify = 1046; - public static final int TowerAllDataReq = 2445; - public static final int TowerAllDataRsp = 2475; - public static final int TowerBriefDataNotify = 2460; - public static final int TowerBuffSelectReq = 2497; - public static final int TowerBuffSelectRsp = 2488; - public static final int TowerCurLevelRecordChangeNotify = 2410; - public static final int TowerDailyRewardProgressChangeNotify = 2415; - public static final int TowerEnterLevelReq = 2479; - public static final int TowerEnterLevelRsp = 2491; - public static final int TowerFloorRecordChangeNotify = 2433; - public static final int TowerGetFloorStarRewardReq = 2489; - public static final int TowerGetFloorStarRewardRsp = 2409; - public static final int TowerLevelEndNotify = 2464; + public static final int SetBattlePassViewedRsp = 2632; + public static final int SetChatEmojiCollectionReq = 4066; + public static final int SetChatEmojiCollectionRsp = 4048; + public static final int SetCoopChapterViewedReq = 1956; + public static final int SetCoopChapterViewedRsp = 1998; + public static final int SetCurExpeditionChallengeIdReq = 2130; + public static final int SetCurExpeditionChallengeIdRsp = 2093; + public static final int SetEntityClientDataNotify = 3375; + public static final int SetEquipLockStateReq = 604; + public static final int SetEquipLockStateRsp = 605; + public static final int SetFriendEnterHomeOptionReq = 4761; + public static final int SetFriendEnterHomeOptionRsp = 4590; + public static final int SetFriendRemarkNameReq = 4070; + public static final int SetFriendRemarkNameRsp = 4029; + public static final int SetH5ActivityRedDotTimestampReq = 5654; + public static final int SetH5ActivityRedDotTimestampRsp = 5678; + public static final int SetIsAutoUnlockSpecificEquipReq = 639; + public static final int SetIsAutoUnlockSpecificEquipRsp = 695; + public static final int SetLimitOptimizationNotify = 8194; + public static final int SetNameCardReq = 4006; + public static final int SetNameCardRsp = 4019; + public static final int SetOpenStateReq = 138; + public static final int SetOpenStateRsp = 106; + public static final int SetPlayerBirthdayReq = 4007; + public static final int SetPlayerBirthdayRsp = 4030; + public static final int SetPlayerBornDataReq = 198; + public static final int SetPlayerBornDataRsp = 145; + public static final int SetPlayerHeadImageReq = 4045; + public static final int SetPlayerHeadImageRsp = 4090; + public static final int SetPlayerNameReq = 163; + public static final int SetPlayerNameRsp = 124; + public static final int SetPlayerPropReq = 130; + public static final int SetPlayerPropRsp = 197; + public static final int SetPlayerSignatureReq = 4097; + public static final int SetPlayerSignatureRsp = 4098; + public static final int SetSceneWeatherAreaReq = 256; + public static final int SetSceneWeatherAreaRsp = 265; + public static final int SetUpAvatarTeamReq = 1753; + public static final int SetUpAvatarTeamRsp = 1664; + public static final int SetUpLunchBoxWidgetReq = 4297; + public static final int SetUpLunchBoxWidgetRsp = 4266; + public static final int SetWidgetSlotReq = 4269; + public static final int SetWidgetSlotRsp = 4260; + public static final int ShowClientGuideNotify = 3241; + public static final int ShowClientTutorialNotify = 3079; + public static final int ShowCommonTipsNotify = 3357; + public static final int ShowMessageNotify = 37; + public static final int ShowTemplateReminderNotify = 3011; + public static final int SignInInfoReq = 2541; + public static final int SignInInfoRsp = 2537; + public static final int SocialDataNotify = 4054; + public static final int SpringUseReq = 1623; + public static final int SpringUseRsp = 1733; + public static final int StartArenaChallengeLevelReq = 2154; + public static final int StartArenaChallengeLevelRsp = 2191; + public static final int StartBuoyantCombatGalleryReq = 9000; + public static final int StartBuoyantCombatGalleryRsp = 8364; + public static final int StartCoopPointReq = 1982; + public static final int StartCoopPointRsp = 1964; + public static final int StartEffigyChallengeReq = 2157; + public static final int StartEffigyChallengeRsp = 2008; + public static final int StartFishingReq = 5843; + public static final int StartFishingRsp = 5804; + public static final int StartRogueEliteCellChallengeReq = 8722; + public static final int StartRogueEliteCellChallengeRsp = 8876; + public static final int StartRogueNormalCellChallengeReq = 8456; + public static final int StartRogueNormalCellChallengeRsp = 8156; + public static final int StoreItemChangeNotify = 641; + public static final int StoreItemDelNotify = 637; + public static final int StoreWeightLimitNotify = 631; + public static final int SummerTimeFloatSignalPositionNotify = 8622; + public static final int SummerTimeFloatSignalUpdateNotify = 8333; + public static final int SummerTimeSprintBoatRestartReq = 8175; + public static final int SummerTimeSprintBoatRestartRsp = 8563; + public static final int SummerTimeSprintBoatSettleNotify = 8117; + public static final int SumoDungeonSettleNotify = 8426; + public static final int SumoEnterDungeonNotify = 8727; + public static final int SumoLeaveDungeonNotify = 8440; + public static final int SumoRestartDungeonReq = 8585; + public static final int SumoRestartDungeonRsp = 8628; + public static final int SumoSaveTeamReq = 8970; + public static final int SumoSaveTeamRsp = 8890; + public static final int SumoSelectTeamAndEnterDungeonReq = 8030; + public static final int SumoSelectTeamAndEnterDungeonRsp = 8915; + public static final int SumoSetNoSwitchPunishTimeNotify = 8269; + public static final int SumoSwitchTeamReq = 8400; + public static final int SumoSwitchTeamRsp = 8442; + public static final int SyncScenePlayTeamEntityNotify = 3096; + public static final int SyncTeamEntityNotify = 334; + public static final int TakeAchievementGoalRewardReq = 2678; + public static final int TakeAchievementGoalRewardRsp = 2653; + public static final int TakeAchievementRewardReq = 2693; + public static final int TakeAchievementRewardRsp = 2654; + public static final int TakeAsterSpecialRewardReq = 2174; + public static final int TakeAsterSpecialRewardRsp = 2035; + public static final int TakeBattlePassMissionPointReq = 2626; + public static final int TakeBattlePassMissionPointRsp = 2647; + public static final int TakeBattlePassRewardReq = 2628; + public static final int TakeBattlePassRewardRsp = 2603; + public static final int TakeCityReputationExploreRewardReq = 2830; + public static final int TakeCityReputationExploreRewardRsp = 2897; + public static final int TakeCityReputationLevelRewardReq = 2841; + public static final int TakeCityReputationLevelRewardRsp = 2837; + public static final int TakeCityReputationParentQuestReq = 2817; + public static final int TakeCityReputationParentQuestRsp = 2885; + public static final int TakeCompoundOutputReq = 146; + public static final int TakeCompoundOutputRsp = 133; + public static final int TakeCoopRewardReq = 1977; + public static final int TakeCoopRewardRsp = 1965; + public static final int TakeDeliveryDailyRewardReq = 2037; + public static final int TakeDeliveryDailyRewardRsp = 2083; + public static final int TakeEffigyFirstPassRewardReq = 2200; + public static final int TakeEffigyFirstPassRewardRsp = 2073; + public static final int TakeEffigyRewardReq = 2062; + public static final int TakeEffigyRewardRsp = 2110; + public static final int TakeFirstShareRewardReq = 4046; + public static final int TakeFirstShareRewardRsp = 4033; + public static final int TakeFurnitureMakeReq = 4768; + public static final int TakeFurnitureMakeRsp = 4599; + public static final int TakeHuntingOfferReq = 4318; + public static final int TakeHuntingOfferRsp = 4309; + public static final int TakeInvestigationRewardReq = 1925; + public static final int TakeInvestigationRewardRsp = 1903; + public static final int TakeInvestigationTargetRewardReq = 1901; + public static final int TakeInvestigationTargetRewardRsp = 1908; + public static final int TakeMaterialDeleteReturnReq = 660; + public static final int TakeMaterialDeleteReturnRsp = 677; + public static final int TakeoffEquipReq = 698; + public static final int TakeoffEquipRsp = 645; + public static final int TakeOfferingLevelRewardReq = 2903; + public static final int TakeOfferingLevelRewardRsp = 2902; + public static final int TakePlayerLevelRewardReq = 160; + public static final int TakePlayerLevelRewardRsp = 177; + public static final int TakeRegionSearchRewardReq = 5643; + public static final int TakeRegionSearchRewardRsp = 5604; + public static final int TakeResinCardDailyRewardReq = 4147; + public static final int TakeResinCardDailyRewardRsp = 4116; + public static final int TakeReunionFirstGiftRewardReq = 5093; + public static final int TakeReunionFirstGiftRewardRsp = 5054; + public static final int TakeReunionMissionRewardReq = 5082; + public static final int TakeReunionMissionRewardRsp = 5064; + public static final int TakeReunionSignInRewardReq = 5076; + public static final int TakeReunionSignInRewardRsp = 5097; + public static final int TakeReunionWatcherRewardReq = 5052; + public static final int TakeReunionWatcherRewardRsp = 5063; + public static final int TaskVarNotify = 191; + public static final int TeamResonanceChangeNotify = 1045; + public static final int TowerAllDataReq = 2435; + public static final int TowerAllDataRsp = 2449; + public static final int TowerBriefDataNotify = 2409; + public static final int TowerBuffSelectReq = 2407; + public static final int TowerBuffSelectRsp = 2430; + public static final int TowerCurLevelRecordChangeNotify = 2441; + public static final int TowerDailyRewardProgressChangeNotify = 2437; + public static final int TowerEnterLevelReq = 2455; + public static final int TowerEnterLevelRsp = 2427; + public static final int TowerFloorRecordChangeNotify = 2431; + public static final int TowerGetFloorStarRewardReq = 2406; + public static final int TowerGetFloorStarRewardRsp = 2419; + public static final int TowerLevelEndNotify = 2442; public static final int TowerLevelStarCondNotify = 2401; - public static final int TowerMiddleLevelChangeTeamNotify = 2466; - public static final int TowerRecordHandbookReq = 2473; - public static final int TowerRecordHandbookRsp = 2463; - public static final int TowerSurrenderReq = 2426; - public static final int TowerSurrenderRsp = 2462; - public static final int TowerTeamSelectReq = 2493; - public static final int TowerTeamSelectRsp = 2444; - public static final int TreasureMapBonusChallengeNotify = 2188; - public static final int TreasureMapCurrencyNotify = 2177; - public static final int TreasureMapDetectorDataNotify = 4271; - public static final int TreasureMapGuideTaskDoneNotify = 2186; - public static final int TreasureMapHostInfoNotify = 8960; - public static final int TreasureMapMpChallengeNotify = 2200; - public static final int TreasureMapPreTaskDoneNotify = 2007; - public static final int TreasureMapRegionActiveNotify = 2121; - public static final int TreasureMapRegionInfoNotify = 2141; - public static final int TrialAvatarFirstPassDungeonNotify = 2055; - public static final int TrialAvatarInDungeonIndexNotify = 2104; - public static final int TriggerCreateGadgetToEquipPartNotify = 373; - public static final int TriggerRoguelikeCurseNotify = 8878; - public static final int TriggerRoguelikeRuneReq = 8607; - public static final int TriggerRoguelikeRuneRsp = 8246; - public static final int TryEnterHomeReq = 4622; - public static final int TryEnterHomeRsp = 4731; - public static final int UnfreezeGroupLimitNotify = 3401; - public static final int UnionCmdNotify = 55; - public static final int UnlockAvatarTalentReq = 1060; - public static final int UnlockAvatarTalentRsp = 1033; - public static final int UnlockCoopChapterReq = 1965; - public static final int UnlockCoopChapterRsp = 1977; - public static final int UnlockedFurnitureFormulaDataNotify = 4700; - public static final int UnlockedFurnitureSuiteDataNotify = 4788; + public static final int TowerMiddleLevelChangeTeamNotify = 2411; + public static final int TowerRecordHandbookReq = 2422; + public static final int TowerRecordHandbookRsp = 2454; + public static final int TowerSurrenderReq = 2424; + public static final int TowerSurrenderRsp = 2438; + public static final int TowerTeamSelectReq = 2417; + public static final int TowerTeamSelectRsp = 2485; + public static final int TreasureMapBonusChallengeNotify = 2075; + public static final int TreasureMapCurrencyNotify = 2098; + public static final int TreasureMapDetectorDataNotify = 4291; + public static final int TreasureMapGuideTaskDoneNotify = 2088; + public static final int TreasureMapHostInfoNotify = 8206; + public static final int TreasureMapMpChallengeNotify = 2036; + public static final int TreasureMapPreTaskDoneNotify = 2055; + public static final int TreasureMapRegionActiveNotify = 2059; + public static final int TreasureMapRegionInfoNotify = 2106; + public static final int TrialAvatarFirstPassDungeonNotify = 2137; + public static final int TrialAvatarInDungeonIndexNotify = 2024; + public static final int TriggerCreateGadgetToEquipPartNotify = 322; + public static final int TriggerRoguelikeCurseNotify = 8235; + public static final int TriggerRoguelikeRuneReq = 8138; + public static final int TriggerRoguelikeRuneRsp = 8781; + public static final int TryEnterHomeReq = 4553; + public static final int TryEnterHomeRsp = 4610; + public static final int UnfreezeGroupLimitNotify = 3253; + public static final int UnionCmdNotify = 98; + public static final int UnlockAvatarTalentReq = 1009; + public static final int UnlockAvatarTalentRsp = 1031; + public static final int UnlockCoopChapterReq = 1952; + public static final int UnlockCoopChapterRsp = 1963; + public static final int UnlockedFurnitureFormulaDataNotify = 4680; + public static final int UnlockedFurnitureSuiteDataNotify = 4717; public static final int UnlockNameCardNotify = 4001; - public static final int UnlockPersonalLineReq = 402; - public static final int UnlockPersonalLineRsp = 452; - public static final int UnlockTransPointReq = 3421; - public static final int UnlockTransPointRsp = 3073; - public static final int UnmarkEntityInMinMapNotify = 247; - public static final int UpdateAbilityCreatedMovingPlatformNotify = 828; - public static final int UpdatePlayerShowAvatarListReq = 4036; - public static final int UpdatePlayerShowAvatarListRsp = 4024; - public static final int UpdatePlayerShowNameCardListReq = 4030; - public static final int UpdatePlayerShowNameCardListRsp = 4047; - public static final int UpdatePS4BlockListReq = 4081; - public static final int UpdatePS4BlockListRsp = 4027; - public static final int UpdatePS4FriendListNotify = 4056; - public static final int UpdatePS4FriendListReq = 4025; - public static final int UpdatePS4FriendListRsp = 4049; - public static final int UpdateRedPointNotify = 9; + public static final int UnlockPersonalLineReq = 476; + public static final int UnlockPersonalLineRsp = 472; + public static final int UnlockTransPointReq = 3228; + public static final int UnlockTransPointRsp = 3101; + public static final int UnmarkEntityInMinMapNotify = 216; + public static final int UpdateAbilityCreatedMovingPlatformNotify = 897; + public static final int UpdatePlayerShowAvatarListReq = 4025; + public static final int UpdatePlayerShowAvatarListRsp = 4083; + public static final int UpdatePlayerShowNameCardListReq = 4002; + public static final int UpdatePlayerShowNameCardListRsp = 4016; + public static final int UpdatePS4BlockListReq = 4036; + public static final int UpdatePS4BlockListRsp = 4028; + public static final int UpdatePS4FriendListNotify = 4086; + public static final int UpdatePS4FriendListReq = 4073; + public static final int UpdatePS4FriendListRsp = 4061; + public static final int UpdateRedPointNotify = 19; public static final int UpdateReunionWatcherNotify = 5087; - public static final int UpgradeRoguelikeShikigamiReq = 8575; - public static final int UpgradeRoguelikeShikigamiRsp = 8440; - public static final int UseItemReq = 645; - public static final int UseItemRsp = 675; - public static final int UseMiracleRingReq = 5235; - public static final int UseMiracleRingRsp = 5225; - public static final int UseWidgetCreateGadgetReq = 4278; - public static final int UseWidgetCreateGadgetRsp = 4290; - public static final int UseWidgetRetractGadgetReq = 4255; - public static final int UseWidgetRetractGadgetRsp = 4297; - public static final int VehicleInteractReq = 862; - public static final int VehicleInteractRsp = 889; - public static final int VehicleStaminaNotify = 866; - public static final int ViewCodexReq = 4210; - public static final int ViewCodexRsp = 4209; - public static final int WatcherAllDataNotify = 2260; - public static final int WatcherChangeNotify = 2233; - public static final int WatcherEventNotify = 2210; - public static final int WatcherEventTypeNotify = 2215; - public static final int WaterSpritePhaseFinishNotify = 2036; - public static final int WeaponAwakenReq = 664; + public static final int UpgradeRoguelikeShikigamiReq = 8422; + public static final int UpgradeRoguelikeShikigamiRsp = 8671; + public static final int UseItemReq = 635; + public static final int UseItemRsp = 649; + public static final int UseMiracleRingReq = 5218; + public static final int UseMiracleRingRsp = 5209; + public static final int UseWidgetCreateGadgetReq = 4283; + public static final int UseWidgetCreateGadgetRsp = 4279; + public static final int UseWidgetRetractGadgetReq = 4290; + public static final int UseWidgetRetractGadgetRsp = 4271; + public static final int VehicleInteractReq = 838; + public static final int VehicleInteractRsp = 806; + public static final int VehicleStaminaNotify = 811; + public static final int ViewCodexReq = 4203; + public static final int ViewCodexRsp = 4202; + public static final int WatcherAllDataNotify = 2209; + public static final int WatcherChangeNotify = 2231; + public static final int WatcherEventNotify = 2241; + public static final int WatcherEventTypeNotify = 2237; + public static final int WaterSpritePhaseFinishNotify = 2028; + public static final int WeaponAwakenReq = 642; public static final int WeaponAwakenRsp = 601; - public static final int WeaponPromoteReq = 626; - public static final int WeaponPromoteRsp = 662; - public static final int WeaponUpgradeReq = 656; - public static final int WeaponUpgradeRsp = 683; - public static final int WearEquipReq = 688; - public static final int WearEquipRsp = 628; - public static final int WidgetActiveChangeNotify = 4273; - public static final int WidgetCoolDownNotify = 4277; - public static final int WidgetDoBagReq = 4269; - public static final int WidgetDoBagRsp = 4270; - public static final int WidgetGadgetAllDataNotify = 4260; - public static final int WidgetGadgetDataNotify = 4268; - public static final int WidgetGadgetDestroyNotify = 4282; + public static final int WeaponPromoteReq = 624; + public static final int WeaponPromoteRsp = 638; + public static final int WeaponUpgradeReq = 686; + public static final int WeaponUpgradeRsp = 663; + public static final int WearEquipReq = 630; + public static final int WearEquipRsp = 697; + public static final int WidgetActiveChangeNotify = 4295; + public static final int WidgetCoolDownNotify = 4263; + public static final int WidgetDoBagReq = 4284; + public static final int WidgetDoBagRsp = 4286; + public static final int WidgetGadgetAllDataNotify = 4285; + public static final int WidgetGadgetDataNotify = 4292; + public static final int WidgetGadgetDestroyNotify = 4275; public static final int WidgetReportReq = 4287; - public static final int WidgetReportRsp = 4256; - public static final int WidgetSlotChangeNotify = 4299; - public static final int WidgetUseAttachAbilityGroupChangeNotify = 4257; - public static final int WindSeedClientNotify = 1134; - public static final int WorktopOptionNotify = 815; - public static final int WorldAllRoutineTypeNotify = 3525; - public static final int WorldDataNotify = 3330; - public static final int WorldOwnerBlossomBriefInfoNotify = 2715; - public static final int WorldOwnerBlossomScheduleInfoNotify = 2737; - public static final int WorldOwnerDailyTaskNotify = 130; - public static final int WorldPlayerDieNotify = 211; - public static final int WorldPlayerInfoNotify = 3088; - public static final int WorldPlayerLocationNotify = 224; - public static final int WorldPlayerReviveReq = 216; - public static final int WorldPlayerReviveRsp = 222; - public static final int WorldPlayerRTTNotify = 26; - public static final int WorldRoutineChangeNotify = 3548; - public static final int WorldRoutineTypeCloseNotify = 3513; - public static final int WorldRoutineTypeRefreshNotify = 3545; + public static final int WidgetReportRsp = 4282; + public static final int WidgetSlotChangeNotify = 4274; + public static final int WidgetUseAttachAbilityGroupChangeNotify = 4299; + public static final int WindSeedClientNotify = 1182; + public static final int WorktopOptionNotify = 837; + public static final int WorldAllRoutineTypeNotify = 3509; + public static final int WorldDataNotify = 3131; + public static final int WorldOwnerBlossomBriefInfoNotify = 2737; + public static final int WorldOwnerBlossomScheduleInfoNotify = 2732; + public static final int WorldOwnerDailyTaskNotify = 102; + public static final int WorldPlayerDieNotify = 296; + public static final int WorldPlayerInfoNotify = 3304; + public static final int WorldPlayerLocationNotify = 283; + public static final int WorldPlayerReviveReq = 247; + public static final int WorldPlayerReviveRsp = 280; + public static final int WorldPlayerRTTNotify = 24; + public static final int WorldRoutineChangeNotify = 3504; + public static final int WorldRoutineTypeCloseNotify = 3528; + public static final int WorldRoutineTypeRefreshNotify = 3543; // Unknown - public static final int UNKNOWN_2 = 343; - public static final int UNKNOWN_3 = 4259; - public static final int UNKNOWN_4 = 4261; - public static final int UNKNOWN_13 = 5932; - public static final int UNKNOWN_14 = 5959; - public static final int UNKNOWN_15 = 67; - public static final int UNKNOWN_16 = 8010; - public static final int UNKNOWN_17 = 8024; - public static final int UNKNOWN_18 = 8050; - public static final int UNKNOWN_19 = 8077; - public static final int UNKNOWN_20 = 8083; - public static final int UNKNOWN_21 = 8114; - public static final int UNKNOWN_22 = 8154; - public static final int UNKNOWN_23 = 8157; - public static final int UNKNOWN_24 = 8188; - public static final int UNKNOWN_25 = 8190; - public static final int UNKNOWN_26 = 8210; - public static final int UNKNOWN_27 = 8385; - public static final int UNKNOWN_28 = 8405; - public static final int UNKNOWN_29 = 8420; - public static final int UNKNOWN_30 = 8421; - public static final int UNKNOWN_31 = 8429; - public static final int UNKNOWN_32 = 8437; - public static final int UNKNOWN_33 = 8439; - public static final int UNKNOWN_34 = 8461; - public static final int UNKNOWN_35 = 8502; - public static final int UNKNOWN_36 = 8559; - public static final int UNKNOWN_37 = 8580; - public static final int UNKNOWN_38 = 8604; - public static final int UNKNOWN_39 = 8710; - public static final int UNKNOWN_40 = 8761; - public static final int UNKNOWN_41 = 8787; - public static final int UNKNOWN_42 = 8830; - public static final int UNKNOWN_43 = 8877; - public static final int UNKNOWN_44 = 8983; - public static final int UNKNOWN_45 = 943; public static final HashSet BANNED_PACKETS = new HashSet() {{ add(PacketOpcodes.WindSeedClientNotify); diff --git a/README.md b/README.md index 4bb5badf..fcdc5215 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Anime Game Protos 2.6 (For Grasscutters) +# Anime Game Protos 2.7 (For Grasscutters) This repository contains the [ProtoBuf](https://github.com/google/protobuf) `.proto` files for Anime Game API.
## Credits diff --git a/proto/AbilityAppliedAbility.proto b/proto/AbilityAppliedAbility.proto index 87b0955a..f190d1d8 100644 --- a/proto/AbilityAppliedAbility.proto +++ b/proto/AbilityAppliedAbility.proto @@ -2,8 +2,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "AbilityString.proto"; import "AbilityScalarValueEntry.proto"; +import "AbilityString.proto"; message AbilityAppliedAbility { AbilityString ability_name = 1; diff --git a/proto/AbilityAppliedModifier.proto b/proto/AbilityAppliedModifier.proto index 82972e67..dc4da809 100644 --- a/proto/AbilityAppliedModifier.proto +++ b/proto/AbilityAppliedModifier.proto @@ -2,8 +2,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "AbilityString.proto"; import "AbilityAttachedModifier.proto"; +import "AbilityString.proto"; import "ModifierDurability.proto"; message AbilityAppliedModifier { diff --git a/proto/AbilityAttachedModifier.proto b/proto/AbilityAttachedModifier.proto index 8f996b4b..cce85e48 100644 --- a/proto/AbilityAttachedModifier.proto +++ b/proto/AbilityAttachedModifier.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message AbilityAttachedModifier { bool is_invalid = 1; uint32 owner_entity_id = 2; diff --git a/proto/AbilityChangeNotify.proto b/proto/AbilityChangeNotify.proto index 9dfa12ef..d6bad016 100644 --- a/proto/AbilityChangeNotify.proto +++ b/proto/AbilityChangeNotify.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "AbilityControlBlock.proto"; +// CmdId: 1155 +// EnetChannelId: 0 +// EnetIsReliable: true message AbilityChangeNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1112; - } - - uint32 entity_id = 1; - AbilityControlBlock ability_control_block = 2; + uint32 entity_id = 3; + AbilityControlBlock ability_control_block = 10; } diff --git a/proto/AbilityEmbryo.proto b/proto/AbilityEmbryo.proto index e21840e6..98b6aa76 100644 --- a/proto/AbilityEmbryo.proto +++ b/proto/AbilityEmbryo.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message AbilityEmbryo { uint32 ability_id = 1; fixed32 ability_name_hash = 2; diff --git a/proto/AbilityGadgetInfo.proto b/proto/AbilityGadgetInfo.proto index 94afb789..b2eaf39b 100644 --- a/proto/AbilityGadgetInfo.proto +++ b/proto/AbilityGadgetInfo.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message AbilityGadgetInfo { uint32 camp_id = 1; uint32 camp_target_type = 2; diff --git a/proto/AbilityIdentifier.proto b/proto/AbilityIdentifier.proto index e771d23f..544e13dd 100644 --- a/proto/AbilityIdentifier.proto +++ b/proto/AbilityIdentifier.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message AbilityIdentifier { uint32 instanced_ability_id = 1; uint32 ability_caster_id = 2; diff --git a/proto/AbilityInvocationsNotify.proto b/proto/AbilityInvocationsNotify.proto index bf37fd5b..b49deb93 100644 --- a/proto/AbilityInvocationsNotify.proto +++ b/proto/AbilityInvocationsNotify.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "AbilityInvokeEntry.proto"; +// CmdId: 1131 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message AbilityInvocationsNotify { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 1118; - } - - repeated AbilityInvokeEntry invokes = 1; + repeated AbilityInvokeEntry invokes = 8; } diff --git a/proto/AbilityInvokeArgument.proto b/proto/AbilityInvokeArgument.proto index ec8eb0f2..b5e3de7e 100644 --- a/proto/AbilityInvokeArgument.proto +++ b/proto/AbilityInvokeArgument.proto @@ -3,52 +3,58 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum AbilityInvokeArgument { - ABILITY_NONE = 0; - ABILITY_META_MODIFIER_CHANGE = 1; - ABILITY_META_COMMAND_MODIFIER_CHANGE_REQUEST = 2; - ABILITY_META_SPECIAL_FLOAT_ARGUMENT = 3; - ABILITY_META_OVERRIDE_PARAM = 4; - ABILITY_META_CLEAR_OVERRIDE_PARAM = 5; - ABILITY_META_REINIT_OVERRIDEMAP = 6; - ABILITY_META_GLOBAL_FLOAT_VALUE = 7; - ABILITY_META_CLEAR_GLOBAL_FLOAT_VALUE = 8; - ABILITY_META_ABILITY_ELEMENT_STRENGTH = 9; - ABILITY_META_ADD_OR_GET_ABILITY_AND_TRIGGER = 10; - ABILITY_META_SET_KILLED_SETATE = 11; - ABILITY_META_SET_ABILITY_TRIGGER = 12; - ABILITY_META_ADD_NEW_ABILITY = 13; - ABILITY_META_REMOVE_ABILITY = 14; - ABILITY_META_SET_MODIFIER_APPLY_ENTITY = 15; - ABILITY_META_MODIFIER_DURABILITY_CHANGE = 16; - ABILITY_META_ELEMENT_REACTION_VISUAL = 17; - ABILITY_META_SET_POSE_PARAMETER = 18; - ABILITY_META_UPDATE_BASE_REACTION_DAMAGE = 19; - ABILITY_META_TRIGGER_ELEMENT_REACTION = 20; - ABILITY_META_LOSE_HP = 21; - ABILITY_ACTION_TRIGGER_ABILITY = 50; - ABILITY_ACTION_SET_CRASH_DAMAGE = 51; - ABILITY_ACTION_EFFECT = 52; - ABILITY_ACTION_SUMMON = 53; - ABILITY_ACTION_BLINK = 54; - ABILITY_ACTION_CREATE_GADGET = 55; - ABILITY_ACTION_APPLY_LEVEL_MODIFIER = 56; - ABILITY_ACTION_GENERATE_ELEM_BALL = 57; - ABILITY_ACTION_SET_RANDOM_OVERRIDE_MAP_VALUE = 58; - ABILITY_ACTION_SERVER_MONSTER_LOG = 59; - ABILITY_ACTION_CREATE_TILE = 60; - ABILITY_ACTION_DESTROY_TILE = 61; - ABILITY_ACTION_FIRE_AFTER_IMAGE = 62; - ABILITY_MIXIN_AVATAR_STEER_BY_CAMERA = 100; - ABILITY_MIXIN_MONSTER_DEFEND = 101; - ABILITY_MIXIN_WIND_ZONE = 102; - ABILITY_MIXIN_COST_STAMINA = 103; - ABILITY_MIXIN_ELITE_SHIELD = 104; - ABILITY_MIXIN_ELEMENT_SHIELD = 105; - ABILITY_MIXIN_GLOBAL_SHIELD = 106; - ABILITY_MIXIN_SHIELD_BAR = 107; - ABILITY_MIXIN_WIND_SEED_SPAWNER = 108; - ABILITY_MIXIN_DO_ACTION_BY_ELEMENT_REACTION = 109; - ABILITY_MIXIN_FIELD_ENTITY_COUNT_CHANGE = 110; - ABILITY_MIXIN_SCENE_PROP_SYNC = 111; - ABILITY_MIXIN_WIDGET_MP_SUPPORT = 112; + 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_JDDDLJELBLJ = 22; + ABILITY_INVOKE_ARGUMENT_ACTION_TRIGGER_ABILITY = 50; + ABILITY_INVOKE_ARGUMENT_ACTION_SET_CRASH_DAMAGE = 51; + ABILITY_INVOKE_ARGUMENT_ACTION_EFFECT = 52; + ABILITY_INVOKE_ARGUMENT_ACTION_SUMMON = 53; + ABILITY_INVOKE_ARGUMENT_ACTION_BLINK = 54; + ABILITY_INVOKE_ARGUMENT_ACTION_CREATE_GADGET = 55; + ABILITY_INVOKE_ARGUMENT_ACTION_APPLY_LEVEL_MODIFIER = 56; + ABILITY_INVOKE_ARGUMENT_ACTION_GENERATE_ELEM_BALL = 57; + ABILITY_INVOKE_ARGUMENT_ACTION_SET_RANDOM_OVERRIDE_MAP_VALUE = 58; + ABILITY_INVOKE_ARGUMENT_ACTION_SERVER_MONSTER_LOG = 59; + ABILITY_INVOKE_ARGUMENT_ACTION_CREATE_TILE = 60; + ABILITY_INVOKE_ARGUMENT_ACTION_DESTROY_TILE = 61; + ABILITY_INVOKE_ARGUMENT_ACTION_FIRE_AFTER_IMAGE = 62; + ABILITY_INVOKE_ARGUMENT_FNANDDPDLOL = 63; + 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_NJHBFADEOON = 113; + ABILITY_INVOKE_ARGUMENT_EGCIFFFLLBG = 114; + ABILITY_INVOKE_ARGUMENT_OFDGFACOLDI = 115; + ABILITY_INVOKE_ARGUMENT_KDPKJGJNGFB = 116; } diff --git a/proto/AbilityInvokeEntry.proto b/proto/AbilityInvokeEntry.proto index 6c0fcdf5..74603b8a 100644 --- a/proto/AbilityInvokeEntry.proto +++ b/proto/AbilityInvokeEntry.proto @@ -2,8 +2,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "AbilityInvokeEntryHead.proto"; import "AbilityInvokeArgument.proto"; +import "AbilityInvokeEntryHead.proto"; import "ForwardType.proto"; message AbilityInvokeEntry { diff --git a/proto/AbilityInvokeEntryHead.proto b/proto/AbilityInvokeEntryHead.proto index 649f0d4e..5cfe8178 100644 --- a/proto/AbilityInvokeEntryHead.proto +++ b/proto/AbilityInvokeEntryHead.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message AbilityInvokeEntryHead { uint32 instanced_ability_id = 1; uint32 instanced_modifier_id = 2; diff --git a/proto/AbilityMixinRecoverInfo.proto b/proto/AbilityMixinRecoverInfo.proto index ac085979..03b28e89 100644 --- a/proto/AbilityMixinRecoverInfo.proto +++ b/proto/AbilityMixinRecoverInfo.proto @@ -5,12 +5,12 @@ option java_package = "emu.grasscutter.net.proto"; import "MassivePropSyncInfo.proto"; message AbilityMixinRecoverInfo { - oneof Source { - uint32 instanced_ability_id = 1; - uint32 instanced_modifier_id = 2; - } uint32 local_id = 3; repeated uint32 data_list = 4; bool is_serverbuff_modifier = 5; repeated MassivePropSyncInfo massive_prop_list = 6; + oneof source { + uint32 instanced_ability_id = 1; + uint32 instanced_modifier_id = 2; + } } diff --git a/proto/AbilityScalarType.proto b/proto/AbilityScalarType.proto index 39015624..bc0e33c2 100644 --- a/proto/AbilityScalarType.proto +++ b/proto/AbilityScalarType.proto @@ -3,11 +3,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum AbilityScalarType { - UNKNOW = 0; - FLOAT = 1; - INT = 2; - BOOL = 3; - TRIGGER = 4; - STRING = 5; - UINT = 6; + ABILITY_SCALAR_TYPE_UNKNOW = 0; + ABILITY_SCALAR_TYPE_FLOAT = 1; + ABILITY_SCALAR_TYPE_INT = 2; + ABILITY_SCALAR_TYPE_BOOL = 3; + ABILITY_SCALAR_TYPE_TRIGGER = 4; + ABILITY_SCALAR_TYPE_STRING = 5; + ABILITY_SCALAR_TYPE_UINT = 6; } diff --git a/proto/AbilityScalarValueEntry.proto b/proto/AbilityScalarValueEntry.proto index 2f51275d..18a88c49 100644 --- a/proto/AbilityScalarValueEntry.proto +++ b/proto/AbilityScalarValueEntry.proto @@ -2,16 +2,16 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "AbilityString.proto"; import "AbilityScalarType.proto"; +import "AbilityString.proto"; message AbilityScalarValueEntry { - oneof Value { + AbilityString key = 1; + AbilityScalarType value_type = 2; + oneof value { float float_value = 3; string string_value = 4; int32 int_value = 5; uint32 uint_value = 6; } - AbilityString key = 1; - AbilityScalarType value_type = 2; } diff --git a/proto/AbilityString.proto b/proto/AbilityString.proto index 8462b363..1e8254aa 100644 --- a/proto/AbilityString.proto +++ b/proto/AbilityString.proto @@ -2,9 +2,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message AbilityString { - oneof Type { + oneof type { string str = 1; uint32 hash = 2; } diff --git a/proto/AbilitySyncStateInfo.proto b/proto/AbilitySyncStateInfo.proto index 2fab5e3b..a2e760a7 100644 --- a/proto/AbilitySyncStateInfo.proto +++ b/proto/AbilitySyncStateInfo.proto @@ -2,10 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "AbilityScalarValueEntry.proto"; import "AbilityAppliedAbility.proto"; import "AbilityAppliedModifier.proto"; import "AbilityMixinRecoverInfo.proto"; +import "AbilityScalarValueEntry.proto"; message AbilitySyncStateInfo { bool is_inited = 1; diff --git a/proto/ActivityInfo.proto b/proto/ActivityInfo.proto index 373c8e2e..069c3933 100644 --- a/proto/ActivityInfo.proto +++ b/proto/ActivityInfo.proto @@ -2,45 +2,43 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "ActivityNullDetailInfo.proto"; import "ActivityWatcherInfo.proto"; +/*import "ArenaChallengeActivityDetailInfo.proto"; +import "AsterActivityDetailInfo.proto"; +import "BlessingActivityDetailInfo.proto"; +import "BlitzRushActivityDetailInfo.proto"; +import "BounceConjuringActivityDetailInfo.proto"; +import "BuoyantCombatDetailInfo.proto"; +import "ChannelerSlabActivityDetailInfo.proto"; +import "ChessActivityDetailInfo.proto"; +import "CrucibleActivityDetailInfo.proto"; +import "DeliveryActivityDetailInfo.proto"; +import "DigActivityDetailInfo.proto"; +import "DragonSpineActivityDetailInfo.proto"; +import "EchoShellDetailInfo.proto"; +import "EffigyActivityDetailInfo.proto"; +import "ExpeditionActivityDetailInfo.proto"; +import "FindHilichurlDetailInfo.proto"; +import "FleurFairActivityDetailInfo.proto"; +import "FlightActivityDetailInfo.proto"; +import "HideAndSeekActivityDetailInfo.proto"; +import "LunaRiteDetailInfo.proto"; +import "MistTrialActivityDetailInfo.proto"; +import "MoonfinTrialActivityDetailInfo.proto"; +import "MusicGameActivityDetailInfo.proto"; +import "PlantFlowerActivityDetailInfo.proto"; +import "RoguelikeDungeonActivityDetailInfo.proto"; +import "SalesmanActivityDetailInfo.proto"; +import "SeaLampActivityDetailInfo.proto"; +import "SeaLampActivityInfo.proto"; +import "SummerTimeDetailInfo.proto"; +import "SumoActivityDetailInfo.proto"; +import "TreasureMapActivityDetailInfo.proto"; +import "TrialAvatarActivityDetailInfo.proto"; +import "WaterSpiritActivityDetailInfo.proto";*/ +import "MusicGameActivityDetailInfo.proto"; message ActivityInfo { - oneof Detail { - ActivityNullDetailInfo sam_lamp_info = 11; - ActivityNullDetailInfo crucible_info = 12; - ActivityNullDetailInfo salesman_info = 13; - ActivityNullDetailInfo trial_avatar_info = 14; - ActivityNullDetailInfo delivery_info = 16; - ActivityNullDetailInfo aster_info = 21; - ActivityNullDetailInfo flight_info = 25; - ActivityNullDetailInfo dragon_spine_info = 31; - ActivityNullDetailInfo effigy_info = 32; - ActivityNullDetailInfo treasure_map_info = 35; - ActivityNullDetailInfo blessing_info = 41; - ActivityNullDetailInfo sea_lamp_info = 42; - ActivityNullDetailInfo expedition_info = 43; - ActivityNullDetailInfo arena_challenge_info = 44; - ActivityNullDetailInfo fleur_fair_info = 51; - ActivityNullDetailInfo water_spirit_info = 52; - ActivityNullDetailInfo challneler_slab_info = 61; - ActivityNullDetailInfo mist_trial_activity_info = 62; - ActivityNullDetailInfo hide_and_seek_info = 63; - ActivityNullDetailInfo find_hilichurl_info = 64; - ActivityNullDetailInfo summer_time_info = 65; - ActivityNullDetailInfo buoyant_combat_info = 66; - ActivityNullDetailInfo echo_shell_info = 67; - ActivityNullDetailInfo bounce_conjuring_info = 68; - ActivityNullDetailInfo blitz_rush_info = 69; - ActivityNullDetailInfo chess_info = 70; - ActivityNullDetailInfo sumo_info = 71; - ActivityNullDetailInfo moonfin_trial_info = 72; - ActivityNullDetailInfo luna_rite_info = 73; - ActivityNullDetailInfo plant_flower_info = 74; - ActivityNullDetailInfo music_game_info = 75; - ActivityNullDetailInfo roguelike_dungoen_info = 76; - ActivityNullDetailInfo dig_info = 77; - } uint32 activity_id = 1; uint32 schedule_id = 2; uint32 begin_time = 3; @@ -59,4 +57,57 @@ message ActivityInfo { repeated uint32 taken_reward_list = 24; bool is_hidden = 26; uint32 first_day_start_time = 27; + //bool MIFCLBCMKJI = 28; + //bool BPGCBIEDEDM = 29; + //map AGKPABKOHDA = 30; + oneof detail { +// SeaLampActivityDetailInfo sam_lamp_info = 11; +// CrucibleActivityDetailInfo crucible_info = 12; +// SalesmanActivityDetailInfo salesman_info = 13; +// TrialAvatarActivityDetailInfo trial_avatar_info = 14; +// DeliveryActivityDetailInfo delivery_info = 16; +// AsterActivityDetailInfo aster_info = 21; +// FlightActivityDetailInfo flight_info = 25; +// DragonSpineActivityDetailInfo dragon_spine_info = 31; +// EffigyActivityDetailInfo effigy_info = 32; +// TreasureMapActivityDetailInfo treasure_map_info = 35; +// BlessingActivityDetailInfo blessing_info = 41; +// SeaLampActivityInfo sea_lamp_info = 42; +// ExpeditionActivityDetailInfo expedition_info = 43; +// ArenaChallengeActivityDetailInfo arena_challenge_info = 44; +// FleurFairActivityDetailInfo fleur_fair_info = 51; +// WaterSpiritActivityDetailInfo water_spirit_info = 52; +// ChannelerSlabActivityDetailInfo challneler_slab_info = 61; +// MistTrialActivityDetailInfo mist_trial_activity_info = 62; +// HideAndSeekActivityDetailInfo hide_and_seek_info = 63; +// FindHilichurlDetailInfo find_hilichurl_info = 64; +// SummerTimeDetailInfo summer_time_info = 65; +// BuoyantCombatDetailInfo buoyant_combat_info = 66; +// EchoShellDetailInfo echo_shell_info = 67; +// BounceConjuringActivityDetailInfo bounce_conjuring_info = 68; +// BlitzRushActivityDetailInfo blitz_rush_info = 69; +// ChessActivityDetailInfo chess_info = 70; +// SumoActivityDetailInfo sumo_info = 71; +// MoonfinTrialActivityDetailInfo moonfin_trial_info = 72; +// LunaRiteDetailInfo luna_rite_info = 73; +// PlantFlowerActivityDetailInfo plant_flower_info = 74; + MusicGameActivityDetailInfo music_game_info = 75; +// RoguelikeDungeonActivityDetailInfo roguelike_dungoen_info = 76; +// DigActivityDetailInfo dig_info = 77; +// DOCNGBMKEID hachi_info = 78; +// DLHPBNNDGFI winter_camp_info = 79; +// IFACCKLEJCC potion_info = 80; +// PFMCPMIMGLM tanuki_travel_activity_info = 81; +// JEIAODKGIBD lantern_rite_activity_info = 82; +// EPDOGGKOCAP michiae_matsuri_info = 83; +// NHMFHLIGAKL bartender_info = 84; +// EAGKNMCLJDI ugc_info = 85; +// ADPBMLFDHJD crystal_link_info = 86; +// JACDNLEIDOO irodori_info = 87; +// EHDKFDJEEGP photo_info = 88; +// BEPFLAKHNHL spice_info = 89; +// MMNEJBFMAEA gacha_info = 90; +// JLMHDDHOGGD luminance_stone_challenge_info = 91; +// IGBMCJOPGIL rogue_diary_info = 92; + } } diff --git a/proto/ActivityInfoNotify.proto b/proto/ActivityInfoNotify.proto new file mode 100644 index 00000000..2d9f1893 --- /dev/null +++ b/proto/ActivityInfoNotify.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "ActivityInfo.proto"; + +// CmdId: 2125 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message ActivityInfoNotify { + ActivityInfo activity_info = 11; +} diff --git a/proto/ActivityScheduleInfo.proto b/proto/ActivityScheduleInfo.proto new file mode 100644 index 00000000..ad33f7bb --- /dev/null +++ b/proto/ActivityScheduleInfo.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message ActivityScheduleInfo { + uint32 activity_id = 1; + bool is_open = 2; + uint32 schedule_id = 3; + uint32 begin_time = 4; + uint32 end_time = 5; +} diff --git a/proto/ActivityScheduleInfoNotify.proto b/proto/ActivityScheduleInfoNotify.proto new file mode 100644 index 00000000..724bcb3b --- /dev/null +++ b/proto/ActivityScheduleInfoNotify.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "ActivityScheduleInfo.proto"; + +// CmdId: 2033 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message ActivityScheduleInfoNotify { + repeated ActivityScheduleInfo activity_schedule_list = 8; + uint32 remain_fly_sea_lamp_num = 12; +} diff --git a/proto/ActivityTakeWatcherRewardReq.proto b/proto/ActivityTakeWatcherRewardReq.proto new file mode 100644 index 00000000..24352d3d --- /dev/null +++ b/proto/ActivityTakeWatcherRewardReq.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 2090 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message ActivityTakeWatcherRewardReq { + uint32 activity_id = 11; + uint32 watcher_id = 7; +} diff --git a/proto/ActivityTakeWatcherRewardRsp.proto b/proto/ActivityTakeWatcherRewardRsp.proto new file mode 100644 index 00000000..60b68461 --- /dev/null +++ b/proto/ActivityTakeWatcherRewardRsp.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 2025 +// EnetChannelId: 0 +// EnetIsReliable: true +message ActivityTakeWatcherRewardRsp { + int32 retcode = 10; + uint32 activity_id = 8; + uint32 watcher_id = 7; +} diff --git a/proto/ActivityUpdateWatcherNotify.proto b/proto/ActivityUpdateWatcherNotify.proto new file mode 100644 index 00000000..986078c4 --- /dev/null +++ b/proto/ActivityUpdateWatcherNotify.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "ActivityWatcherInfo.proto"; + +// CmdId: 2172 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message ActivityUpdateWatcherNotify { + uint32 activity_id = 10; + ActivityWatcherInfo watcher_info = 7; +} diff --git a/proto/ActivityWatcherInfo.proto b/proto/ActivityWatcherInfo.proto index fa82861c..6a2293b2 100644 --- a/proto/ActivityWatcherInfo.proto +++ b/proto/ActivityWatcherInfo.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message ActivityWatcherInfo { uint32 watcher_id = 1; uint32 cur_progress = 2; diff --git a/proto/AddQuestContentProgressReq.proto b/proto/AddQuestContentProgressReq.proto new file mode 100644 index 00000000..7dc73118 --- /dev/null +++ b/proto/AddQuestContentProgressReq.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 417 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message AddQuestContentProgressReq { + uint32 content_type = 9; + uint32 param = 13; + uint32 add_progress = 11; +} diff --git a/proto/AddQuestContentProgressRsp.proto b/proto/AddQuestContentProgressRsp.proto new file mode 100644 index 00000000..fdfc27f3 --- /dev/null +++ b/proto/AddQuestContentProgressRsp.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 485 +// EnetChannelId: 0 +// EnetIsReliable: true +message AddQuestContentProgressRsp { + int32 retcode = 10; + uint32 content_type = 7; +} diff --git a/proto/AiSkillCdInfo.proto b/proto/AiSkillCdInfo.proto index e0e20573..b03331b1 100644 --- a/proto/AiSkillCdInfo.proto +++ b/proto/AiSkillCdInfo.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message AiSkillCdInfo { map skill_cd_map = 1; map skill_group_cd_map = 2; diff --git a/proto/AiSyncInfo.proto b/proto/AiSyncInfo.proto index b279f202..42784191 100644 --- a/proto/AiSyncInfo.proto +++ b/proto/AiSyncInfo.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message AiSyncInfo { uint32 entity_id = 1; bool has_path_to_target = 2; diff --git a/proto/AiThreatInfo.proto b/proto/AiThreatInfo.proto index 24e2083d..828d1ff6 100644 --- a/proto/AiThreatInfo.proto +++ b/proto/AiThreatInfo.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message AiThreatInfo { map ai_threat_map = 1; } diff --git a/proto/AllWidgetDataNotify.proto b/proto/AllWidgetDataNotify.proto index 252d56ce..8b0eaf34 100644 --- a/proto/AllWidgetDataNotify.proto +++ b/proto/AllWidgetDataNotify.proto @@ -2,28 +2,25 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "LunchBoxData.proto"; import "AnchorPointData.proto"; -import "OneoffGatherPointDetectorData.proto"; +// import "CCEOEOHLAPK.proto"; import "ClientCollectorData.proto"; +import "LunchBoxData.proto"; +import "OneoffGatherPointDetectorData.proto"; import "WidgetCoolDownData.proto"; import "WidgetSlotData.proto"; +// CmdId: 4273 +// EnetChannelId: 0 +// EnetIsReliable: true message AllWidgetDataNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4260; - } - - repeated AnchorPointData anchor_point_list = 2; - uint32 next_anchor_point_usable_time = 3; - LunchBoxData lunch_box_data = 5; - repeated OneoffGatherPointDetectorData oneoff_gather_point_detector_data_list = 6; - repeated ClientCollectorData client_collector_data_list = 7; - repeated WidgetCoolDownData cool_down_group_data_list = 8; - repeated WidgetCoolDownData normal_cool_down_data_list = 9; - repeated WidgetSlotData slot_list = 11; + repeated AnchorPointData anchor_point_list = 13; + uint32 next_anchor_point_usable_time = 10; + LunchBoxData lunch_box_data = 11; + repeated OneoffGatherPointDetectorData oneoff_gather_point_detector_data_list = 5; + repeated ClientCollectorData client_collector_data_list = 6; + repeated WidgetCoolDownData cool_down_group_data_list = 2; + repeated WidgetCoolDownData normal_cool_down_data_list = 4; + repeated WidgetSlotData slot_list = 3; + // CCEOEOHLAPK KNPDHPEGCHI = 12; } diff --git a/proto/AnchorPointData.proto b/proto/AnchorPointData.proto index 0bdbe0fe..9ad59136 100644 --- a/proto/AnchorPointData.proto +++ b/proto/AnchorPointData.proto @@ -9,4 +9,5 @@ message AnchorPointData { Vector pos = 2; Vector rot = 3; uint32 end_time = 4; + uint32 scene_id = 5; } diff --git a/proto/AnchorPointDataNotify.proto b/proto/AnchorPointDataNotify.proto index 82153fd0..eee61096 100644 --- a/proto/AnchorPointDataNotify.proto +++ b/proto/AnchorPointDataNotify.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "AnchorPointData.proto"; +// CmdId: 4268 +// EnetChannelId: 0 +// EnetIsReliable: true message AnchorPointDataNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4253; - } - - repeated AnchorPointData anchor_point_list = 1; - uint32 next_usable_time = 2; + repeated AnchorPointData anchor_point_list = 14; + uint32 next_usable_time = 6; } diff --git a/proto/AnchorPointOpReq.proto b/proto/AnchorPointOpReq.proto index 2bfc2f3f..f9882e62 100644 --- a/proto/AnchorPointOpReq.proto +++ b/proto/AnchorPointOpReq.proto @@ -2,23 +2,17 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4254 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message AnchorPointOpReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4255; - } + uint32 anchor_point_op_type = 6; + uint32 anchor_point_id = 1; enum AnchorPointOpType { - ANCHOR_POINT_OP_NONE = 0; - ANCHOR_POINT_OP_TELEPORT = 1; - ANCHOR_POINT_OP_REMOVE = 2; + ANCHOR_POINT_OP_TYPE_NONE = 0; + ANCHOR_POINT_OP_TYPE_TELEPORT = 1; + ANCHOR_POINT_OP_TYPE_REMOVE = 2; } - - uint32 anchor_point_op_type = 1; - uint32 anchor_point_id = 2; } diff --git a/proto/AnchorPointOpRsp.proto b/proto/AnchorPointOpRsp.proto index c5ce92af..db8852b0 100644 --- a/proto/AnchorPointOpRsp.proto +++ b/proto/AnchorPointOpRsp.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4278 +// EnetChannelId: 0 +// EnetIsReliable: true message AnchorPointOpRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4274; - } - - int32 retcode = 1; - uint32 anchor_point_op_type = 2; - uint32 anchor_point_id = 3; + int32 retcode = 13; + uint32 anchor_point_op_type = 3; + uint32 anchor_point_id = 2; } diff --git a/proto/AnimatorParameterValueInfo.proto b/proto/AnimatorParameterValueInfo.proto index fd74b7e4..8c1b5a2c 100644 --- a/proto/AnimatorParameterValueInfo.proto +++ b/proto/AnimatorParameterValueInfo.proto @@ -2,12 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message AnimatorParameterValueInfo { - oneof ParaVal { + uint32 para_type = 1; + oneof para_val { int32 int_val = 2; float float_val = 3; bool bool_val = 4; } - uint32 para_type = 1; } diff --git a/proto/AnnounceData.proto b/proto/AnnounceData.proto new file mode 100644 index 00000000..8ed9ed84 --- /dev/null +++ b/proto/AnnounceData.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message AnnounceData { + uint32 config_id = 1; + uint32 begin_time = 2; + uint32 end_time = 3; + string center_system_text = 4; + string count_down_text = 5; + string dungeon_confirm_text = 6; + uint32 center_system_frequency = 7; + uint32 count_down_frequency = 8; + bool is_center_system_last_5_every_minutes = 9; +} diff --git a/proto/AskAddFriendNotify.proto b/proto/AskAddFriendNotify.proto index 647ca561..736bca43 100644 --- a/proto/AskAddFriendNotify.proto +++ b/proto/AskAddFriendNotify.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "FriendBrief.proto"; +// CmdId: 4038 +// EnetChannelId: 0 +// EnetIsReliable: true message AskAddFriendNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4006; - } - - uint32 target_uid = 1; - FriendBrief target_friend_brief = 2; + uint32 target_uid = 13; + FriendBrief target_friend_brief = 10; } diff --git a/proto/AskAddFriendReq.proto b/proto/AskAddFriendReq.proto index 65c89ea2..75b74678 100644 --- a/proto/AskAddFriendReq.proto +++ b/proto/AskAddFriendReq.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4032 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message AskAddFriendReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4100; - } - - uint32 target_uid = 1; + uint32 target_uid = 8; } diff --git a/proto/AskAddFriendRsp.proto b/proto/AskAddFriendRsp.proto index 12493c5b..2643456f 100644 --- a/proto/AskAddFriendRsp.proto +++ b/proto/AskAddFriendRsp.proto @@ -2,18 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4017 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message AskAddFriendRsp { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4001; - } - - int32 retcode = 1; - uint32 target_uid = 2; - uint32 param = 3; + int32 retcode = 11; + uint32 target_uid = 14; + uint32 param = 13; } diff --git a/proto/AttackHitEffectResult.proto b/proto/AttackHitEffectResult.proto index b3e0ec3d..918d23a7 100644 --- a/proto/AttackHitEffectResult.proto +++ b/proto/AttackHitEffectResult.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message AttackHitEffectResult { uint32 hit_eff_level = 1; float retreat_strength = 2; diff --git a/proto/AttackResult.proto b/proto/AttackResult.proto index 6b55dd58..458188ba 100644 --- a/proto/AttackResult.proto +++ b/proto/AttackResult.proto @@ -3,9 +3,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "AbilityIdentifier.proto"; +import "AttackHitEffectResult.proto"; import "HitCollision.proto"; import "Vector.proto"; -import "AttackHitEffectResult.proto"; message AttackResult { uint32 attacker_id = 1; @@ -37,4 +37,5 @@ message AttackResult { float endure_delta = 37; uint32 target_type = 38; float element_durability_attenuation = 39; + uint32 EGPFEACDCLP = 40; } diff --git a/proto/AvatarAddNotify.proto b/proto/AvatarAddNotify.proto index 72375aa8..afdf4204 100644 --- a/proto/AvatarAddNotify.proto +++ b/proto/AvatarAddNotify.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "AvatarInfo.proto"; +// CmdId: 1757 +// EnetChannelId: 0 +// EnetIsReliable: true message AvatarAddNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1795; - } - - AvatarInfo avatar = 1; - bool is_in_team = 2; + AvatarInfo avatar = 11; + bool is_in_team = 15; } diff --git a/proto/AvatarChangeCostumeNotify.proto b/proto/AvatarChangeCostumeNotify.proto index cb4c611a..814bd3fd 100644 --- a/proto/AvatarChangeCostumeNotify.proto +++ b/proto/AvatarChangeCostumeNotify.proto @@ -4,14 +4,9 @@ option java_package = "emu.grasscutter.net.proto"; import "SceneEntityInfo.proto"; +// CmdId: 1780 +// EnetChannelId: 0 +// EnetIsReliable: true message AvatarChangeCostumeNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1724; - } - SceneEntityInfo entity_info = 1; } diff --git a/proto/AvatarChangeCostumeReq.proto b/proto/AvatarChangeCostumeReq.proto index 5da0ffd9..a3a7b4fe 100644 --- a/proto/AvatarChangeCostumeReq.proto +++ b/proto/AvatarChangeCostumeReq.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1734 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message AvatarChangeCostumeReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 1606; - } - - uint64 avatar_guid = 1; - uint32 costume_id = 2; + uint64 avatar_guid = 7; + uint32 costume_id = 8; } diff --git a/proto/AvatarChangeCostumeRsp.proto b/proto/AvatarChangeCostumeRsp.proto index e4e60bc9..e72ca326 100644 --- a/proto/AvatarChangeCostumeRsp.proto +++ b/proto/AvatarChangeCostumeRsp.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1723 +// EnetChannelId: 0 +// EnetIsReliable: true message AvatarChangeCostumeRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1748; - } - - int32 retcode = 1; - uint64 avatar_guid = 2; - uint32 costume_id = 3; + int32 retcode = 15; + uint64 avatar_guid = 3; + uint32 costume_id = 1; } diff --git a/proto/AvatarChangeElementTypeReq.proto b/proto/AvatarChangeElementTypeReq.proto new file mode 100644 index 00000000..74ddd0f2 --- /dev/null +++ b/proto/AvatarChangeElementTypeReq.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 1706 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message AvatarChangeElementTypeReq { + uint32 scene_id = 15; + uint32 area_id = 4; +} diff --git a/proto/AvatarChangeElementTypeRsp.proto b/proto/AvatarChangeElementTypeRsp.proto new file mode 100644 index 00000000..e0eb66ce --- /dev/null +++ b/proto/AvatarChangeElementTypeRsp.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 1708 +// EnetChannelId: 0 +// EnetIsReliable: true +message AvatarChangeElementTypeRsp { + int32 retcode = 15; +} diff --git a/proto/AvatarDataNotify.proto b/proto/AvatarDataNotify.proto index dd93c8c3..cd344ab1 100644 --- a/proto/AvatarDataNotify.proto +++ b/proto/AvatarDataNotify.proto @@ -5,20 +5,15 @@ option java_package = "emu.grasscutter.net.proto"; import "AvatarInfo.proto"; import "AvatarTeam.proto"; +// CmdId: 1695 +// EnetChannelId: 0 +// EnetIsReliable: true message AvatarDataNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1694; - } - - repeated AvatarInfo avatar_list = 1; - map avatar_team_map = 2; - uint32 cur_avatar_team_id = 3; - fixed64 choose_avatar_guid = 4; - repeated uint64 temp_avatar_guid_list = 5; - repeated uint32 owned_flycloak_list = 6; + repeated AvatarInfo avatar_list = 15; + map avatar_team_map = 6; + uint32 cur_avatar_team_id = 2; + fixed64 choose_avatar_guid = 11; + repeated uint64 temp_avatar_guid_list = 14; + repeated uint32 owned_flycloak_list = 8; repeated uint32 owned_costume_list = 7; } diff --git a/proto/AvatarDieAnimationEndReq.proto b/proto/AvatarDieAnimationEndReq.proto index de301fc9..28cd9d59 100644 --- a/proto/AvatarDieAnimationEndReq.proto +++ b/proto/AvatarDieAnimationEndReq.proto @@ -4,17 +4,12 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; +// CmdId: 1616 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message AvatarDieAnimationEndReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 1737; - } - - uint64 die_guid = 1; - uint32 skill_id = 2; - Vector reborn_pos = 3; + uint64 die_guid = 14; + uint32 skill_id = 4; + Vector reborn_pos = 13; } diff --git a/proto/AvatarDieAnimationEndRsp.proto b/proto/AvatarDieAnimationEndRsp.proto index 58c9ecb7..eca9beb7 100644 --- a/proto/AvatarDieAnimationEndRsp.proto +++ b/proto/AvatarDieAnimationEndRsp.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1765 +// EnetChannelId: 0 +// EnetIsReliable: true message AvatarDieAnimationEndRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1697; - } - - int32 retcode = 1; - uint64 die_guid = 2; - uint32 skill_id = 3; + int32 retcode = 12; + uint64 die_guid = 11; + uint32 skill_id = 13; } diff --git a/proto/AvatarEquipAffixInfo.proto b/proto/AvatarEquipAffixInfo.proto index ef4a49fa..ed0c4130 100644 --- a/proto/AvatarEquipAffixInfo.proto +++ b/proto/AvatarEquipAffixInfo.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message AvatarEquipAffixInfo { uint32 equip_affix_id = 1; uint32 left_cd_time = 2; diff --git a/proto/AvatarEquipChangeNotify.proto b/proto/AvatarEquipChangeNotify.proto index c69c73f8..95535b7b 100644 --- a/proto/AvatarEquipChangeNotify.proto +++ b/proto/AvatarEquipChangeNotify.proto @@ -2,23 +2,18 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "SceneWeaponInfo.proto"; import "SceneReliquaryInfo.proto"; +import "SceneWeaponInfo.proto"; +// CmdId: 690 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message AvatarEquipChangeNotify { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 615; - } - uint64 avatar_guid = 1; uint32 equip_type = 2; - uint32 item_id = 3; + uint32 item_id = 8; uint64 equip_guid = 4; - SceneWeaponInfo weapon = 5; - SceneReliquaryInfo reliquary = 6; + SceneWeaponInfo weapon = 13; + SceneReliquaryInfo reliquary = 11; } diff --git a/proto/AvatarExpeditionAllDataRsp.proto b/proto/AvatarExpeditionAllDataRsp.proto index 5ff61dbc..535b9e8e 100644 --- a/proto/AvatarExpeditionAllDataRsp.proto +++ b/proto/AvatarExpeditionAllDataRsp.proto @@ -1,19 +1,15 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "AvatarExpeditionInfo.proto"; +// CmdId: 1636 +// EnetChannelId: 0 +// EnetIsReliable: true message AvatarExpeditionAllDataRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1783; - } - - int32 retcode = 1; - map expedition_info_map = 2; - repeated uint32 open_expedition_list = 3; - uint32 expedition_count_limit = 4; + int32 retcode = 11; + map expedition_info_map = 1; + repeated uint32 open_expedition_list = 6; + uint32 expedition_count_limit = 7; } diff --git a/proto/AvatarExpeditionCallBackReq.proto b/proto/AvatarExpeditionCallBackReq.proto index b1131a2a..fefc45cb 100644 --- a/proto/AvatarExpeditionCallBackReq.proto +++ b/proto/AvatarExpeditionCallBackReq.proto @@ -2,15 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 1655 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message AvatarExpeditionCallBackReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 1618; - } - - repeated uint64 avatar_guid = 1; + repeated uint64 avatar_guid = 12; } diff --git a/proto/AvatarExpeditionCallBackRsp.proto b/proto/AvatarExpeditionCallBackRsp.proto index 75adca0f..6cd5ab85 100644 --- a/proto/AvatarExpeditionCallBackRsp.proto +++ b/proto/AvatarExpeditionCallBackRsp.proto @@ -1,17 +1,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "AvatarExpeditionInfo.proto"; +// CmdId: 1642 +// EnetChannelId: 0 +// EnetIsReliable: true message AvatarExpeditionCallBackRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1633; - } - int32 retcode = 1; - map expedition_info_map = 2; + map expedition_info_map = 14; } diff --git a/proto/AvatarExpeditionDataNotify.proto b/proto/AvatarExpeditionDataNotify.proto index 8adef648..68983c60 100644 --- a/proto/AvatarExpeditionDataNotify.proto +++ b/proto/AvatarExpeditionDataNotify.proto @@ -1,16 +1,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "AvatarExpeditionInfo.proto"; +// CmdId: 1698 +// EnetChannelId: 0 +// EnetIsReliable: true message AvatarExpeditionDataNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1621; - } - map expedition_info_map = 1; } diff --git a/proto/AvatarExpeditionGetRewardReq.proto b/proto/AvatarExpeditionGetRewardReq.proto index 847f96fe..58f34055 100644 --- a/proto/AvatarExpeditionGetRewardReq.proto +++ b/proto/AvatarExpeditionGetRewardReq.proto @@ -2,15 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 1603 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message AvatarExpeditionGetRewardReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 1610; - } - - uint64 avatar_guid = 1; + uint64 avatar_guid = 5; } diff --git a/proto/AvatarExpeditionGetRewardRsp.proto b/proto/AvatarExpeditionGetRewardRsp.proto index c494b77a..818c9cf2 100644 --- a/proto/AvatarExpeditionGetRewardRsp.proto +++ b/proto/AvatarExpeditionGetRewardRsp.proto @@ -1,19 +1,16 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "AvatarExpeditionInfo.proto"; - import "ItemParam.proto"; -message AvatarExpeditionGetRewardRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1670; - } - int32 retcode = 1; - map expedition_info_map = 2; - repeated ItemParam item_list = 3; +// CmdId: 1646 +// EnetChannelId: 0 +// EnetIsReliable: true +message AvatarExpeditionGetRewardRsp { + int32 retcode = 15; + map expedition_info_map = 5; + repeated ItemParam item_list = 6; + repeated ItemParam BNFDDKNNJJH = 2; } diff --git a/proto/AvatarExpeditionInfo.proto b/proto/AvatarExpeditionInfo.proto index 180482bd..ae52bd88 100644 --- a/proto/AvatarExpeditionInfo.proto +++ b/proto/AvatarExpeditionInfo.proto @@ -1,6 +1,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "AvatarExpeditionState.proto"; message AvatarExpeditionInfo { diff --git a/proto/AvatarExpeditionStartReq.proto b/proto/AvatarExpeditionStartReq.proto index cbfe1a15..d40f3072 100644 --- a/proto/AvatarExpeditionStartReq.proto +++ b/proto/AvatarExpeditionStartReq.proto @@ -2,17 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 1675 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message AvatarExpeditionStartReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 1609; - } - - uint64 avatar_guid = 1; + uint64 avatar_guid = 8; uint32 exp_id = 2; - uint32 hour_time = 3; + uint32 hour_time = 7; } diff --git a/proto/AvatarExpeditionStartRsp.proto b/proto/AvatarExpeditionStartRsp.proto index c48fe2ad..b289cc46 100644 --- a/proto/AvatarExpeditionStartRsp.proto +++ b/proto/AvatarExpeditionStartRsp.proto @@ -1,17 +1,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "AvatarExpeditionInfo.proto"; +// CmdId: 1688 +// EnetChannelId: 0 +// EnetIsReliable: true message AvatarExpeditionStartRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1646; - } - - int32 retcode = 1; - map expedition_info_map = 2; + int32 retcode = 4; + map expedition_info_map = 1; } diff --git a/proto/AvatarExpeditionState.proto b/proto/AvatarExpeditionState.proto index 7b43570a..7ec3f8f7 100644 --- a/proto/AvatarExpeditionState.proto +++ b/proto/AvatarExpeditionState.proto @@ -3,9 +3,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum AvatarExpeditionState { - AVATAR_EXPEDITION_NONE = 0; - AVATAR_EXPEDITION_DOING = 1; - AVATAR_EXPEDITION_FINISH_WAIT_REWARD = 2; - AVATAR_EXPEDITION_CALLBACK_WAIT_REWARD = 3; - AVATAR_EXPEDITION_LOCKED = 4; + AVATAR_EXPEDITION_STATE_NONE = 0; + AVATAR_EXPEDITION_STATE_DOING = 1; + AVATAR_EXPEDITION_STATE_FINISH_WAIT_REWARD = 2; + AVATAR_EXPEDITION_STATE_CALLBACK_WAIT_REWARD = 3; + AVATAR_EXPEDITION_STATE_LOCKED = 4; } diff --git a/proto/AvatarFetterDataNotify.proto b/proto/AvatarFetterDataNotify.proto index cace9aba..22232231 100644 --- a/proto/AvatarFetterDataNotify.proto +++ b/proto/AvatarFetterDataNotify.proto @@ -4,14 +4,9 @@ option java_package = "emu.grasscutter.net.proto"; import "AvatarFetterInfo.proto"; +// CmdId: 1777 +// EnetChannelId: 0 +// EnetIsReliable: true message AvatarFetterDataNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1685; - } - map fetter_info_map = 1; } diff --git a/proto/AvatarFetterLevelRewardReq.proto b/proto/AvatarFetterLevelRewardReq.proto index 56d941a7..b9ec5192 100644 --- a/proto/AvatarFetterLevelRewardReq.proto +++ b/proto/AvatarFetterLevelRewardReq.proto @@ -2,16 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 1704 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message AvatarFetterLevelRewardReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 1624; - } - - uint64 avatar_guid = 1; + uint64 avatar_guid = 15; uint32 fetter_level = 2; } diff --git a/proto/AvatarFetterLevelRewardRsp.proto b/proto/AvatarFetterLevelRewardRsp.proto index 0fbc864e..684a9df0 100644 --- a/proto/AvatarFetterLevelRewardRsp.proto +++ b/proto/AvatarFetterLevelRewardRsp.proto @@ -2,17 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 1606 +// EnetChannelId: 0 +// EnetIsReliable: true message AvatarFetterLevelRewardRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1704; - } - - int32 retcode = 1; - uint64 avatar_guid = 2; - uint32 fetter_level = 3; - uint32 reward_id = 4; + int32 retcode = 14; + uint64 avatar_guid = 12; + uint32 fetter_level = 10; + uint32 reward_id = 11; } diff --git a/proto/AvatarFightPropNotify.proto b/proto/AvatarFightPropNotify.proto index 00a50c17..9d48d260 100644 --- a/proto/AvatarFightPropNotify.proto +++ b/proto/AvatarFightPropNotify.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1232 +// EnetChannelId: 0 +// EnetIsReliable: true message AvatarFightPropNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1300; - } - - uint64 avatar_guid = 1; - map fight_prop_map = 2; + uint64 avatar_guid = 3; + map fight_prop_map = 6; } diff --git a/proto/AvatarFightPropUpdateNotify.proto b/proto/AvatarFightPropUpdateNotify.proto index c187c296..75ca268a 100644 --- a/proto/AvatarFightPropUpdateNotify.proto +++ b/proto/AvatarFightPropUpdateNotify.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1217 +// EnetChannelId: 0 +// EnetIsReliable: true message AvatarFightPropUpdateNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1201; - } - uint64 avatar_guid = 1; - map fight_prop_map = 2; + map fight_prop_map = 6; } diff --git a/proto/AvatarFlycloakChangeNotify.proto b/proto/AvatarFlycloakChangeNotify.proto index e7a92573..7ccc4688 100644 --- a/proto/AvatarFlycloakChangeNotify.proto +++ b/proto/AvatarFlycloakChangeNotify.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1681 +// EnetChannelId: 0 +// EnetIsReliable: true message AvatarFlycloakChangeNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1759; - } - - uint64 avatar_guid = 1; - uint32 flycloak_id = 2; + uint64 avatar_guid = 12; + uint32 flycloak_id = 14; } diff --git a/proto/AvatarGainCostumeNotify.proto b/proto/AvatarGainCostumeNotify.proto index 2989054c..c64ff586 100644 --- a/proto/AvatarGainCostumeNotify.proto +++ b/proto/AvatarGainCostumeNotify.proto @@ -2,15 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1670 +// EnetChannelId: 0 +// EnetIsReliable: true message AvatarGainCostumeNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1734; - } - - uint32 costume_id = 1; + uint32 costume_id = 15; } diff --git a/proto/AvatarGainFlycloakNotify.proto b/proto/AvatarGainFlycloakNotify.proto index a3450d09..b3826956 100644 --- a/proto/AvatarGainFlycloakNotify.proto +++ b/proto/AvatarGainFlycloakNotify.proto @@ -2,15 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1615 +// EnetChannelId: 0 +// EnetIsReliable: true message AvatarGainFlycloakNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1604; - } - - uint32 flycloak_id = 1; + uint32 flycloak_id = 2; } diff --git a/proto/AvatarInfo.proto b/proto/AvatarInfo.proto index 3b77c904..717300ca 100644 --- a/proto/AvatarInfo.proto +++ b/proto/AvatarInfo.proto @@ -2,13 +2,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "TrialAvatarInfo.proto"; -import "AvatarFetterInfo.proto"; -import "AvatarExpeditionState.proto"; -import "AvatarExcelInfo.proto"; -import "PropValue.proto"; -import "AvatarSkillInfo.proto"; import "AvatarEquipAffixInfo.proto"; +import "AvatarExcelInfo.proto"; +import "AvatarExpeditionState.proto"; +import "AvatarFetterInfo.proto"; +import "AvatarSkillInfo.proto"; +import "PropValue.proto"; +import "TrialAvatarInfo.proto"; message AvatarInfo { uint32 avatar_id = 1; diff --git a/proto/AvatarLifeStateChangeNotify.proto b/proto/AvatarLifeStateChangeNotify.proto index 9b0b8102..6888cb90 100644 --- a/proto/AvatarLifeStateChangeNotify.proto +++ b/proto/AvatarLifeStateChangeNotify.proto @@ -5,20 +5,15 @@ option java_package = "emu.grasscutter.net.proto"; import "PlayerDieType.proto"; import "ServerBuff.proto"; +// CmdId: 1235 +// EnetChannelId: 0 +// EnetIsReliable: true message AvatarLifeStateChangeNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1242; - } - - uint64 avatar_guid = 1; - uint32 life_state = 2; - uint32 source_entity_id = 3; - string attack_tag = 4; - PlayerDieType die_type = 5; - uint32 move_reliable_seq = 6; - repeated ServerBuff server_buff_list = 7; + uint64 avatar_guid = 8; + uint32 life_state = 15; + uint32 source_entity_id = 1; + string attack_tag = 10; + PlayerDieType die_type = 11; + uint32 move_reliable_seq = 7; + repeated ServerBuff server_buff_list = 6; } diff --git a/proto/AvatarPromoteGetRewardReq.proto b/proto/AvatarPromoteGetRewardReq.proto index 1f9d73fb..1cbc3e1a 100644 --- a/proto/AvatarPromoteGetRewardReq.proto +++ b/proto/AvatarPromoteGetRewardReq.proto @@ -2,16 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 1676 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message AvatarPromoteGetRewardReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 1701; - } - - uint64 avatar_guid = 1; - uint32 promote_level = 2; + uint64 avatar_guid = 12; + uint32 promote_level = 8; } diff --git a/proto/AvatarPromoteGetRewardRsp.proto b/proto/AvatarPromoteGetRewardRsp.proto index a4cae2bc..b9f621c1 100644 --- a/proto/AvatarPromoteGetRewardRsp.proto +++ b/proto/AvatarPromoteGetRewardRsp.proto @@ -2,18 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1613 +// EnetChannelId: 0 +// EnetIsReliable: true message AvatarPromoteGetRewardRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1764; - } - - int32 retcode = 1; + int32 retcode = 11; uint64 avatar_guid = 2; - uint32 promote_level = 3; - uint32 reward_id = 4; + uint32 promote_level = 14; + uint32 reward_id = 1; } diff --git a/proto/AvatarPromoteReq.proto b/proto/AvatarPromoteReq.proto index 1f14f38b..907f0f23 100644 --- a/proto/AvatarPromoteReq.proto +++ b/proto/AvatarPromoteReq.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1711 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message AvatarPromoteReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 1692; - } - - uint64 guid = 1; + uint64 guid = 9; } diff --git a/proto/AvatarPromoteRsp.proto b/proto/AvatarPromoteRsp.proto index 3e128700..24dd3302 100644 --- a/proto/AvatarPromoteRsp.proto +++ b/proto/AvatarPromoteRsp.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1668 +// EnetChannelId: 0 +// EnetIsReliable: true message AvatarPromoteRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1728; - } - - int32 retcode = 1; - uint64 guid = 2; + int32 retcode = 15; + uint64 guid = 7; } diff --git a/proto/AvatarPropNotify.proto b/proto/AvatarPropNotify.proto index 46e7d41a..e9449a4a 100644 --- a/proto/AvatarPropNotify.proto +++ b/proto/AvatarPropNotify.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1255 +// EnetChannelId: 0 +// EnetIsReliable: true message AvatarPropNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1212; - } - - uint64 avatar_guid = 1; - map prop_map = 2; + uint64 avatar_guid = 4; + map prop_map = 1; } diff --git a/proto/AvatarSkillChangeNotify.proto b/proto/AvatarSkillChangeNotify.proto index e0a10ac7..f08b3381 100644 --- a/proto/AvatarSkillChangeNotify.proto +++ b/proto/AvatarSkillChangeNotify.proto @@ -2,20 +2,14 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1030 +// EnetChannelId: 0 +// EnetIsReliable: true message AvatarSkillChangeNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1091; - } - - uint64 avatar_guid = 1; - uint32 entity_id = 2; - uint32 skill_depot_id = 3; - uint32 avatar_skill_id = 4; - uint32 old_level = 5; - uint32 cur_level = 6; + uint64 avatar_guid = 4; + uint32 entity_id = 15; + uint32 skill_depot_id = 5; + uint32 avatar_skill_id = 2; + uint32 old_level = 10; + uint32 cur_level = 7; } diff --git a/proto/AvatarSkillDepotChangeNotify.proto b/proto/AvatarSkillDepotChangeNotify.proto new file mode 100644 index 00000000..2f3d8ee0 --- /dev/null +++ b/proto/AvatarSkillDepotChangeNotify.proto @@ -0,0 +1,17 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 1037 +// EnetChannelId: 0 +// EnetIsReliable: true +message AvatarSkillDepotChangeNotify { + uint64 avatar_guid = 2; + uint32 entity_id = 8; + uint32 skill_depot_id = 9; + repeated uint32 talent_id_list = 1; + repeated uint32 proud_skill_list = 5; + uint32 core_proud_skill_level = 4; + map skill_level_map = 10; + map proud_skill_extra_level_map = 11; +} diff --git a/proto/AvatarSkillInfo.proto b/proto/AvatarSkillInfo.proto index da5c086c..9d71c1b7 100644 --- a/proto/AvatarSkillInfo.proto +++ b/proto/AvatarSkillInfo.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message AvatarSkillInfo { uint32 pass_cd_time = 1; repeated uint32 full_cd_time_list = 2; diff --git a/proto/AvatarSkillInfoNotify.proto b/proto/AvatarSkillInfoNotify.proto index d56acb16..4f54cb86 100644 --- a/proto/AvatarSkillInfoNotify.proto +++ b/proto/AvatarSkillInfoNotify.proto @@ -4,7 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "AvatarSkillInfo.proto"; +// CmdId: 1035 +// EnetChannelId: 0 +// EnetIsReliable: true message AvatarSkillInfoNotify { - uint64 guid = 1; + uint64 guid = 4; map skill_map = 2; } diff --git a/proto/AvatarSkillMaxChargeCountNotify.proto b/proto/AvatarSkillMaxChargeCountNotify.proto index abbd17d2..4a028ad2 100644 --- a/proto/AvatarSkillMaxChargeCountNotify.proto +++ b/proto/AvatarSkillMaxChargeCountNotify.proto @@ -2,8 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 1085 +// EnetChannelId: 0 +// EnetIsReliable: true message AvatarSkillMaxChargeCountNotify { - uint64 avatar_guid = 1; + uint64 avatar_guid = 15; uint32 skill_id = 2; - uint32 max_charge_count = 3; + uint32 max_charge_count = 1; } diff --git a/proto/AvatarSkillUpgradeReq.proto b/proto/AvatarSkillUpgradeReq.proto index 02ff7373..611c3026 100644 --- a/proto/AvatarSkillUpgradeReq.proto +++ b/proto/AvatarSkillUpgradeReq.proto @@ -2,18 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1027 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message AvatarSkillUpgradeReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 1026; - } - uint64 avatar_guid = 1; - uint32 avatar_skill_id = 2; - uint32 old_level = 3; + uint32 avatar_skill_id = 5; + uint32 old_level = 10; } diff --git a/proto/AvatarSkillUpgradeRsp.proto b/proto/AvatarSkillUpgradeRsp.proto index 7ec89d67..780c65a5 100644 --- a/proto/AvatarSkillUpgradeRsp.proto +++ b/proto/AvatarSkillUpgradeRsp.proto @@ -2,19 +2,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1007 +// EnetChannelId: 0 +// EnetIsReliable: true message AvatarSkillUpgradeRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1024; - } - - int32 retcode = 1; - uint64 avatar_guid = 2; - uint32 avatar_skill_id = 3; - uint32 old_level = 4; - uint32 cur_level = 5; + int32 retcode = 3; + uint64 avatar_guid = 10; + uint32 avatar_skill_id = 2; + uint32 old_level = 5; + uint32 cur_level = 7; } diff --git a/proto/AvatarTeam.proto b/proto/AvatarTeam.proto index 08b4885e..aab6ee4c 100644 --- a/proto/AvatarTeam.proto +++ b/proto/AvatarTeam.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message AvatarTeam { repeated uint64 avatar_guid_list = 1; string team_name = 2; diff --git a/proto/AvatarTeamResonanceInfo.proto b/proto/AvatarTeamResonanceInfo.proto index b5569065..182b8453 100644 --- a/proto/AvatarTeamResonanceInfo.proto +++ b/proto/AvatarTeamResonanceInfo.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message AvatarTeamResonanceInfo { uint32 entity_id = 1; uint64 avatar_guid = 2; diff --git a/proto/AvatarTeamUpdateNotify.proto b/proto/AvatarTeamUpdateNotify.proto index ec6dbbda..4c264f17 100644 --- a/proto/AvatarTeamUpdateNotify.proto +++ b/proto/AvatarTeamUpdateNotify.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "AvatarTeam.proto"; +// CmdId: 1713 +// EnetChannelId: 0 +// EnetIsReliable: true message AvatarTeamUpdateNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1642; - } - - map avatar_team_map = 1; - repeated uint64 temp_avatar_guid_list = 2; + map avatar_team_map = 6; + repeated uint64 temp_avatar_guid_list = 9; } diff --git a/proto/AvatarUnlockTalentNotify.proto b/proto/AvatarUnlockTalentNotify.proto index b883c7df..5b37d18f 100644 --- a/proto/AvatarUnlockTalentNotify.proto +++ b/proto/AvatarUnlockTalentNotify.proto @@ -2,18 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1041 +// EnetChannelId: 0 +// EnetIsReliable: true message AvatarUnlockTalentNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1089; - } - uint64 avatar_guid = 1; - uint32 entity_id = 2; - uint32 talent_id = 3; - uint32 skill_depot_id = 4; + uint32 entity_id = 15; + uint32 talent_id = 13; + uint32 skill_depot_id = 14; } diff --git a/proto/AvatarUpgradeReq.proto b/proto/AvatarUpgradeReq.proto index cc561e7b..0d263afa 100644 --- a/proto/AvatarUpgradeReq.proto +++ b/proto/AvatarUpgradeReq.proto @@ -2,18 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1680 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message AvatarUpgradeReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 1691; - } - - uint32 item_id = 1; - uint32 count = 2; - uint64 avatar_guid = 3; + uint32 item_id = 9; + uint32 count = 12; + uint64 avatar_guid = 14; } diff --git a/proto/AvatarUpgradeRsp.proto b/proto/AvatarUpgradeRsp.proto index f3a8f8ad..14ac0fa4 100644 --- a/proto/AvatarUpgradeRsp.proto +++ b/proto/AvatarUpgradeRsp.proto @@ -2,20 +2,14 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1779 +// EnetChannelId: 0 +// EnetIsReliable: true message AvatarUpgradeRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1720; - } - - int32 retcode = 1; - uint64 avatar_guid = 2; - uint32 old_level = 3; - uint32 cur_level = 4; - map old_fight_prop_map = 5; - map cur_fight_prop_map = 6; + int32 retcode = 6; + uint64 avatar_guid = 15; + uint32 old_level = 5; + uint32 cur_level = 7; + map old_fight_prop_map = 2; + map cur_fight_prop_map = 4; } diff --git a/proto/AvatarWearFlycloakReq.proto b/proto/AvatarWearFlycloakReq.proto index aa99c6df..1e480f7f 100644 --- a/proto/AvatarWearFlycloakReq.proto +++ b/proto/AvatarWearFlycloakReq.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1728 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message AvatarWearFlycloakReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 1635; - } - - uint64 avatar_guid = 1; - uint32 flycloak_id = 2; + uint64 avatar_guid = 11; + uint32 flycloak_id = 9; } diff --git a/proto/AvatarWearFlycloakRsp.proto b/proto/AvatarWearFlycloakRsp.proto index a78f0cad..062a4ad4 100644 --- a/proto/AvatarWearFlycloakRsp.proto +++ b/proto/AvatarWearFlycloakRsp.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1770 +// EnetChannelId: 0 +// EnetIsReliable: true message AvatarWearFlycloakRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1709; - } - - int32 retcode = 1; - uint64 avatar_guid = 2; - uint32 flycloak_id = 3; + int32 retcode = 13; + uint64 avatar_guid = 8; + uint32 flycloak_id = 2; } diff --git a/proto/BattlePassAllDataNotify.proto b/proto/BattlePassAllDataNotify.proto new file mode 100644 index 00000000..bd80adc0 --- /dev/null +++ b/proto/BattlePassAllDataNotify.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "BattlePassMission.proto"; +import "BattlePassSchedule.proto"; + +// CmdId: 2618 +// EnetChannelId: 0 +// EnetIsReliable: true +message BattlePassAllDataNotify { + bool have_cur_schedule = 11; + BattlePassSchedule cur_schedule = 10; + repeated BattlePassMission mission_list = 1; +} diff --git a/proto/BattlePassBuySuccNotify.proto b/proto/BattlePassBuySuccNotify.proto new file mode 100644 index 00000000..2d00bcdc --- /dev/null +++ b/proto/BattlePassBuySuccNotify.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "ItemParam.proto"; + +// CmdId: 2614 +// EnetChannelId: 0 +// EnetIsReliable: true +message BattlePassBuySuccNotify { + uint32 schedule_id = 7; + uint32 product_play_type = 9; + repeated ItemParam item_list = 6; + uint32 add_point = 2; +} diff --git a/proto/BattlePassCurScheduleUpdateNotify.proto b/proto/BattlePassCurScheduleUpdateNotify.proto new file mode 100644 index 00000000..f392aea7 --- /dev/null +++ b/proto/BattlePassCurScheduleUpdateNotify.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "BattlePassSchedule.proto"; + +// CmdId: 2604 +// EnetChannelId: 0 +// EnetIsReliable: true +message BattlePassCurScheduleUpdateNotify { + bool have_cur_schedule = 9; + BattlePassSchedule cur_schedule = 15; +} diff --git a/proto/BattlePassCycle.proto b/proto/BattlePassCycle.proto new file mode 100644 index 00000000..c36bdf56 --- /dev/null +++ b/proto/BattlePassCycle.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message BattlePassCycle { + uint32 cycle_idx = 1; + uint32 begin_time = 2; + uint32 end_time = 3; +} diff --git a/proto/BattlePassMission.proto b/proto/BattlePassMission.proto new file mode 100644 index 00000000..54788243 --- /dev/null +++ b/proto/BattlePassMission.proto @@ -0,0 +1,19 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message BattlePassMission { + uint32 mission_id = 1; + uint32 cur_progress = 2; + uint32 total_progress = 3; + uint32 reward_battle_pass_point = 4; + uint32 mission_type = 5; + MissionStatus mission_status = 6; + + enum MissionStatus { + MISSION_STATUS_INVALID = 0; + MISSION_STATUS_UNFINISHED = 1; + MISSION_STATUS_FINISHED = 2; + MISSION_STATUS_POINT_TAKEN = 3; + } +} diff --git a/proto/BattlePassMissionDelNotify.proto b/proto/BattlePassMissionDelNotify.proto new file mode 100644 index 00000000..5b148cd1 --- /dev/null +++ b/proto/BattlePassMissionDelNotify.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 2643 +// EnetChannelId: 0 +// EnetIsReliable: true +message BattlePassMissionDelNotify { + repeated uint32 del_mission_id_list = 4; +} diff --git a/proto/BattlePassMissionUpdateNotify.proto b/proto/BattlePassMissionUpdateNotify.proto new file mode 100644 index 00000000..58a8f4a2 --- /dev/null +++ b/proto/BattlePassMissionUpdateNotify.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "BattlePassMission.proto"; + +// CmdId: 2609 +// EnetChannelId: 0 +// EnetIsReliable: true +message BattlePassMissionUpdateNotify { + repeated BattlePassMission mission_list = 6; +} diff --git a/proto/BattlePassProduct.proto b/proto/BattlePassProduct.proto new file mode 100644 index 00000000..d22d258f --- /dev/null +++ b/proto/BattlePassProduct.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message BattlePassProduct { + string normal_product_id = 1; + string extra_product_id = 2; + string upgrade_product_id = 3; +} diff --git a/proto/BattlePassRewardTag.proto b/proto/BattlePassRewardTag.proto new file mode 100644 index 00000000..8a3067a1 --- /dev/null +++ b/proto/BattlePassRewardTag.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "BattlePassUnlockStatus.proto"; + +message BattlePassRewardTag { + BattlePassUnlockStatus unlock_status = 1; + uint32 level = 2; + uint32 reward_id = 3; +} diff --git a/proto/BattlePassRewardTakeOption.proto b/proto/BattlePassRewardTakeOption.proto new file mode 100644 index 00000000..84a5527c --- /dev/null +++ b/proto/BattlePassRewardTakeOption.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "BattlePassRewardTag.proto"; + +message BattlePassRewardTakeOption { + BattlePassRewardTag tag = 1; + uint32 option_idx = 2; +} diff --git a/proto/BattlePassSchedule.proto b/proto/BattlePassSchedule.proto new file mode 100644 index 00000000..223875e0 --- /dev/null +++ b/proto/BattlePassSchedule.proto @@ -0,0 +1,24 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "BattlePassCycle.proto"; +import "BattlePassProduct.proto"; +import "BattlePassRewardTag.proto"; +import "BattlePassUnlockStatus.proto"; + +message BattlePassSchedule { + uint32 schedule_id = 1; + uint32 level = 2; + uint32 point = 3; + BattlePassUnlockStatus unlock_status = 4; + repeated BattlePassRewardTag reward_taken_list = 5; + uint32 begin_time = 6; + uint32 end_time = 7; + BattlePassCycle cur_cycle = 8; + bool is_extra_paid_reward_taken = 9; + BattlePassProduct product_info = 10; + bool is_viewed = 11; + uint32 cur_cycle_points = 12; + uint32 JPFMGBEBBBJ = 13; +} diff --git a/proto/BattlePassUnlockStatus.proto b/proto/BattlePassUnlockStatus.proto new file mode 100644 index 00000000..9c894896 --- /dev/null +++ b/proto/BattlePassUnlockStatus.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +enum BattlePassUnlockStatus { + BATTLE_PASS_UNLOCK_STATUS_INVALID = 0; + BATTLE_PASS_UNLOCK_STATUS_FREE = 1; + BATTLE_PASS_UNLOCK_STATUS_PAID = 2; +} diff --git a/proto/Birthday.proto b/proto/Birthday.proto index 027a9ed3..b360bcfd 100644 --- a/proto/Birthday.proto +++ b/proto/Birthday.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message Birthday { uint32 month = 1; uint32 day = 2; diff --git a/proto/BlockInfo.proto b/proto/BlockInfo.proto index 93ecdad4..8844d028 100644 --- a/proto/BlockInfo.proto +++ b/proto/BlockInfo.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message BlockInfo { uint32 block_id = 1; uint32 data_version = 2; diff --git a/proto/BlossomBriefInfoNotify.proto b/proto/BlossomBriefInfoNotify.proto new file mode 100644 index 00000000..f980e22d --- /dev/null +++ b/proto/BlossomBriefInfoNotify.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "BlossomBriefInfo.proto"; + +// CmdId: 2741 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message BlossomBriefInfoNotify { + repeated BlossomBriefInfo brief_info_list = 3; +} diff --git a/proto/BuyBattlePassLevelReq.proto b/proto/BuyBattlePassLevelReq.proto new file mode 100644 index 00000000..bec8d27a --- /dev/null +++ b/proto/BuyBattlePassLevelReq.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 2612 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message BuyBattlePassLevelReq { + uint32 buy_level = 10; +} diff --git a/proto/BuyBattlePassLevelRsp.proto b/proto/BuyBattlePassLevelRsp.proto new file mode 100644 index 00000000..62dd6d3d --- /dev/null +++ b/proto/BuyBattlePassLevelRsp.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 2646 +// EnetChannelId: 0 +// EnetIsReliable: true +message BuyBattlePassLevelRsp { + int32 retcode = 9; + uint32 buy_level = 6; +} diff --git a/proto/BuyGoodsReq.proto b/proto/BuyGoodsReq.proto index 976ccba5..57b1246a 100644 --- a/proto/BuyGoodsReq.proto +++ b/proto/BuyGoodsReq.proto @@ -4,8 +4,12 @@ option java_package = "emu.grasscutter.net.proto"; import "ShopGoods.proto"; +// CmdId: 741 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message BuyGoodsReq { - uint32 shopType = 1; - repeated ShopGoods goodsList = 2; - uint32 boughtNum = 3; + uint32 shop_type = 15; + ShopGoods goods = 13; + uint32 buy_count = 6; } diff --git a/proto/BuyGoodsRsp.proto b/proto/BuyGoodsRsp.proto index 26d8c0bd..c266bc01 100644 --- a/proto/BuyGoodsRsp.proto +++ b/proto/BuyGoodsRsp.proto @@ -4,8 +4,13 @@ option java_package = "emu.grasscutter.net.proto"; import "ShopGoods.proto"; +// CmdId: 737 +// EnetChannelId: 0 +// EnetIsReliable: true message BuyGoodsRsp { - uint32 shopType = 2; - uint32 boughtNum = 4; - repeated ShopGoods goodsList = 5; + int32 retcode = 15; + uint32 shop_type = 12; + ShopGoods goods = 13; + uint32 buy_count = 8; + repeated ShopGoods goods_list = 1; } diff --git a/proto/CBJEDMGOBPL.proto b/proto/CBJEDMGOBPL.proto new file mode 100644 index 00000000..861bdd60 --- /dev/null +++ b/proto/CBJEDMGOBPL.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +enum CBJEDMGOBPL { + CBJEDMGOBPL_MBLDLJOKLBL = 0; + CBJEDMGOBPL_ILOMIKADKGD = 1; + CBJEDMGOBPL_HGHOEJGHMDH = 2; + CBJEDMGOBPL_PJCONIDJGOD = 3; +} diff --git a/proto/CalcWeaponUpgradeReturnItemsReq.proto b/proto/CalcWeaponUpgradeReturnItemsReq.proto index 1a7c5a85..d75740ea 100644 --- a/proto/CalcWeaponUpgradeReturnItemsReq.proto +++ b/proto/CalcWeaponUpgradeReturnItemsReq.proto @@ -4,17 +4,12 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; +// CmdId: 610 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message CalcWeaponUpgradeReturnItemsReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 669; - } - - uint64 target_weapon_guid = 1; - repeated uint64 food_weapon_guid_list = 2; - repeated ItemParam item_param_list = 3; + uint64 target_weapon_guid = 9; + repeated uint64 food_weapon_guid_list = 10; + repeated ItemParam item_param_list = 14; } diff --git a/proto/CalcWeaponUpgradeReturnItemsRsp.proto b/proto/CalcWeaponUpgradeReturnItemsRsp.proto index a3d78aa8..905b17fb 100644 --- a/proto/CalcWeaponUpgradeReturnItemsRsp.proto +++ b/proto/CalcWeaponUpgradeReturnItemsRsp.proto @@ -4,16 +4,11 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; +// CmdId: 666 +// EnetChannelId: 0 +// EnetIsReliable: true message CalcWeaponUpgradeReturnItemsRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 660; - } - - int32 retcode = 1; - uint64 target_weapon_guid = 2; + int32 retcode = 5; + uint64 target_weapon_guid = 10; repeated ItemParam item_param_list = 3; } diff --git a/proto/CanUseSkillNotify.proto b/proto/CanUseSkillNotify.proto index 60ac6d7f..fd61b1a9 100644 --- a/proto/CanUseSkillNotify.proto +++ b/proto/CanUseSkillNotify.proto @@ -2,14 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 1098 +// EnetChannelId: 0 +// EnetIsReliable: true message CanUseSkillNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1019; - } - - bool is_can_use_skill = 1; + bool is_can_use_skill = 6; } diff --git a/proto/CardProductRewardNotify.proto b/proto/CardProductRewardNotify.proto index 109e685e..c0b529e7 100644 --- a/proto/CardProductRewardNotify.proto +++ b/proto/CardProductRewardNotify.proto @@ -2,16 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 4104 +// EnetChannelId: 0 +// EnetIsReliable: true message CardProductRewardNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4105; - } - - string product_id = 1; - uint32 hcoin = 2; - uint32 remain_days = 3; + string product_id = 6; + uint32 hcoin = 11; + uint32 remain_days = 5; } diff --git a/proto/ChallengeDataNotify.proto b/proto/ChallengeDataNotify.proto index aaf5484e..476dfdf2 100644 --- a/proto/ChallengeDataNotify.proto +++ b/proto/ChallengeDataNotify.proto @@ -2,8 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 963 +// EnetChannelId: 0 +// EnetIsReliable: true message ChallengeDataNotify { - uint32 challenge_index = 1; - uint32 param_index = 2; - uint32 value = 3; + uint32 challenge_index = 8; + uint32 param_index = 9; + uint32 value = 1; } diff --git a/proto/ChangeAvatarReq.proto b/proto/ChangeAvatarReq.proto index d6fdc2b1..2e221818 100644 --- a/proto/ChangeAvatarReq.proto +++ b/proto/ChangeAvatarReq.proto @@ -4,18 +4,13 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; +// CmdId: 1662 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message ChangeAvatarReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 1669; - } - - uint64 guid = 1; - uint32 skill_id = 2; - bool is_move = 3; - Vector move_pos = 4; + uint64 guid = 5; + uint32 skill_id = 11; + bool is_move = 7; + Vector move_pos = 9; } diff --git a/proto/ChangeAvatarRsp.proto b/proto/ChangeAvatarRsp.proto index d7308e51..f644cdaf 100644 --- a/proto/ChangeAvatarRsp.proto +++ b/proto/ChangeAvatarRsp.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1710 +// EnetChannelId: 0 +// EnetIsReliable: true message ChangeAvatarRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1634; - } - - int32 retcode = 1; - uint64 cur_guid = 2; - uint32 skill_id = 3; + int32 retcode = 6; + uint64 cur_guid = 11; + uint32 skill_id = 5; } diff --git a/proto/ChangeEnergyReason.proto b/proto/ChangeEnergyReason.proto index 5e755838..65104d09 100644 --- a/proto/ChangeEnergyReason.proto +++ b/proto/ChangeEnergyReason.proto @@ -3,6 +3,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum ChangeEnergyReason { - CHANGE_ENERGY_NONE = 0; - CHANGE_ENERGY_SKILL_START = 1; + CHANGE_ENERGY_REASON_NONE = 0; + CHANGE_ENERGY_REASON_SKILL_START = 1; } diff --git a/proto/ChangeGameTimeReq.proto b/proto/ChangeGameTimeReq.proto index 9c080687..74203a72 100644 --- a/proto/ChangeGameTimeReq.proto +++ b/proto/ChangeGameTimeReq.proto @@ -2,18 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 149 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message ChangeGameTimeReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 161; - } - - uint32 game_time = 1; - bool is_force_set = 2; - uint32 extra_days = 3; + uint32 game_time = 9; + bool is_force_set = 7; + uint32 extra_days = 6; } diff --git a/proto/ChangeGameTimeRsp.proto b/proto/ChangeGameTimeRsp.proto index 22179220..078a7351 100644 --- a/proto/ChangeGameTimeRsp.proto +++ b/proto/ChangeGameTimeRsp.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 182 +// EnetChannelId: 0 +// EnetIsReliable: true message ChangeGameTimeRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 179; - } - - int32 retcode = 1; - uint32 cur_game_time = 2; - uint32 extra_days = 3; + int32 retcode = 7; + uint32 cur_game_time = 1; + uint32 extra_days = 2; } diff --git a/proto/ChangeHpReason.proto b/proto/ChangeHpReason.proto index e56d9acc..48cdb4b5 100644 --- a/proto/ChangeHpReason.proto +++ b/proto/ChangeHpReason.proto @@ -3,29 +3,34 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum ChangeHpReason { - ChangeHpNone = 0; - ChangeHpSubAvatar = 1; - ChangeHpSubMonster = 2; - ChangeHpSubGear = 3; - ChangeHpSubEnvir = 4; - ChangeHpSubFall = 5; - ChangeHpSubDrawn = 6; - ChangeHpSubAbyss = 7; - ChangeHpSubAbility = 8; - ChangeHpSubSummon = 9; - ChangeHpSubScript = 10; - ChangeHpSubGm = 11; - ChangeHpSubKillSelf = 12; - ChangeHpSubClimateCold = 13; - ChangeHpSubStormLightning = 14; - ChangeHpSubKillServerGadget = 15; - ChangeHpByLua = 51; - ChangeHpAddAbility = 101; - ChangeHpAddItem = 102; - ChangeHpAddRevive = 103; - ChangeHpAddUpgrade = 104; - ChangeHpAddStatue = 105; - ChangeHpAddBackground = 106; - ChangeHpAddGm = 107; - ChangeHpAddTrialAvatarActivity = 108; + CHANGE_HP_REASON_CHANGE_HP_NONE = 0; + CHANGE_HP_REASON_CHANGE_HP_SUB_AVATAR = 1; + CHANGE_HP_REASON_CHANGE_HP_SUB_MONSTER = 2; + CHANGE_HP_REASON_CHANGE_HP_SUB_GEAR = 3; + CHANGE_HP_REASON_CHANGE_HP_SUB_ENVIR = 4; + CHANGE_HP_REASON_CHANGE_HP_SUB_FALL = 5; + CHANGE_HP_REASON_CHANGE_HP_SUB_DRAWN = 6; + CHANGE_HP_REASON_CHANGE_HP_SUB_ABYSS = 7; + CHANGE_HP_REASON_CHANGE_HP_SUB_ABILITY = 8; + CHANGE_HP_REASON_CHANGE_HP_SUB_SUMMON = 9; + CHANGE_HP_REASON_CHANGE_HP_SUB_SCRIPT = 10; + CHANGE_HP_REASON_CHANGE_HP_SUB_GM = 11; + CHANGE_HP_REASON_CHANGE_HP_SUB_KILL_SELF = 12; + CHANGE_HP_REASON_CHANGE_HP_SUB_CLIMATE_COLD = 13; + CHANGE_HP_REASON_CHANGE_HP_SUB_STORM_LIGHTNING = 14; + CHANGE_HP_REASON_CHANGE_HP_SUB_KILL_SERVER_GADGET = 15; + CHANGE_HP_REASON_CHANGE_HP_SUB_REPLACE = 16; + CHANGE_HP_REASON_CHANGE_HP_SUB_PLAYER_LEAVE = 17; + CHANGE_HP_REASON_CIKCDBOJGDK = 18; + CHANGE_HP_REASON_HEKLBLFBJJK = 19; + CHANGE_HP_REASON_CHANGE_HP_BY_LUA = 51; + CHANGE_HP_REASON_CHANGE_HP_ADD_ABILITY = 101; + CHANGE_HP_REASON_CHANGE_HP_ADD_ITEM = 102; + CHANGE_HP_REASON_CHANGE_HP_ADD_REVIVE = 103; + CHANGE_HP_REASON_CHANGE_HP_ADD_UPGRADE = 104; + CHANGE_HP_REASON_CHANGE_HP_ADD_STATUE = 105; + CHANGE_HP_REASON_CHANGE_HP_ADD_BACKGROUND = 106; + CHANGE_HP_REASON_CHANGE_HP_ADD_GM = 107; + CHANGE_HP_REASON_CHANGE_HP_ADD_TRIAL_AVATAR_ACTIVITY = 108; + CHANGE_HP_REASON_CHANGE_HP_ADD_ROUGUELIKE_SPRING = 109; } diff --git a/proto/ChangeMailStarNotify.proto b/proto/ChangeMailStarNotify.proto index e5347c86..7588e662 100644 --- a/proto/ChangeMailStarNotify.proto +++ b/proto/ChangeMailStarNotify.proto @@ -2,7 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 1407 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message ChangeMailStarNotify { - repeated uint32 mail_id_list = 1; - bool is_star = 2; + repeated uint32 mail_id_list = 5; + bool is_star = 9; } diff --git a/proto/ChangeMpTeamAvatarReq.proto b/proto/ChangeMpTeamAvatarReq.proto index 9ab82737..02194659 100644 --- a/proto/ChangeMpTeamAvatarReq.proto +++ b/proto/ChangeMpTeamAvatarReq.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1689 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message ChangeMpTeamAvatarReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 1731; - } - - repeated uint64 avatar_guid_list = 1; - uint64 cur_avatar_guid = 2; + repeated uint64 avatar_guid_list = 5; + uint64 cur_avatar_guid = 12; } diff --git a/proto/ChangeMpTeamAvatarRsp.proto b/proto/ChangeMpTeamAvatarRsp.proto index 4aca7533..6339f5ae 100644 --- a/proto/ChangeMpTeamAvatarRsp.proto +++ b/proto/ChangeMpTeamAvatarRsp.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1617 +// EnetChannelId: 0 +// EnetIsReliable: true message ChangeMpTeamAvatarRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1640; - } - - int32 retcode = 1; - repeated uint64 avatar_guid_list = 2; - uint64 cur_avatar_guid = 3; + int32 retcode = 7; + repeated uint64 avatar_guid_list = 3; + uint64 cur_avatar_guid = 8; } diff --git a/proto/ChangeTeamNameReq.proto b/proto/ChangeTeamNameReq.proto index 764b4985..239edf51 100644 --- a/proto/ChangeTeamNameReq.proto +++ b/proto/ChangeTeamNameReq.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1762 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message ChangeTeamNameReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 1693; - } - - int32 team_id = 1; - string team_name = 2; + int32 team_id = 12; + string team_name = 15; } diff --git a/proto/ChangeTeamNameRsp.proto b/proto/ChangeTeamNameRsp.proto index 1e0ba48f..f601b755 100644 --- a/proto/ChangeTeamNameRsp.proto +++ b/proto/ChangeTeamNameRsp.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1789 +// EnetChannelId: 0 +// EnetIsReliable: true message ChangeTeamNameRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1788; - } - - int32 team_id = 1; + int32 team_id = 6; string team_name = 2; - int32 retcode = 3; + int32 retcode = 8; } diff --git a/proto/ChapterState.proto b/proto/ChapterState.proto new file mode 100644 index 00000000..d0a23ddf --- /dev/null +++ b/proto/ChapterState.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +enum ChapterState { + CHAPTER_STATE_INVALID = 0; + CHAPTER_STATE_UNABLE_TO_BEGIN = 1; + CHAPTER_STATE_BEGIN = 2; + CHAPTER_STATE_END = 3; +} diff --git a/proto/ChapterStateNotify.proto b/proto/ChapterStateNotify.proto new file mode 100644 index 00000000..0838691d --- /dev/null +++ b/proto/ChapterStateNotify.proto @@ -0,0 +1,25 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "ChapterState.proto"; + +// CmdId: 498 +// EnetChannelId: 0 +// EnetIsReliable: true +message ChapterStateNotify { + uint32 chapter_id = 1; + ChapterState chapter_state = 12; + NeedPlayerLevel need_player_level = 10; + NeedBeginTime need_begin_time = 14; + + message NeedPlayerLevel { + bool is_limit = 1; + uint32 config_need_player_level = 2; + } + + message NeedBeginTime { + bool is_limit = 1; + uint32 config_need_begin_time = 2; + } +} diff --git a/proto/ChatInfo.proto b/proto/ChatInfo.proto index b1f8f33b..6491ced1 100644 --- a/proto/ChatInfo.proto +++ b/proto/ChatInfo.proto @@ -2,26 +2,25 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message ChatInfo { - enum SystemHintType { - CHAT_NONE = 0; - CHAT_ENTER_WORLD = 1; - CHAT_LEAVE_WORLD = 2; - } - - message SystemHint { - uint32 type = 1; - } - - oneof Content { - string text = 100; - uint32 icon = 101; - SystemHint system_hint = 102; - } uint32 time = 1; uint32 uid = 2; uint32 sequence = 3; uint32 to_uid = 4; bool is_read = 5; + oneof content { + string text = 100; + uint32 icon = 101; + SystemHint system_hint = 102; + } + + enum SystemHintType { + SYSTEM_HINT_TYPE_CHAT_NONE = 0; + SYSTEM_HINT_TYPE_CHAT_ENTER_WORLD = 1; + SYSTEM_HINT_TYPE_CHAT_LEAVE_WORLD = 2; + } + + message SystemHint { + uint32 type = 1; + } } diff --git a/proto/CheckAddItemExceedLimitNotify.proto b/proto/CheckAddItemExceedLimitNotify.proto index 4a6b847c..a7861117 100644 --- a/proto/CheckAddItemExceedLimitNotify.proto +++ b/proto/CheckAddItemExceedLimitNotify.proto @@ -2,9 +2,19 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 653 +// EnetChannelId: 0 +// EnetIsReliable: true message CheckAddItemExceedLimitNotify { - bool isMaterialExceedLimit = 1; - bool isWeaponExceedLimit = 2; - bool isReliquaryExceedLimit = 3; - repeated uint32 itemIdList = 4; + bool is_drop = 1; + repeated uint32 exceeded_item_list = 8; + repeated uint32 exceeded_item_type_list = 3; + ItemExceedLimitMsgType msg_type = 14; + + enum ItemExceedLimitMsgType { + ITEM_EXCEED_LIMIT_MSG_TYPE_DEFAULT = 0; + ITEM_EXCEED_LIMIT_MSG_TYPE_TEXT = 1; + ITEM_EXCEED_LIMIT_MSG_TYPE_DIALOG = 2; + ITEM_EXCEED_LIMIT_MSG_TYPE_BONLGEEEBBF = 3; + } } diff --git a/proto/ChooseCurAvatarTeamReq.proto b/proto/ChooseCurAvatarTeamReq.proto index 1ea02de5..d039a395 100644 --- a/proto/ChooseCurAvatarTeamReq.proto +++ b/proto/ChooseCurAvatarTeamReq.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1800 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message ChooseCurAvatarTeamReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 1663; - } - - uint32 team_id = 1; + uint32 team_id = 14; } diff --git a/proto/ChooseCurAvatarTeamRsp.proto b/proto/ChooseCurAvatarTeamRsp.proto index 0b150378..ab77584a 100644 --- a/proto/ChooseCurAvatarTeamRsp.proto +++ b/proto/ChooseCurAvatarTeamRsp.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1673 +// EnetChannelId: 0 +// EnetIsReliable: true message ChooseCurAvatarTeamRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1798; - } - - int32 retcode = 1; - uint32 cur_team_id = 2; + int32 retcode = 7; + uint32 cur_team_id = 4; } diff --git a/proto/CityInfo.proto b/proto/CityInfo.proto index 5bf9163e..c4559372 100644 --- a/proto/CityInfo.proto +++ b/proto/CityInfo.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message CityInfo { uint32 city_id = 1; uint32 level = 2; diff --git a/proto/ClientAbilityChangeNotify.proto b/proto/ClientAbilityChangeNotify.proto index cb3b2350..c2d727b9 100644 --- a/proto/ClientAbilityChangeNotify.proto +++ b/proto/ClientAbilityChangeNotify.proto @@ -4,16 +4,12 @@ option java_package = "emu.grasscutter.net.proto"; import "AbilityInvokeEntry.proto"; +// CmdId: 1127 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message ClientAbilityChangeNotify { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 1126; - } - - uint32 entity_id = 1; - repeated AbilityInvokeEntry invokes = 2; + uint32 entity_id = 6; + repeated AbilityInvokeEntry invokes = 8; + bool JCJNLMLGHJE = 10; } diff --git a/proto/ClientAbilityInitBeginNotify.proto b/proto/ClientAbilityInitBeginNotify.proto index 82dbd5b1..ba40b026 100644 --- a/proto/ClientAbilityInitBeginNotify.proto +++ b/proto/ClientAbilityInitBeginNotify.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1141 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message ClientAbilityInitBeginNotify { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 1189; - } - uint32 entity_id = 1; } diff --git a/proto/ClientAbilityInitFinishNotify.proto b/proto/ClientAbilityInitFinishNotify.proto index a591eaa9..9860aad0 100644 --- a/proto/ClientAbilityInitFinishNotify.proto +++ b/proto/ClientAbilityInitFinishNotify.proto @@ -4,16 +4,11 @@ option java_package = "emu.grasscutter.net.proto"; import "AbilityInvokeEntry.proto"; +// CmdId: 1137 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message ClientAbilityInitFinishNotify { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 1184; - } - - uint32 entity_id = 1; - repeated AbilityInvokeEntry invokes = 2; + uint32 entity_id = 13; + repeated AbilityInvokeEntry invokes = 9; } diff --git a/proto/ClientCollectorData.proto b/proto/ClientCollectorData.proto index e342d76c..6092c8e3 100644 --- a/proto/ClientCollectorData.proto +++ b/proto/ClientCollectorData.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message ClientCollectorData { uint32 material_id = 1; uint32 max_points = 2; diff --git a/proto/ClientCollectorDataNotify.proto b/proto/ClientCollectorDataNotify.proto index 6fcfbaa5..ff75edd6 100644 --- a/proto/ClientCollectorDataNotify.proto +++ b/proto/ClientCollectorDataNotify.proto @@ -4,14 +4,9 @@ option java_package = "emu.grasscutter.net.proto"; import "ClientCollectorData.proto"; +// CmdId: 4264 +// EnetChannelId: 0 +// EnetIsReliable: true message ClientCollectorDataNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4280; - } - - repeated ClientCollectorData client_collector_data_list = 1; + repeated ClientCollectorData client_collector_data_list = 8; } diff --git a/proto/ClientGadgetInfo.proto b/proto/ClientGadgetInfo.proto index 14add090..b28dedf5 100644 --- a/proto/ClientGadgetInfo.proto +++ b/proto/ClientGadgetInfo.proto @@ -9,4 +9,6 @@ message ClientGadgetInfo { uint32 owner_entity_id = 4; uint32 target_entity_id = 5; bool async_load = 6; + bool CEGHBCJMNFJ = 7; + repeated uint32 FCFECGFHLAD = 8; } diff --git a/proto/CodexDataFullNotify.proto b/proto/CodexDataFullNotify.proto index 27e26e4d..1ba67f03 100644 --- a/proto/CodexDataFullNotify.proto +++ b/proto/CodexDataFullNotify.proto @@ -1,16 +1,15 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "CodexTypeData.proto"; +// CmdId: 4201 +// EnetChannelId: 0 +// EnetIsReliable: true message CodexDataFullNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4208; - } - - repeated CodexTypeData type_data_list = 1; + repeated CodexTypeData type_data_list = 5; + repeated uint32 IGMFFAGOCIA = 11; + uint32 BIFMJKDHHLG = 8; + uint32 AEHJDIPOLHC = 10; } diff --git a/proto/CodexDataUpdateNotify.proto b/proto/CodexDataUpdateNotify.proto index f309ca18..8b881bd0 100644 --- a/proto/CodexDataUpdateNotify.proto +++ b/proto/CodexDataUpdateNotify.proto @@ -1,18 +1,14 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "CodexType.proto"; +// CmdId: 4210 +// EnetChannelId: 0 +// EnetIsReliable: true message CodexDataUpdateNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4205; - } - - CodexType type = 1; - uint32 id = 2; - uint32 weapon_max_promote_level = 3; + CodexType type = 3; + uint32 id = 4; + uint32 weapon_max_promote_level = 12; } diff --git a/proto/CodexType.proto b/proto/CodexType.proto index d545966f..6dea0998 100644 --- a/proto/CodexType.proto +++ b/proto/CodexType.proto @@ -3,13 +3,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; 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; + CODEX_TYPE_NONE = 0; + CODEX_TYPE_QUEST = 1; + CODEX_TYPE_WEAPON = 2; + CODEX_TYPE_ANIMAL = 3; + CODEX_TYPE_MATERIAL = 4; + CODEX_TYPE_BOOKS = 5; + CODEX_TYPE_PUSHTIPS = 6; + CODEX_TYPE_VIEW = 7; + CODEX_TYPE_RELIQUARY = 8; } diff --git a/proto/CodexTypeData.proto b/proto/CodexTypeData.proto index 95e24737..061fd9a4 100644 --- a/proto/CodexTypeData.proto +++ b/proto/CodexTypeData.proto @@ -1,6 +1,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "CodexType.proto"; message CodexTypeData { diff --git a/proto/CombatInvocationsNotify.proto b/proto/CombatInvocationsNotify.proto index 0f5c8e4b..5025fed8 100644 --- a/proto/CombatInvocationsNotify.proto +++ b/proto/CombatInvocationsNotify.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "CombatInvokeEntry.proto"; +// CmdId: 316 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message CombatInvocationsNotify { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 359; - } - - repeated CombatInvokeEntry invoke_list = 1; + repeated CombatInvokeEntry invoke_list = 4; } diff --git a/proto/CombatTypeArgument.proto b/proto/CombatTypeArgument.proto index 9116aba0..1449f42d 100644 --- a/proto/CombatTypeArgument.proto +++ b/proto/CombatTypeArgument.proto @@ -3,20 +3,22 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum CombatTypeArgument { - COMBAT_NONE = 0; - COMBAT_EVT_BEING_HIT = 1; - COMBAT_ANIMATOR_STATE_CHANGED = 2; - COMBAT_FACE_TO_DIR = 3; - COMBAT_SET_ATTACK_TARGET = 4; - COMBAT_RUSH_MOVE = 5; - COMBAT_ANIMATOR_PARAMETER_CHANGED = 6; - ENTITY_MOVE = 7; - SYNC_ENTITY_POSITION = 8; - COMBAT_STEER_MOTION_INFO = 9; - COMBAT_FORCE_SET_POS_INFO = 10; - COMBAT_COMPENSATE_POS_DIFF = 11; - COMBAT_MONSTER_DO_BLINK = 12; - COMBAT_FIXED_RUSH_MOVE = 13; - COMBAT_SYNC_TRANSFORM = 14; - COMBAT_LIGHT_CORE_MOVE = 15; + 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; + COMBAT_TYPE_ARGUMENT_SET_ATTACK_TARGET = 4; + COMBAT_TYPE_ARGUMENT_RUSH_MOVE = 5; + COMBAT_TYPE_ARGUMENT_ANIMATOR_PARAMETER_CHANGED = 6; + COMBAT_TYPE_ARGUMENT_ENTITY_MOVE = 7; + COMBAT_TYPE_ARGUMENT_SYNC_ENTITY_POSITION = 8; + COMBAT_TYPE_ARGUMENT_STEER_MOTION_INFO = 9; + COMBAT_TYPE_ARGUMENT_FORCE_SET_POS_INFO = 10; + COMBAT_TYPE_ARGUMENT_COMPENSATE_POS_DIFF = 11; + COMBAT_TYPE_ARGUMENT_MONSTER_DO_BLINK = 12; + COMBAT_TYPE_ARGUMENT_FIXED_RUSH_MOVE = 13; + COMBAT_TYPE_ARGUMENT_SYNC_TRANSFORM = 14; + COMBAT_TYPE_ARGUMENT_LIGHT_CORE_MOVE = 15; + COMBAT_TYPE_ARGUMENT_KPDNFKCMKPG = 16; + COMBAT_TYPE_ARGUMENT_KPLOMOIALGF = 17; } diff --git a/proto/CombineDataNotify.proto b/proto/CombineDataNotify.proto index 1ef4c8a5..9afc6856 100644 --- a/proto/CombineDataNotify.proto +++ b/proto/CombineDataNotify.proto @@ -2,14 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 661 +// EnetChannelId: 0 +// EnetIsReliable: true message CombineDataNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 657; - } - - repeated uint32 combine_id_list = 1; + repeated uint32 combine_id_list = 5; } diff --git a/proto/CombineFormulaDataNotify.proto b/proto/CombineFormulaDataNotify.proto index 3c13553e..2fd20a93 100644 --- a/proto/CombineFormulaDataNotify.proto +++ b/proto/CombineFormulaDataNotify.proto @@ -2,15 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 688 +// EnetChannelId: 0 +// EnetIsReliable: true message CombineFormulaDataNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 682; - } - - uint32 combine_id = 1; - bool is_locked = 2; + uint32 combine_id = 6; + bool is_locked = 5; } diff --git a/proto/CombineReq.proto b/proto/CombineReq.proto index 58d38e15..f4c7c5f0 100644 --- a/proto/CombineReq.proto +++ b/proto/CombineReq.proto @@ -2,17 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 654 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message CombineReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 655; - } - - uint32 combine_id = 1; - uint32 combine_count = 2; - uint64 avatar_guid = 3; + uint32 combine_id = 5; + uint32 combine_count = 3; + uint64 avatar_guid = 8; } diff --git a/proto/CombineRsp.proto b/proto/CombineRsp.proto index bba446ae..9bd9e7d1 100644 --- a/proto/CombineRsp.proto +++ b/proto/CombineRsp.proto @@ -4,22 +4,17 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; +// CmdId: 646 +// EnetChannelId: 0 +// EnetIsReliable: true message CombineRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 695; - } - - int32 retcode = 1; - uint32 combine_id = 2; - uint32 combine_count = 3; - uint64 avatar_guid = 4; - repeated ItemParam cost_item_list = 5; - repeated ItemParam result_item_list = 6; - repeated ItemParam total_random_item_list = 7; - repeated ItemParam total_return_item_list = 8; - repeated ItemParam total_extra_item_list = 9; + int32 retcode = 13; + uint32 combine_id = 12; + uint32 combine_count = 6; + uint64 avatar_guid = 15; + repeated ItemParam cost_item_list = 10; + repeated ItemParam result_item_list = 2; + repeated ItemParam total_random_item_list = 9; + repeated ItemParam total_return_item_list = 4; + repeated ItemParam total_extra_item_list = 8; } diff --git a/proto/CookDataNotify.proto b/proto/CookDataNotify.proto new file mode 100644 index 00000000..b743c8c4 --- /dev/null +++ b/proto/CookDataNotify.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "CookRecipeData.proto"; + +// CmdId: 142 +// EnetChannelId: 0 +// EnetIsReliable: true +message CookDataNotify { + uint32 grade = 8; + repeated CookRecipeData recipe_data_list = 2; +} diff --git a/proto/CookGradeDataNotify.proto b/proto/CookGradeDataNotify.proto new file mode 100644 index 00000000..fd7dbd86 --- /dev/null +++ b/proto/CookGradeDataNotify.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 111 +// EnetChannelId: 0 +// EnetIsReliable: true +message CookGradeDataNotify { + uint32 grade = 6; +} diff --git a/proto/CookRecipeData.proto b/proto/CookRecipeData.proto new file mode 100644 index 00000000..a27953e5 --- /dev/null +++ b/proto/CookRecipeData.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message CookRecipeData { + uint32 recipe_id = 1; + uint32 proficiency = 2; +} diff --git a/proto/CookRecipeDataNotify.proto b/proto/CookRecipeDataNotify.proto new file mode 100644 index 00000000..c4a67e0d --- /dev/null +++ b/proto/CookRecipeDataNotify.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "CookRecipeData.proto"; + +// CmdId: 101 +// EnetChannelId: 0 +// EnetIsReliable: true +message CookRecipeDataNotify { + CookRecipeData recipe_data = 1; +} diff --git a/proto/CoopCg.proto b/proto/CoopCg.proto index a507579d..67528987 100644 --- a/proto/CoopCg.proto +++ b/proto/CoopCg.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message CoopCg { uint32 id = 1; bool is_unlock = 2; diff --git a/proto/CoopChapter.proto b/proto/CoopChapter.proto index 360df624..c3f3e4cf 100644 --- a/proto/CoopChapter.proto +++ b/proto/CoopChapter.proto @@ -2,18 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +import "CoopCg.proto"; import "CoopPoint.proto"; import "CoopReward.proto"; -import "CoopCg.proto"; message CoopChapter { - enum State { - CLOSE = 0; - COND_NOT_MEET = 1; - COND_MEET = 2; - ACCEPT = 3; - } - uint32 id = 1; State state = 2; repeated uint32 lock_reason_list = 3; @@ -24,4 +17,11 @@ message CoopChapter { uint32 finished_end_count = 8; map seen_ending_map = 9; repeated uint32 finish_dialog_list = 10; + + enum State { + STATE_CLOSE = 0; + STATE_COND_NOT_MEET = 1; + STATE_COND_MEET = 2; + STATE_ACCEPT = 3; + } } diff --git a/proto/CoopDataNotify.proto b/proto/CoopDataNotify.proto index a9e673f3..786e401f 100644 --- a/proto/CoopDataNotify.proto +++ b/proto/CoopDataNotify.proto @@ -4,17 +4,12 @@ option java_package = "emu.grasscutter.net.proto"; import "CoopChapter.proto"; +// CmdId: 1976 +// EnetChannelId: 0 +// EnetIsReliable: true message CoopDataNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1957; - } - - repeated CoopChapter chapter_list = 1; - bool is_have_progress = 2; - uint32 cur_coop_point = 3; - repeated uint32 viewed_chapter_list = 4; + repeated CoopChapter chapter_list = 13; + bool is_have_progress = 14; + uint32 cur_coop_point = 5; + repeated uint32 viewed_chapter_list = 2; } diff --git a/proto/CoopPoint.proto b/proto/CoopPoint.proto index d0c728eb..ceacc8af 100644 --- a/proto/CoopPoint.proto +++ b/proto/CoopPoint.proto @@ -2,15 +2,14 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message CoopPoint { - enum State { - UNSTARTED = 0; - STARTED = 1; - FINISHED = 2; - } - uint32 id = 1; State state = 2; uint32 self_confidence = 3; + + enum State { + STATE_UNSTARTED = 0; + STATE_STARTED = 1; + STATE_FINISHED = 2; + } } diff --git a/proto/CoopReward.proto b/proto/CoopReward.proto index 38cac728..43f060ff 100644 --- a/proto/CoopReward.proto +++ b/proto/CoopReward.proto @@ -2,14 +2,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message CoopReward { - enum State { - UNLOCK = 0; - LOCK = 1; - TAKEN = 2; - } - uint32 id = 1; State state = 2; + + enum State { + STATE_UNLOCK = 0; + STATE_LOCK = 1; + STATE_TAKEN = 2; + } } diff --git a/proto/CreateVehicleReq.proto b/proto/CreateVehicleReq.proto index 02c1e6fe..4affab70 100644 --- a/proto/CreateVehicleReq.proto +++ b/proto/CreateVehicleReq.proto @@ -4,9 +4,13 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; +// CmdId: 819 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message CreateVehicleReq { - uint32 vehicleId = 1; - uint32 pointId = 2; - Vector pos = 3; - Vector rot = 4; + uint32 vehicle_id = 9; + uint32 scene_point_id = 15; + Vector pos = 1; + Vector rot = 7; } diff --git a/proto/CreateVehicleRsp.proto b/proto/CreateVehicleRsp.proto index bd1b778e..baabe996 100644 --- a/proto/CreateVehicleRsp.proto +++ b/proto/CreateVehicleRsp.proto @@ -2,7 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 812 +// EnetChannelId: 0 +// EnetIsReliable: true message CreateVehicleRsp { - uint32 vehicleId = 2; - uint32 entityId = 3; + int32 retcode = 7; + uint32 vehicle_id = 8; + uint32 entity_id = 10; } diff --git a/proto/CutSceneBeginNotify.proto b/proto/CutSceneBeginNotify.proto index 9a926541..a409b4bb 100644 --- a/proto/CutSceneBeginNotify.proto +++ b/proto/CutSceneBeginNotify.proto @@ -2,7 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 300 +// EnetChannelId: 0 +// EnetIsReliable: true message CutSceneBeginNotify { - uint32 cutscene_id = 1; - bool is_wait_others = 2; + uint32 cutscene_id = 9; + bool is_wait_others = 11; } diff --git a/proto/CutSceneEndNotify.proto b/proto/CutSceneEndNotify.proto index c3f91a4e..66e0a768 100644 --- a/proto/CutSceneEndNotify.proto +++ b/proto/CutSceneEndNotify.proto @@ -2,7 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 299 +// EnetChannelId: 0 +// EnetIsReliable: true message CutSceneEndNotify { - int32 retcode = 1; - uint32 cutscene_id = 2; + int32 retcode = 8; + uint32 cutscene_id = 11; } diff --git a/proto/CutSceneFinishNotify.proto b/proto/CutSceneFinishNotify.proto index 8c42d853..49940c0b 100644 --- a/proto/CutSceneFinishNotify.proto +++ b/proto/CutSceneFinishNotify.proto @@ -2,6 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 294 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message CutSceneFinishNotify { - uint32 cutscene_id = 1; + uint32 cutscene_id = 14; } diff --git a/proto/DailyDungeonEntryInfo.proto b/proto/DailyDungeonEntryInfo.proto new file mode 100644 index 00000000..d12b175e --- /dev/null +++ b/proto/DailyDungeonEntryInfo.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "DungeonEntryInfo.proto"; + +message DailyDungeonEntryInfo { + uint32 dungeon_entry_id = 1; + uint32 dungeon_entry_config_id = 2; + uint32 recommend_dungeon_id = 3; + DungeonEntryInfo recommend_dungeon_entry_info = 4; +} diff --git a/proto/DealAddFriendReq.proto b/proto/DealAddFriendReq.proto index 1941a5cd..add0c673 100644 --- a/proto/DealAddFriendReq.proto +++ b/proto/DealAddFriendReq.proto @@ -4,16 +4,11 @@ option java_package = "emu.grasscutter.net.proto"; import "DealAddFriendResultType.proto"; +// CmdId: 4085 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message DealAddFriendReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4094; - } - - uint32 target_uid = 1; - DealAddFriendResultType deal_add_friend_result = 2; + uint32 target_uid = 7; + DealAddFriendResultType deal_add_friend_result = 1; } diff --git a/proto/DealAddFriendResultType.proto b/proto/DealAddFriendResultType.proto index f0925b00..8336021a 100644 --- a/proto/DealAddFriendResultType.proto +++ b/proto/DealAddFriendResultType.proto @@ -3,6 +3,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum DealAddFriendResultType { - DEAL_ADD_FRIEND_REJECT = 0; - DEAL_ADD_FRIEND_ACCEPT = 1; + 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 b8961f45..75c6a4a4 100644 --- a/proto/DealAddFriendRsp.proto +++ b/proto/DealAddFriendRsp.proto @@ -4,17 +4,12 @@ option java_package = "emu.grasscutter.net.proto"; import "DealAddFriendResultType.proto"; +// CmdId: 4035 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message DealAddFriendRsp { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4042; - } - - int32 retcode = 1; + int32 retcode = 3; uint32 target_uid = 2; - DealAddFriendResultType deal_add_friend_result = 3; + DealAddFriendResultType deal_add_friend_result = 15; } diff --git a/proto/DelMailReq.proto b/proto/DelMailReq.proto index ac72fce2..264b30a8 100644 --- a/proto/DelMailReq.proto +++ b/proto/DelMailReq.proto @@ -2,6 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 1417 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message DelMailReq { - repeated uint32 mail_id_list = 1; + repeated uint32 mail_id_list = 6; } diff --git a/proto/DelMailRsp.proto b/proto/DelMailRsp.proto index cd20e6fa..517df959 100644 --- a/proto/DelMailRsp.proto +++ b/proto/DelMailRsp.proto @@ -2,7 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 1485 +// EnetChannelId: 0 +// EnetIsReliable: true message DelMailRsp { - int32 retcode = 1; - repeated uint32 mail_id_list = 2; + int32 retcode = 1; + repeated uint32 mail_id_list = 4; } diff --git a/proto/DelTeamEntityNotify.proto b/proto/DelTeamEntityNotify.proto index 28ff1166..85279fe1 100644 --- a/proto/DelTeamEntityNotify.proto +++ b/proto/DelTeamEntityNotify.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 302 +// EnetChannelId: 0 +// EnetIsReliable: true message DelTeamEntityNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 366; - } - - uint32 scene_id = 1; - repeated uint32 del_entity_id_list = 2; + uint32 scene_id = 8; + repeated uint32 del_entity_id_list = 15; } diff --git a/proto/DeleteFriendNotify.proto b/proto/DeleteFriendNotify.proto index c8befa9e..1d7d5fbd 100644 --- a/proto/DeleteFriendNotify.proto +++ b/proto/DeleteFriendNotify.proto @@ -2,15 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4063 +// EnetChannelId: 0 +// EnetIsReliable: true message DeleteFriendNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4032; - } - - uint32 target_uid = 1; + uint32 target_uid = 14; } diff --git a/proto/DeleteFriendReq.proto b/proto/DeleteFriendReq.proto index b27fd960..1ed309a8 100644 --- a/proto/DeleteFriendReq.proto +++ b/proto/DeleteFriendReq.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4055 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message DeleteFriendReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4012; - } - - uint32 target_uid = 1; + uint32 target_uid = 7; } diff --git a/proto/DeleteFriendRsp.proto b/proto/DeleteFriendRsp.proto index fe941209..9ff896a4 100644 --- a/proto/DeleteFriendRsp.proto +++ b/proto/DeleteFriendRsp.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4027 +// EnetChannelId: 0 +// EnetIsReliable: true message DeleteFriendRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4026; - } - - int32 retcode = 1; - uint32 target_uid = 2; + int32 retcode = 4; + uint32 target_uid = 8; } diff --git a/proto/DestroyMaterialReq.proto b/proto/DestroyMaterialReq.proto index a2a0915c..ccb2ffc1 100644 --- a/proto/DestroyMaterialReq.proto +++ b/proto/DestroyMaterialReq.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "MaterialInfo.proto"; +// CmdId: 678 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message DestroyMaterialReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 687; - } - - repeated MaterialInfo material_list = 1; + repeated MaterialInfo material_list = 12; } diff --git a/proto/DestroyMaterialRsp.proto b/proto/DestroyMaterialRsp.proto index 22978436..34e65315 100644 --- a/proto/DestroyMaterialRsp.proto +++ b/proto/DestroyMaterialRsp.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 608 +// EnetChannelId: 0 +// EnetIsReliable: true message DestroyMaterialRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 641; - } - - int32 retcode = 1; - repeated uint32 item_id_list = 2; - repeated uint32 item_count_list = 3; + int32 retcode = 9; + repeated uint32 item_id_list = 11; + repeated uint32 item_count_list = 10; } diff --git a/proto/DoGachaReq.proto b/proto/DoGachaReq.proto index 85a632c8..c6e4eded 100644 --- a/proto/DoGachaReq.proto +++ b/proto/DoGachaReq.proto @@ -2,20 +2,14 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1541 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message DoGachaReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 1589; - } - - uint32 gacha_type = 1; - uint32 gacha_times = 2; - uint32 gacha_random = 3; - uint32 gacha_schedule_id = 4; - string gacha_tag = 5; + uint32 gacha_type = 10; + uint32 gacha_times = 15; + uint32 gacha_random = 5; + uint32 gacha_schedule_id = 6; + string gacha_tag = 4; } diff --git a/proto/DoGachaRsp.proto b/proto/DoGachaRsp.proto index 83fd9289..51d2edd7 100644 --- a/proto/DoGachaRsp.proto +++ b/proto/DoGachaRsp.proto @@ -4,28 +4,25 @@ option java_package = "emu.grasscutter.net.proto"; import "GachaItem.proto"; +// CmdId: 1537 +// EnetChannelId: 0 +// EnetIsReliable: true message DoGachaRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1584; - } - - int32 retcode = 1; - uint32 gacha_type = 2; + int32 retcode = 9; + uint32 gacha_type = 11; uint32 gacha_times = 3; uint32 gacha_schedule_id = 4; - repeated GachaItem gacha_item_list = 5; - uint32 new_gacha_random = 6; - uint32 cost_item_id = 7; - uint32 cost_item_num = 8; - uint32 ten_cost_item_id = 9; - uint32 ten_cost_item_num = 10; - uint32 left_gacha_times = 11; - uint32 gacha_times_limit = 12; - uint32 wish_item_id = 13; - uint32 wish_progress = 14; - uint32 wish_max_progress = 15; + repeated GachaItem gacha_item_list = 2; + uint32 new_gacha_random = 8; + uint32 cost_item_id = 6; + uint32 cost_item_num = 1; + uint32 ten_cost_item_id = 14; + uint32 ten_cost_item_num = 7; + uint32 left_gacha_times = 15; + uint32 gacha_times_limit = 13; + uint32 wish_item_id = 10; + uint32 wish_progress = 5; + uint32 wish_max_progress = 12; + uint32 NKJOBOABFOJ = 1679; + bool PODALHILIKF = 1561; } diff --git a/proto/DropHintNotify.proto b/proto/DropHintNotify.proto index c22cb3d5..cece2eef 100644 --- a/proto/DropHintNotify.proto +++ b/proto/DropHintNotify.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; +// CmdId: 622 +// EnetChannelId: 0 +// EnetIsReliable: true message DropHintNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 609; - } - - repeated uint32 item_id_list = 1; - Vector position = 2; + repeated uint32 item_id_list = 12; + Vector position = 1; } diff --git a/proto/DungeonChallengeBeginNotify.proto b/proto/DungeonChallengeBeginNotify.proto index 936de926..e34a9c8b 100644 --- a/proto/DungeonChallengeBeginNotify.proto +++ b/proto/DungeonChallengeBeginNotify.proto @@ -2,11 +2,14 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 990 +// EnetChannelId: 0 +// EnetIsReliable: true message DungeonChallengeBeginNotify { - uint32 challenge_id = 1; - uint32 challenge_index = 2; - repeated uint32 param_list = 3; - uint32 group_id = 4; - uint32 father_index = 5; - repeated uint32 uid_list = 6; + uint32 challenge_id = 8; + uint32 challenge_index = 11; + repeated uint32 param_list = 13; + uint32 group_id = 12; + uint32 father_index = 6; + repeated uint32 uid_list = 9; } diff --git a/proto/DungeonChallengeFinishNotify.proto b/proto/DungeonChallengeFinishNotify.proto index abababed..47a3bcd1 100644 --- a/proto/DungeonChallengeFinishNotify.proto +++ b/proto/DungeonChallengeFinishNotify.proto @@ -2,21 +2,29 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +//import "CDPBNKLFNKP.proto"; import "ChannellerSlabLoopDungeonResultInfo.proto"; import "EffigyChallengeDungeonResultInfo.proto"; +//import "FHOKHHBGPEG.proto"; +//import "IDFFMJEDODN.proto"; import "StrengthenPointData.proto"; +// CmdId: 986 +// EnetChannelId: 0 +// EnetIsReliable: true message DungeonChallengeFinishNotify { - oneof Detail { - ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 101; - EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 102; + uint32 challenge_index = 11; + bool is_success = 4; + bool is_new_record = 2; + uint32 challenge_record_type = 10; + uint32 current_value = 12; + map strengthen_point_data_map = 13; + //FHOKHHBGPEG NJDMJAFIJNH = 15; + uint32 time_cost = 6; + oneof detail { + ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1758; + EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 913; + //CDPBNKLFNKP potion_dungeon_result_info = 382; + //IDFFMJEDODN custom_dungeon_result_info = 1411; } - uint32 challenge_index = 1; - bool is_success = 2; - bool is_new_record = 3; - uint32 challenge_record_type = 4; - uint32 current_value = 5; - map strengthen_point_data_map = 6; - uint32 unk1 = 7; - uint32 unk2 = 8; } diff --git a/proto/DungeonDataNotify.proto b/proto/DungeonDataNotify.proto index 797564f9..2638b930 100644 --- a/proto/DungeonDataNotify.proto +++ b/proto/DungeonDataNotify.proto @@ -2,6 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 945 +// EnetChannelId: 0 +// EnetIsReliable: true message DungeonDataNotify { - map dungeon_data_map = 1; + map dungeon_data_map = 6; } diff --git a/proto/DungeonEntryInfoReq.proto b/proto/DungeonEntryInfoReq.proto index 9bcc2edf..b88d3ab7 100644 --- a/proto/DungeonEntryInfoReq.proto +++ b/proto/DungeonEntryInfoReq.proto @@ -2,16 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 909 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message DungeonEntryInfoReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 949; - } - - uint32 point_id = 1; + uint32 point_id = 15; + uint32 scene_id = 3; } diff --git a/proto/DungeonEntryInfoRsp.proto b/proto/DungeonEntryInfoRsp.proto index 4e529f95..d385c777 100644 --- a/proto/DungeonEntryInfoRsp.proto +++ b/proto/DungeonEntryInfoRsp.proto @@ -4,17 +4,12 @@ option java_package = "emu.grasscutter.net.proto"; import "DungeonEntryInfo.proto"; +// CmdId: 931 +// EnetChannelId: 0 +// EnetIsReliable: true message DungeonEntryInfoRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 918; - } - - int32 retcode = 1; - uint32 point_id = 2; - repeated DungeonEntryInfo dungeon_entry_list = 3; + int32 retcode = 14; + uint32 point_id = 9; + repeated DungeonEntryInfo dungeon_entry_list = 10; uint32 recommend_dungeon_id = 4; } diff --git a/proto/DungeonGetStatueDropRsp.proto b/proto/DungeonGetStatueDropRsp.proto index 29a8a76c..09617113 100644 --- a/proto/DungeonGetStatueDropRsp.proto +++ b/proto/DungeonGetStatueDropRsp.proto @@ -2,6 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 906 +// EnetChannelId: 0 +// EnetIsReliable: true message DungeonGetStatueDropRsp { - int32 retcode = 1; + int32 retcode = 13; } diff --git a/proto/DungeonSettleExhibitionInfo.proto b/proto/DungeonSettleExhibitionInfo.proto new file mode 100644 index 00000000..d8b9714e --- /dev/null +++ b/proto/DungeonSettleExhibitionInfo.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "ExhibitionDisplayInfo.proto"; +import "OnlinePlayerInfo.proto"; + +message DungeonSettleExhibitionInfo { + OnlinePlayerInfo player_info = 1; + repeated ExhibitionDisplayInfo card_list = 2; +} diff --git a/proto/DungeonSettleNotify.proto b/proto/DungeonSettleNotify.proto index c48ab8f6..bd5cad6a 100644 --- a/proto/DungeonSettleNotify.proto +++ b/proto/DungeonSettleNotify.proto @@ -2,20 +2,35 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +import "ChannellerSlabLoopDungeonResultInfo.proto"; +import "DungeonSettleExhibitionInfo.proto"; +import "EffigyChallengeDungeonResultInfo.proto"; +//import "KHPIGECGFKI.proto"; import "ParamList.proto"; +import "RoguelikeDungeonSettleInfo.proto"; import "StrengthenPointData.proto"; import "TowerLevelEndNotify.proto"; +import "TrialAvatarFirstPassDungeonNotify.proto"; +// CmdId: 982 +// EnetChannelId: 0 +// EnetIsReliable: true message DungeonSettleNotify { - oneof Detail { - TowerLevelEndNotify tower_level_end_notify = 101; - // it has more! + uint32 dungeon_id = 9; + bool is_success = 10; + repeated uint32 fail_cond_list = 13; + map settle_show = 11; + uint32 close_time = 12; + map strengthen_point_data_map = 4; + uint32 result = 15; + repeated DungeonSettleExhibitionInfo exhibition_info_list = 14; + //uint32 OMBINLAOGBM = 5; + oneof detail { + TowerLevelEndNotify tower_level_end_notify = 97; + TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 796; + ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1671; + EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1638; + RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 71; + //KHPIGECGFKI crystal_link_settle_info = 430; } - uint32 dungeon_id = 1; - bool is_success = 2; - repeated uint32 fail_cond_list = 3; - map settle_show = 4; - uint32 close_time = 5; - map strengthen_point_data_map = 6; - uint32 result = 7; } diff --git a/proto/DungeonShowReminderNotify.proto b/proto/DungeonShowReminderNotify.proto new file mode 100644 index 00000000..40f9334a --- /dev/null +++ b/proto/DungeonShowReminderNotify.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 930 +// EnetChannelId: 0 +// EnetIsReliable: true +message DungeonShowReminderNotify { + uint32 reminder_id = 10; +} diff --git a/proto/EAJCGENDICI.proto b/proto/EAJCGENDICI.proto new file mode 100644 index 00000000..539209b7 --- /dev/null +++ b/proto/EAJCGENDICI.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +enum EAJCGENDICI { + EAJCGENDICI_NDNHCNOOCCA = 0; + EAJCGENDICI_GFALGAIAPOP = 1; + EAJCGENDICI_AAFPJPGKHPO = 2; + EAJCGENDICI_HFKOPLPHODM = 3; + EAJCGENDICI_OPIOJNLJNJN = 4; + EAJCGENDICI_GHHLNHAJEBA = 5; +} diff --git a/proto/EnterSceneDoneRsp.proto b/proto/EnterSceneDoneRsp.proto index e4d9d422..d5a4a1bc 100644 --- a/proto/EnterSceneDoneRsp.proto +++ b/proto/EnterSceneDoneRsp.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 269 +// EnetChannelId: 0 +// EnetIsReliable: true message EnterSceneDoneRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 248; - } - - int32 retcode = 1; - uint32 enter_scene_token = 2; + int32 retcode = 9; + uint32 enter_scene_token = 8; } diff --git a/proto/EnterScenePeerNotify.proto b/proto/EnterScenePeerNotify.proto index 61f39228..e4ca37ce 100644 --- a/proto/EnterScenePeerNotify.proto +++ b/proto/EnterScenePeerNotify.proto @@ -2,18 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 257 +// EnetChannelId: 0 +// EnetIsReliable: true message EnterScenePeerNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 223; - } - - uint32 dest_scene_id = 1; - uint32 peer_id = 2; - uint32 host_peer_id = 3; - uint32 enter_scene_token = 4; + uint32 dest_scene_id = 13; + uint32 peer_id = 11; + uint32 host_peer_id = 6; + uint32 enter_scene_token = 15; } diff --git a/proto/EnterSceneReadyRsp.proto b/proto/EnterSceneReadyRsp.proto index 93ba8007..8f384a94 100644 --- a/proto/EnterSceneReadyRsp.proto +++ b/proto/EnterSceneReadyRsp.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 252 +// EnetChannelId: 0 +// EnetIsReliable: true message EnterSceneReadyRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 245; - } - - int32 retcode = 1; - uint32 enter_scene_token = 2; + int32 retcode = 5; + uint32 enter_scene_token = 8; } diff --git a/proto/EnterTransPointRegionNotify.proto b/proto/EnterTransPointRegionNotify.proto index b6bb9fa9..8441ff5b 100644 --- a/proto/EnterTransPointRegionNotify.proto +++ b/proto/EnterTransPointRegionNotify.proto @@ -1,7 +1,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 298 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message EnterTransPointRegionNotify { - uint32 scene_id = 1; - uint32 point_id = 2; + uint32 scene_id = 15; + uint32 point_id = 12; } diff --git a/proto/EnterType.proto b/proto/EnterType.proto index 57a2e682..85c96046 100644 --- a/proto/EnterType.proto +++ b/proto/EnterType.proto @@ -3,16 +3,16 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum EnterType { - ENTER_NONE = 0; - ENTER_SELF = 1; - ENTER_GOTO = 2; - ENTER_JUMP = 3; - ENTER_OTHER = 4; - ENTER_BACK = 5; - ENTER_DUNGEON = 6; - ENTER_DUNGEON_REPLAY = 7; - ENTER_GOTO_BY_PORTAL = 8; - ENTER_SELF_HOME = 9; - ENTER_OTHER_HOME = 10; - ENTER_GOTO_RECREATE = 11; + ENTER_TYPE_NONE = 0; + ENTER_TYPE_SELF = 1; + ENTER_TYPE_GOTO = 2; + ENTER_TYPE_JUMP = 3; + ENTER_TYPE_OTHER = 4; + ENTER_TYPE_BACK = 5; + ENTER_TYPE_DUNGEON = 6; + ENTER_TYPE_DUNGEON_REPLAY = 7; + ENTER_TYPE_GOTO_BY_PORTAL = 8; + ENTER_TYPE_SELF_HOME = 9; + ENTER_TYPE_OTHER_HOME = 10; + ENTER_TYPE_GOTO_RECREATE = 11; } diff --git a/proto/EnterWorldAreaReq.proto b/proto/EnterWorldAreaReq.proto index 45d5358d..87612310 100644 --- a/proto/EnterWorldAreaReq.proto +++ b/proto/EnterWorldAreaReq.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 222 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message EnterWorldAreaReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 209; - } - - uint32 area_type = 1; - uint32 area_id = 2; + uint32 area_type = 12; + uint32 area_id = 10; } diff --git a/proto/EnterWorldAreaRsp.proto b/proto/EnterWorldAreaRsp.proto index ddba1f0b..269d4b72 100644 --- a/proto/EnterWorldAreaRsp.proto +++ b/proto/EnterWorldAreaRsp.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 254 +// EnetChannelId: 0 +// EnetIsReliable: true message EnterWorldAreaRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 255; - } - - int32 retcode = 1; + int32 retcode = 15; uint32 area_type = 2; - uint32 area_id = 3; + uint32 area_id = 4; } diff --git a/proto/EntityAiSyncNotify.proto b/proto/EntityAiSyncNotify.proto index b2577d92..9cc5e7fe 100644 --- a/proto/EntityAiSyncNotify.proto +++ b/proto/EntityAiSyncNotify.proto @@ -4,16 +4,11 @@ option java_package = "emu.grasscutter.net.proto"; import "AiSyncInfo.proto"; +// CmdId: 343 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message EntityAiSyncNotify { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 352; - } - repeated AiSyncInfo info_list = 1; - repeated uint32 local_avatar_alerted_monster_list = 2; + repeated uint32 local_avatar_alerted_monster_list = 10; } diff --git a/proto/EntityAuthorityInfo.proto b/proto/EntityAuthorityInfo.proto index 69c377f9..d39a97d7 100644 --- a/proto/EntityAuthorityInfo.proto +++ b/proto/EntityAuthorityInfo.proto @@ -3,10 +3,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "AbilitySyncStateInfo.proto"; +import "AnimatorParameterValueInfoPair.proto"; import "EntityRendererChangedInfo.proto"; +//import "HFMDKDHCJCM.proto"; import "SceneEntityAiInfo.proto"; import "Vector.proto"; -import "AnimatorParameterValueInfoPair.proto"; message EntityAuthorityInfo { AbilitySyncStateInfo ability_info = 1; @@ -14,4 +15,5 @@ message EntityAuthorityInfo { SceneEntityAiInfo ai_info = 3; Vector born_pos = 4; repeated AnimatorParameterValueInfoPair pose_para_list = 5; + //HFMDKDHCJCM NHJAJEMKIFE = 6; } diff --git a/proto/EntityClientData.proto b/proto/EntityClientData.proto index 50d8cb3e..4bf26cc6 100644 --- a/proto/EntityClientData.proto +++ b/proto/EntityClientData.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message EntityClientData { uint32 wind_change_scene_time = 1; float windmill_sync_angle = 2; diff --git a/proto/EntityEnvironmentInfo.proto b/proto/EntityEnvironmentInfo.proto index ebc19121..2276d067 100644 --- a/proto/EntityEnvironmentInfo.proto +++ b/proto/EntityEnvironmentInfo.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message EntityEnvironmentInfo { uint32 json_climate_type = 1; uint32 climate_area_id = 2; diff --git a/proto/EntityFightPropChangeReasonNotify.proto b/proto/EntityFightPropChangeReasonNotify.proto index 11dd4f26..330438da 100644 --- a/proto/EntityFightPropChangeReasonNotify.proto +++ b/proto/EntityFightPropChangeReasonNotify.proto @@ -2,24 +2,19 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "PropChangeReason.proto"; -import "ChangeHpReason.proto"; import "ChangeEnergyReason.proto"; +import "ChangeHpReason.proto"; +import "PropChangeReason.proto"; +// CmdId: 1285 +// EnetChannelId: 0 +// EnetIsReliable: true message EntityFightPropChangeReasonNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1294; - } - - uint32 entity_id = 1; - uint32 prop_type = 2; - float prop_delta = 3; - PropChangeReason reason = 4; - repeated uint32 param_list = 5; - ChangeHpReason change_hp_reason = 6; - ChangeEnergyReason change_energy_reson = 7; + uint32 entity_id = 11; + uint32 prop_type = 6; + float prop_delta = 9; + PropChangeReason reason = 5; + repeated uint32 param_list = 10; + ChangeHpReason change_hp_reason = 12; + ChangeEnergyReason change_energy_reson = 4; } diff --git a/proto/EntityFightPropUpdateNotify.proto b/proto/EntityFightPropUpdateNotify.proto index bc1fb1dd..660f68a8 100644 --- a/proto/EntityFightPropUpdateNotify.proto +++ b/proto/EntityFightPropUpdateNotify.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1237 +// EnetChannelId: 0 +// EnetIsReliable: true message EntityFightPropUpdateNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1284; - } - uint32 entity_id = 1; - map fight_prop_map = 2; + map fight_prop_map = 8; } diff --git a/proto/EntityPropNotify.proto b/proto/EntityPropNotify.proto index ae9412d0..5d0d70dc 100644 --- a/proto/EntityPropNotify.proto +++ b/proto/EntityPropNotify.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "PropValue.proto"; +// CmdId: 1209 +// EnetChannelId: 0 +// EnetIsReliable: true message EntityPropNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1249; - } - - uint32 entity_id = 1; - map prop_map = 2; + uint32 entity_id = 5; + map prop_map = 4; } diff --git a/proto/EntityRendererChangedInfo.proto b/proto/EntityRendererChangedInfo.proto index b516139c..ff23a765 100644 --- a/proto/EntityRendererChangedInfo.proto +++ b/proto/EntityRendererChangedInfo.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message EntityRendererChangedInfo { map changed_renderers = 1; uint32 visibility_count = 2; diff --git a/proto/Equip.proto b/proto/Equip.proto index edfe05f6..2d985e5c 100644 --- a/proto/Equip.proto +++ b/proto/Equip.proto @@ -6,9 +6,9 @@ import "Reliquary.proto"; import "Weapon.proto"; message Equip { - oneof Detail { + bool is_locked = 3; + oneof detail { Reliquary reliquary = 1; Weapon weapon = 2; } - bool is_locked = 3; } diff --git a/proto/EquipParam.proto b/proto/EquipParam.proto index 52d24943..51b07afb 100644 --- a/proto/EquipParam.proto +++ b/proto/EquipParam.proto @@ -3,8 +3,8 @@ 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; + uint32 item_id = 1; + uint32 item_num = 2; + uint32 item_level = 3; + uint32 promote_level = 4; } diff --git a/proto/EvtAiSyncCombatThreatInfoNotify.proto b/proto/EvtAiSyncCombatThreatInfoNotify.proto index fb0c6907..108b6314 100644 --- a/proto/EvtAiSyncCombatThreatInfoNotify.proto +++ b/proto/EvtAiSyncCombatThreatInfoNotify.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "AiThreatInfo.proto"; +// CmdId: 360 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message EvtAiSyncCombatThreatInfoNotify { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 373; - } - - map combat_threat_info_map = 1; + map combat_threat_info_map = 14; } diff --git a/proto/EvtAiSyncSkillCdNotify.proto b/proto/EvtAiSyncSkillCdNotify.proto index 8cc86faf..6e6ca5b7 100644 --- a/proto/EvtAiSyncSkillCdNotify.proto +++ b/proto/EvtAiSyncSkillCdNotify.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "AiSkillCdInfo.proto"; +// CmdId: 333 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message EvtAiSyncSkillCdNotify { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 399; - } - - map ai_cd_map = 1; + map ai_cd_map = 5; } diff --git a/proto/EvtAvatarLockChairReq.proto b/proto/EvtAvatarLockChairReq.proto index cbdd4267..145bff41 100644 --- a/proto/EvtAvatarLockChairReq.proto +++ b/proto/EvtAvatarLockChairReq.proto @@ -4,16 +4,11 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; +// CmdId: 308 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message EvtAvatarLockChairReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 341; - } - - uint64 chair_id = 1; - Vector position = 2; + uint64 chair_id = 10; + Vector position = 3; } diff --git a/proto/EvtAvatarLockChairRsp.proto b/proto/EvtAvatarLockChairRsp.proto index bf2498c5..b6139095 100644 --- a/proto/EvtAvatarLockChairRsp.proto +++ b/proto/EvtAvatarLockChairRsp.proto @@ -4,17 +4,12 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; +// CmdId: 304 +// EnetChannelId: 0 +// EnetIsReliable: true message EvtAvatarLockChairRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 305; - } - int32 retcode = 1; - uint32 entity_id = 2; - Vector position = 3; - uint64 chair_id = 4; + uint32 entity_id = 4; + Vector position = 12; + uint64 chair_id = 15; } diff --git a/proto/EvtAvatarSitDownNotify.proto b/proto/EvtAvatarSitDownNotify.proto index 69a42adf..602364f8 100644 --- a/proto/EvtAvatarSitDownNotify.proto +++ b/proto/EvtAvatarSitDownNotify.proto @@ -4,17 +4,12 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; +// CmdId: 359 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message EvtAvatarSitDownNotify { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 321; - } - - uint32 entity_id = 1; - Vector position = 2; - uint64 chair_id = 3; + uint32 entity_id = 10; + Vector position = 5; + uint64 chair_id = 8; } diff --git a/proto/EvtAvatarStandUpNotify.proto b/proto/EvtAvatarStandUpNotify.proto index ebae8f1e..36f78310 100644 --- a/proto/EvtAvatarStandUpNotify.proto +++ b/proto/EvtAvatarStandUpNotify.proto @@ -2,18 +2,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 384 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message EvtAvatarStandUpNotify { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 331; - } - - uint32 entity_id = 1; - int32 direction = 2; - int32 perform_i_d = 3; - uint64 chair_id = 4; + uint32 entity_id = 10; + int32 direction = 3; + int32 perform_id = 8; + uint64 chair_id = 11; } diff --git a/proto/EvtBeingHitNotify.proto b/proto/EvtBeingHitNotify.proto index 0814dfef..2281918b 100644 --- a/proto/EvtBeingHitNotify.proto +++ b/proto/EvtBeingHitNotify.proto @@ -2,19 +2,14 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "ForwardType.proto"; import "EvtBeingHitInfo.proto"; +import "ForwardType.proto"; +// CmdId: 309 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message EvtBeingHitNotify { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 349; - } - - ForwardType forward_type = 1; - EvtBeingHitInfo being_hit_info = 2; + ForwardType forward_type = 13; + EvtBeingHitInfo being_hit_info = 7; } diff --git a/proto/EvtBeingHitsCombineNotify.proto b/proto/EvtBeingHitsCombineNotify.proto index e6356c1d..a26e9d83 100644 --- a/proto/EvtBeingHitsCombineNotify.proto +++ b/proto/EvtBeingHitsCombineNotify.proto @@ -2,19 +2,14 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "ForwardType.proto"; import "EvtBeingHitInfo.proto"; +import "ForwardType.proto"; +// CmdId: 336 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message EvtBeingHitsCombineNotify { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 375; - } - ForwardType forward_type = 1; - repeated EvtBeingHitInfo evt_being_hit_info_list = 2; + repeated EvtBeingHitInfo evt_being_hit_info_list = 14; } diff --git a/proto/EvtCreateGadgetNotify.proto b/proto/EvtCreateGadgetNotify.proto index e928fe28..0cebc616 100644 --- a/proto/EvtCreateGadgetNotify.proto +++ b/proto/EvtCreateGadgetNotify.proto @@ -5,29 +5,28 @@ option java_package = "emu.grasscutter.net.proto"; import "ForwardType.proto"; import "Vector.proto"; +// CmdId: 332 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message EvtCreateGadgetNotify { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 400; - } - - ForwardType forward_type = 1; - uint32 entity_id = 2; - uint32 config_id = 3; - uint32 camp_id = 4; - uint32 camp_type = 5; - Vector init_pos = 6; - Vector init_euler_angles = 7; - uint64 guid = 8; - uint32 owner_entity_id = 9; - uint32 target_entity_id = 10; - bool is_async_load = 11; - uint32 target_lock_point_index = 12; - uint32 room_id = 13; - uint32 prop_owner_entity_id = 14; - bool sight_group_with_owner = 15; + ForwardType forward_type = 8; + uint32 entity_id = 14; + uint32 config_id = 11; + uint32 camp_id = 13; + uint32 camp_type = 3; + Vector init_pos = 15; + Vector init_euler_angles = 5; + uint64 guid = 1; + uint32 owner_entity_id = 2; + uint32 target_entity_id = 7; + bool is_async_load = 9; + uint32 target_lock_point_index = 4; + uint32 room_id = 10; + uint32 prop_owner_entity_id = 6; + bool sight_group_with_owner = 12; + bool CEGHBCJMNFJ = 1011; + bool NGANCEBKNKC = 1304; + repeated uint32 FCFECGFHLAD = 1525; + repeated uint32 GEHIKJLBKAH = 1637; } diff --git a/proto/EvtDestroyGadgetNotify.proto b/proto/EvtDestroyGadgetNotify.proto index 2fa5970c..329ce398 100644 --- a/proto/EvtDestroyGadgetNotify.proto +++ b/proto/EvtDestroyGadgetNotify.proto @@ -4,16 +4,11 @@ option java_package = "emu.grasscutter.net.proto"; import "ForwardType.proto"; +// CmdId: 317 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message EvtDestroyGadgetNotify { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 301; - } - - ForwardType forward_type = 1; - uint32 entity_id = 2; + ForwardType forward_type = 10; + uint32 entity_id = 8; } diff --git a/proto/EvtDoSkillSuccNotify.proto b/proto/EvtDoSkillSuccNotify.proto index 235743c6..80cfe334 100644 --- a/proto/EvtDoSkillSuccNotify.proto +++ b/proto/EvtDoSkillSuccNotify.proto @@ -5,18 +5,13 @@ option java_package = "emu.grasscutter.net.proto"; import "ForwardType.proto"; import "Vector.proto"; +// CmdId: 337 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message EvtDoSkillSuccNotify { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 384; - } - - ForwardType forward_type = 1; - uint32 caster_id = 2; - uint32 skill_id = 3; - Vector forward = 4; + ForwardType forward_type = 6; + uint32 caster_id = 10; + uint32 skill_id = 1; + Vector forward = 8; } diff --git a/proto/EvtEntityRenderersChangedNotify.proto b/proto/EvtEntityRenderersChangedNotify.proto new file mode 100644 index 00000000..5c8a5da0 --- /dev/null +++ b/proto/EvtEntityRenderersChangedNotify.proto @@ -0,0 +1,17 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "EntityRendererChangedInfo.proto"; +import "ForwardType.proto"; + +// CmdId: 354 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message EvtEntityRenderersChangedNotify { + ForwardType forward_type = 2; + uint32 entity_id = 7; + bool is_server_cache = 15; + EntityRendererChangedInfo renderer_changed_info = 3; +} diff --git a/proto/ExhibitionDisplayInfo.proto b/proto/ExhibitionDisplayInfo.proto new file mode 100644 index 00000000..58d83e76 --- /dev/null +++ b/proto/ExhibitionDisplayInfo.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message ExhibitionDisplayInfo { + uint32 id = 1; + uint32 param = 2; + uint32 detail_param = 3; +} diff --git a/proto/FeatureBlockInfo.proto b/proto/FeatureBlockInfo.proto index d6689673..fd79b4cb 100644 --- a/proto/FeatureBlockInfo.proto +++ b/proto/FeatureBlockInfo.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message FeatureBlockInfo { uint32 feature_type = 1; uint32 end_time = 2; diff --git a/proto/FetterData.proto b/proto/FetterData.proto index 7b1b9360..bed18990 100644 --- a/proto/FetterData.proto +++ b/proto/FetterData.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message FetterData { uint32 fetter_id = 1; uint32 fetter_state = 2; diff --git a/proto/FightPropPair.proto b/proto/FightPropPair.proto index 7c740032..5ada4cc6 100644 --- a/proto/FightPropPair.proto +++ b/proto/FightPropPair.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message FightPropPair { uint32 prop_type = 1; float prop_value = 2; diff --git a/proto/FinishedParentQuestNotify.proto b/proto/FinishedParentQuestNotify.proto index 834b18a4..3d5b5353 100644 --- a/proto/FinishedParentQuestNotify.proto +++ b/proto/FinishedParentQuestNotify.proto @@ -4,6 +4,9 @@ option java_package = "emu.grasscutter.net.proto"; import "ParentQuest.proto"; +// CmdId: 437 +// EnetChannelId: 0 +// EnetIsReliable: true message FinishedParentQuestNotify { - repeated ParentQuest parent_quest_list = 1; + repeated ParentQuest parent_quest_list = 12; } diff --git a/proto/FinishedParentQuestUpdateNotify.proto b/proto/FinishedParentQuestUpdateNotify.proto index 82565af5..a4b97b35 100644 --- a/proto/FinishedParentQuestUpdateNotify.proto +++ b/proto/FinishedParentQuestUpdateNotify.proto @@ -4,6 +4,9 @@ option java_package = "emu.grasscutter.net.proto"; import "ParentQuest.proto"; +// CmdId: 432 +// EnetChannelId: 0 +// EnetIsReliable: true message FinishedParentQuestUpdateNotify { - repeated ParentQuest parent_quest_list = 1; + repeated ParentQuest parent_quest_list = 6; } diff --git a/proto/FireWorkData.proto b/proto/FireWorkData.proto new file mode 100644 index 00000000..888e2471 --- /dev/null +++ b/proto/FireWorkData.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "FireWorkInstance.proto"; + +message FireWorkData { + uint32 id = 1; + repeated FireWorkInstance fireWorkInstance = 2; +} diff --git a/proto/FireWorkInstance.proto b/proto/FireWorkInstance.proto new file mode 100644 index 00000000..3435b84f --- /dev/null +++ b/proto/FireWorkInstance.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "FireWorkType.proto"; + +message FireWorkInstance { + FireWorkType type = 1; + int32 value = 2; +} diff --git a/proto/FireWorkNotify.proto b/proto/FireWorkNotify.proto new file mode 100644 index 00000000..030eb2e1 --- /dev/null +++ b/proto/FireWorkNotify.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "FireWorkData.proto"; + +// CmdId: 6079 +// EnetChannelId: 0 +// EnetIsReliable: true +message FireWorkNotify { + repeated FireWorkData fireWorkData = 1; +} diff --git a/proto/FireWorkReq.proto b/proto/FireWorkReq.proto new file mode 100644 index 00000000..6fa8aeb7 --- /dev/null +++ b/proto/FireWorkReq.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "FireWorkData.proto"; + +// CmdId: 6068 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message FireWorkReq { + FireWorkData fireWorkData = 7; +} diff --git a/proto/FireWorkRsp.proto b/proto/FireWorkRsp.proto new file mode 100644 index 00000000..f5d9ec18 --- /dev/null +++ b/proto/FireWorkRsp.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 5918 +// EnetChannelId: 0 +// EnetIsReliable: true +message FireWorkRsp { + int32 retcode = 10; +} diff --git a/proto/FireWorkType.proto b/proto/FireWorkType.proto new file mode 100644 index 00000000..1b37fa93 --- /dev/null +++ b/proto/FireWorkType.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +enum FireWorkType { + FireWorkType_ODJKANKMPPJ = 0; + FireWorkType_EFGLHEIODFN = 1; + FireWorkType_JPBBBCFGHAK = 2; + FireWorkType_IDCMGHBHBFH = 3; + FireWorkType_ODDBNNDFMBO = 4; + FireWorkType_AGIDMOGJOBD = 5; +} diff --git a/proto/FireworkSetData.proto b/proto/FireworkSetData.proto new file mode 100644 index 00000000..b06a0fba --- /dev/null +++ b/proto/FireworkSetData.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "FireWorkInstance.proto"; + +message FireworkSetData { + uint32 id = 1; + repeated uint32 _unknown_field_ = 2; + repeated FireWorkInstance fireWorkInstance = 3; +} diff --git a/proto/FireworkSetNotify.proto b/proto/FireworkSetNotify.proto new file mode 100644 index 00000000..f002a41a --- /dev/null +++ b/proto/FireworkSetNotify.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "FireworkSetData.proto"; + +// CmdId: 5934 +// EnetChannelId: 0 +// EnetIsReliable: true +message FireworkSetNotify { + uint32 code = 1; + repeated FireworkSetData data = 9; +} diff --git a/proto/FireworkSetReq.proto b/proto/FireworkSetReq.proto new file mode 100644 index 00000000..d8014b3d --- /dev/null +++ b/proto/FireworkSetReq.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "FireworkSetData.proto"; + +// CmdId: 6099 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message FireworkSetReq { + FireworkSetData data = 2; +} diff --git a/proto/FireworkSetRsp.proto b/proto/FireworkSetRsp.proto new file mode 100644 index 00000000..b4ac1ffc --- /dev/null +++ b/proto/FireworkSetRsp.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 5969 +// EnetChannelId: 0 +// EnetIsReliable: true +message NBFJOJPCCEK_Rsp { + int32 retcode = 7; +} diff --git a/proto/ForgeDataNotify.proto b/proto/ForgeDataNotify.proto new file mode 100644 index 00000000..d5b06ba2 --- /dev/null +++ b/proto/ForgeDataNotify.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "ForgeQueueData.proto"; + +// CmdId: 648 +// EnetChannelId: 0 +// EnetIsReliable: true +message ForgeDataNotify { + repeated uint32 forge_id_list = 13; + uint32 max_queue_num = 15; + map forge_queue_map = 1; +} diff --git a/proto/ForgeFormulaDataNotify.proto b/proto/ForgeFormulaDataNotify.proto new file mode 100644 index 00000000..940764c0 --- /dev/null +++ b/proto/ForgeFormulaDataNotify.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 673 +// EnetChannelId: 0 +// EnetIsReliable: true +message ForgeFormulaDataNotify { + uint32 forge_id = 11; + bool is_locked = 8; +} diff --git a/proto/ForgeGetQueueDataRsp.proto b/proto/ForgeGetQueueDataRsp.proto new file mode 100644 index 00000000..9539fc4a --- /dev/null +++ b/proto/ForgeGetQueueDataRsp.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "ForgeQueueData.proto"; + +// CmdId: 628 +// EnetChannelId: 0 +// EnetIsReliable: true +message ForgeGetQueueDataRsp { + int32 retcode = 15; + uint32 max_queue_num = 13; + map forge_queue_map = 11; +} diff --git a/proto/ForgeQueueData.proto b/proto/ForgeQueueData.proto new file mode 100644 index 00000000..c05e110e --- /dev/null +++ b/proto/ForgeQueueData.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message ForgeQueueData { + uint32 queue_id = 1; + uint32 forge_id = 2; + uint32 finish_count = 3; + uint32 unfinish_count = 4; + uint32 next_finish_timestamp = 5; + uint32 total_finish_timestamp = 6; + uint32 avatar_id = 7; +} diff --git a/proto/ForgeQueueDataNotify.proto b/proto/ForgeQueueDataNotify.proto new file mode 100644 index 00000000..761f7618 --- /dev/null +++ b/proto/ForgeQueueDataNotify.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "ForgeQueueData.proto"; + +// CmdId: 633 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message ForgeQueueDataNotify { + map forge_queue_map = 14; + repeated uint32 removed_forge_queue_list = 8; +} diff --git a/proto/ForgeQueueManipulateReq.proto b/proto/ForgeQueueManipulateReq.proto new file mode 100644 index 00000000..1ea87a1e --- /dev/null +++ b/proto/ForgeQueueManipulateReq.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "ForgeQueueManipulateType.proto"; + +// CmdId: 659 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message ForgeQueueManipulateReq { + uint32 forge_queue_id = 11; + ForgeQueueManipulateType manipulate_type = 7; +} diff --git a/proto/ForgeQueueManipulateRsp.proto b/proto/ForgeQueueManipulateRsp.proto new file mode 100644 index 00000000..0ba0694b --- /dev/null +++ b/proto/ForgeQueueManipulateRsp.proto @@ -0,0 +1,17 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "ForgeQueueManipulateType.proto"; +import "ItemParam.proto"; + +// CmdId: 684 +// EnetChannelId: 0 +// EnetIsReliable: true +message ForgeQueueManipulateRsp { + int32 retcode = 13; + ForgeQueueManipulateType manipulate_type = 8; + repeated ItemParam output_item_list = 6; + repeated ItemParam return_item_list = 10; + repeated ItemParam extra_output_item_list = 3; +} diff --git a/proto/ForgeQueueManipulateType.proto b/proto/ForgeQueueManipulateType.proto new file mode 100644 index 00000000..bfbb15aa --- /dev/null +++ b/proto/ForgeQueueManipulateType.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +enum ForgeQueueManipulateType { + FORGE_QUEUE_MANIPULATE_TYPE_RECEIVE_OUTPUT = 0; + FORGE_QUEUE_MANIPULATE_TYPE_STOP_FORGE = 1; +} diff --git a/proto/ForgeStartReq.proto b/proto/ForgeStartReq.proto new file mode 100644 index 00000000..e42f7adb --- /dev/null +++ b/proto/ForgeStartReq.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 676 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message ForgeStartReq { + uint32 forge_id = 9; + uint32 forge_count = 11; + uint32 avatar_id = 13; +} diff --git a/proto/ForgeStartRsp.proto b/proto/ForgeStartRsp.proto new file mode 100644 index 00000000..ea471f41 --- /dev/null +++ b/proto/ForgeStartRsp.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 672 +// EnetChannelId: 0 +// EnetIsReliable: true +message ForgeStartRsp { + int32 retcode = 11; +} diff --git a/proto/ForwardType.proto b/proto/ForwardType.proto index b2464360..15e48d34 100644 --- a/proto/ForwardType.proto +++ b/proto/ForwardType.proto @@ -3,13 +3,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum ForwardType { - FORWARD_LOCAL = 0; - FORWARD_TO_ALL = 1; - FORWARD_TO_ALL_EXCEPT_CUR = 2; - FORWARD_TO_HOST = 3; - FORWARD_TO_ALL_GUEST = 4; - FORWARD_TO_PEER = 5; - FORWARD_TO_PEERS = 6; - FORWARD_ONLY_SERVER = 7; - FORWARD_TO_ALL_EXIST_EXCEPT_CUR = 8; + FORWARD_TYPE_LOCAL = 0; + FORWARD_TYPE_TO_ALL = 1; + FORWARD_TYPE_TO_ALL_EXCEPT_CUR = 2; + FORWARD_TYPE_TO_HOST = 3; + FORWARD_TYPE_TO_ALL_GUEST = 4; + FORWARD_TYPE_TO_PEER = 5; + FORWARD_TYPE_TO_PEERS = 6; + FORWARD_TYPE_ONLY_SERVER = 7; + FORWARD_TYPE_TO_ALL_EXIST_EXCEPT_CUR = 8; } diff --git a/proto/FoundationInfo.proto b/proto/FoundationInfo.proto index f99c2b11..acfc6be6 100644 --- a/proto/FoundationInfo.proto +++ b/proto/FoundationInfo.proto @@ -3,16 +3,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "FoundationStatus.proto"; -import "BuildingInfo.proto"; message FoundationInfo { FoundationStatus status = 1; repeated uint32 uid_list = 2; uint32 current_building_id = 3; - uint64 begin_build_time_ms = 4; - uint32 demolition_refund = 5; - repeated BuildingInfo building_list = 6; - uint32 current_num = 7; - uint32 max_num = 8; - uint32 locked_by_uid = 9; + uint32 begin_build_time_ms = 4; } diff --git a/proto/FriendBrief.proto b/proto/FriendBrief.proto index 83b4f4fe..1359c243 100644 --- a/proto/FriendBrief.proto +++ b/proto/FriendBrief.proto @@ -2,10 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "FriendOnlineState.proto"; import "FriendEnterHomeOption.proto"; -import "ProfilePicture.proto"; +import "FriendOnlineState.proto"; import "PlatformType.proto"; +import "ProfilePicture.proto"; import "SocialShowAvatarInfo.proto"; message FriendBrief { diff --git a/proto/FriendEnterHomeOption.proto b/proto/FriendEnterHomeOption.proto index 3aa2bd72..ddeda8b5 100644 --- a/proto/FriendEnterHomeOption.proto +++ b/proto/FriendEnterHomeOption.proto @@ -3,7 +3,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum FriendEnterHomeOption { - NEED_CONFIRM = 0; - REFUSE = 1; - 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 0c08222b..1b7c9116 100644 --- a/proto/FriendOnlineState.proto +++ b/proto/FriendOnlineState.proto @@ -3,6 +3,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum FriendOnlineState { - FREIEND_DISCONNECT = 0; - FRIEND_ONLINE = 1; + FRIEND_ONLINE_STATE_FREIEND_DISCONNECT = 0; + FRIEND_ONLINE_STATE_ONLINE = 1; } diff --git a/proto/Furniture.proto b/proto/Furniture.proto index ba058d8e..dc4a2a38 100644 --- a/proto/Furniture.proto +++ b/proto/Furniture.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message Furniture { uint32 count = 1; } diff --git a/proto/FurnitureCurModuleArrangeCountNotify.proto b/proto/FurnitureCurModuleArrangeCountNotify.proto new file mode 100644 index 00000000..c1cabce1 --- /dev/null +++ b/proto/FurnitureCurModuleArrangeCountNotify.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "Uint32Pair.proto"; + +// CmdId: 4681 +// EnetChannelId: 0 +// EnetIsReliable: true +message FurnitureCurModuleArrangeCountNotify { + repeated Uint32Pair furniture_arrange_count_list = 9; +} diff --git a/proto/FurnitureMakeBeHelpedData.proto b/proto/FurnitureMakeBeHelpedData.proto new file mode 100644 index 00000000..f5c3fe08 --- /dev/null +++ b/proto/FurnitureMakeBeHelpedData.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "ProfilePicture.proto"; + +message FurnitureMakeBeHelpedData { + string player_name = 1; + uint32 time = 2; + uint32 uid = 3; + uint32 icon = 4; + ProfilePicture profile_picture = 5; +} diff --git a/proto/FurnitureMakeData.proto b/proto/FurnitureMakeData.proto new file mode 100644 index 00000000..3231ce1a --- /dev/null +++ b/proto/FurnitureMakeData.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message FurnitureMakeData { + uint32 index = 1; + uint32 make_id = 2; + uint32 begin_time = 3; + uint32 dur_time = 4; + uint32 accelerate_time = 5; + uint32 avatar_id = 6; +} diff --git a/proto/FurnitureMakeHelpData.proto b/proto/FurnitureMakeHelpData.proto new file mode 100644 index 00000000..298773c7 --- /dev/null +++ b/proto/FurnitureMakeHelpData.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message FurnitureMakeHelpData { + uint32 uid = 1; + uint32 times = 2; +} diff --git a/proto/FurnitureMakeMakeInfo.proto b/proto/FurnitureMakeMakeInfo.proto new file mode 100644 index 00000000..d59a108d --- /dev/null +++ b/proto/FurnitureMakeMakeInfo.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message FurnitureMakeMakeInfo { + uint32 furniture_id = 1; + uint32 make_count = 2; +} diff --git a/proto/FurnitureMakeReq.proto b/proto/FurnitureMakeReq.proto new file mode 100644 index 00000000..7247cd47 --- /dev/null +++ b/proto/FurnitureMakeReq.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 4551 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message FurnitureMakeReq { +} diff --git a/proto/FurnitureMakeRsp.proto b/proto/FurnitureMakeRsp.proto new file mode 100644 index 00000000..4a63c198 --- /dev/null +++ b/proto/FurnitureMakeRsp.proto @@ -0,0 +1,19 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "FurnitureMakeBeHelpedData.proto"; +import "FurnitureMakeHelpData.proto"; +import "FurnitureMakeMakeInfo.proto"; +import "FurnitureMakeSlot.proto"; + +// CmdId: 4530 +// EnetChannelId: 0 +// EnetIsReliable: true +message FurnitureMakeRsp { + int32 retcode = 6; + FurnitureMakeSlot furniture_make_slot = 10; + repeated FurnitureMakeHelpData help_data_list = 13; + repeated FurnitureMakeBeHelpedData helped_data_list = 12; + repeated FurnitureMakeMakeInfo make_info_list = 11; +} diff --git a/proto/FurnitureMakeSlot.proto b/proto/FurnitureMakeSlot.proto new file mode 100644 index 00000000..5d4b32e7 --- /dev/null +++ b/proto/FurnitureMakeSlot.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "FurnitureMakeData.proto"; + +message FurnitureMakeSlot { + repeated FurnitureMakeData furniture_make_data_list = 1; +} diff --git a/proto/FurnitureMakeStartReq.proto b/proto/FurnitureMakeStartReq.proto new file mode 100644 index 00000000..d1bca84c --- /dev/null +++ b/proto/FurnitureMakeStartReq.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 4582 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message FurnitureMakeStartReq { + uint32 make_id = 1; + uint32 avatar_id = 14; +} diff --git a/proto/FurnitureMakeStartRsp.proto b/proto/FurnitureMakeStartRsp.proto new file mode 100644 index 00000000..518489f0 --- /dev/null +++ b/proto/FurnitureMakeStartRsp.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "FurnitureMakeSlot.proto"; + +// CmdId: 4463 +// EnetChannelId: 0 +// EnetIsReliable: true +message FurnitureMakeStartRsp { + int32 retcode = 8; + FurnitureMakeSlot furniture_make_slot = 10; +} diff --git a/proto/GachaInfo.proto b/proto/GachaInfo.proto index ebf25b09..92e67197 100644 --- a/proto/GachaInfo.proto +++ b/proto/GachaInfo.proto @@ -5,25 +5,29 @@ option java_package = "emu.grasscutter.net.proto"; import "GachaUpInfo.proto"; message GachaInfo { - uint32 gachaType = 1; - uint32 scheduleId = 2; - uint32 beginTime = 3; - uint32 endTime = 4; - uint32 costItemId = 5; - uint32 costItemNum = 6; - string gachaPrefabPath = 7; - string gachaProbUrl = 8; - string gachaRecordUrl = 9; - string gachaPreviewPrefabPath = 10; - uint32 tenCostItemId = 11; - uint32 tenCostItemNum = 12; - uint32 leftGachaTimes = 13; - uint32 gachaTimesLimit = 14; - uint32 gachaSortId = 15; - string gachaProbUrlOversea = 16; - string gachaRecordUrlOversea = 17; - repeated GachaUpInfo gachaUpInfoList = 18; - string gachaTitlePath = 19; - repeated uint32 mainNameId = 20; - repeated uint32 subNameId = 21; -} \ No newline at end of file + uint32 gacha_type = 1; + uint32 schedule_id = 2; + uint32 begin_time = 3; + uint32 end_time = 4; + uint32 cost_item_id = 5; + uint32 cost_item_num = 6; + string gacha_prefab_path = 7; + string gacha_prob_url = 8; + string gacha_record_url = 9; + string gacha_preview_prefab_path = 10; + uint32 ten_cost_item_id = 11; + uint32 ten_cost_item_num = 12; + uint32 left_gacha_times = 13; + uint32 gacha_times_limit = 14; + uint32 gacha_sort_id = 15; + string gacha_prob_url_oversea = 16; + string gacha_record_url_oversea = 17; + repeated GachaUpInfo gacha_up_info_list = 18; + string title_textmap = 19; + repeated uint32 display_up_5_item_list = 20; + repeated uint32 display_up_4_item_list = 21; + uint32 wish_item_id = 22; + uint32 wish_progress = 23; + uint32 wish_max_progress = 24; + bool is_new_wish = 25; +} diff --git a/proto/GachaItem.proto b/proto/GachaItem.proto index a2d73af2..c20166cf 100644 --- a/proto/GachaItem.proto +++ b/proto/GachaItem.proto @@ -2,8 +2,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "ItemParam.proto"; import "GachaTransferItem.proto"; +import "ItemParam.proto"; message GachaItem { ItemParam gacha_item_ = 1; diff --git a/proto/GachaUpInfo.proto b/proto/GachaUpInfo.proto index 37d1873a..2000dc48 100644 --- a/proto/GachaUpInfo.proto +++ b/proto/GachaUpInfo.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message GachaUpInfo { uint32 item_parent_type = 1; repeated uint32 item_id_list = 2; diff --git a/proto/GachaWishReq.proto b/proto/GachaWishReq.proto new file mode 100644 index 00000000..05f60baa --- /dev/null +++ b/proto/GachaWishReq.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 1532 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message GachaWishReq { + uint32 gacha_type = 2; + uint32 gacha_schedule_id = 4; + uint32 item_id = 14; +} \ No newline at end of file diff --git a/proto/GachaWishRsp.proto b/proto/GachaWishRsp.proto new file mode 100644 index 00000000..d588f8a1 --- /dev/null +++ b/proto/GachaWishRsp.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 1517 +// EnetChannelId: 0 +// EnetIsReliable: true +message GachaWishRsp { + int32 retcode = 7; + uint32 gacha_type = 14; + uint32 gacha_schedule_id = 15; + uint32 wish_item_id = 3; + uint32 wish_progress = 12; + uint32 wish_max_progress = 10; +} \ No newline at end of file diff --git a/proto/GadgetAutoPickDropInfoNotify.proto b/proto/GadgetAutoPickDropInfoNotify.proto index f66c6986..bb0c77d8 100644 --- a/proto/GadgetAutoPickDropInfoNotify.proto +++ b/proto/GadgetAutoPickDropInfoNotify.proto @@ -4,6 +4,9 @@ option java_package = "emu.grasscutter.net.proto"; import "Item.proto"; +// CmdId: 830 +// EnetChannelId: 0 +// EnetIsReliable: true message GadgetAutoPickDropInfoNotify { - repeated Item item_list = 1; + repeated Item item_list = 15; } diff --git a/proto/GadgetBornType.proto b/proto/GadgetBornType.proto index c20baa44..bd38b6f1 100644 --- a/proto/GadgetBornType.proto +++ b/proto/GadgetBornType.proto @@ -3,11 +3,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum GadgetBornType { - GADGET_BORN_NONE = 0; - GADGET_BORN_IN_AIR = 1; - GADGET_BORN_PLAYER = 2; - GADGET_BORN_MONSTER_HIT = 3; - GADGET_BORN_MONSTER_DIE = 4; - GADGET_BORN_GADGET = 5; - GADGET_BORN_GROUND = 6; + 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/GadgetCrucibleInfo.proto b/proto/GadgetCrucibleInfo.proto index 3fbbcede..8f98bfde 100644 --- a/proto/GadgetCrucibleInfo.proto +++ b/proto/GadgetCrucibleInfo.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message GadgetCrucibleInfo { uint32 mp_play_id = 1; uint32 prepare_end_time = 2; diff --git a/proto/GadgetInteractReq.proto b/proto/GadgetInteractReq.proto index 540f1922..5795ab24 100644 --- a/proto/GadgetInteractReq.proto +++ b/proto/GadgetInteractReq.proto @@ -5,19 +5,15 @@ option java_package = "emu.grasscutter.net.proto"; import "InterOpType.proto"; import "ResinCostType.proto"; +// CmdId: 809 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message GadgetInteractReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 849; - } - - uint32 gadget_entity_id = 1; - InterOpType op_type = 2; - uint32 gadget_id = 3; - bool is_use_condense_resin = 4; - ResinCostType resin_cost_type = 5; + uint32 gadget_entity_id = 9; + InterOpType op_type = 6; + uint32 gadget_id = 14; + bool is_use_condense_resin = 15; + ResinCostType resin_cost_type = 11; + uint32 GCIEIJIOADO = 12; } diff --git a/proto/GadgetInteractRsp.proto b/proto/GadgetInteractRsp.proto index 1c500d87..1982c87f 100644 --- a/proto/GadgetInteractRsp.proto +++ b/proto/GadgetInteractRsp.proto @@ -5,18 +5,13 @@ option java_package = "emu.grasscutter.net.proto"; import "InteractType.proto"; import "InterOpType.proto"; +// CmdId: 831 +// EnetChannelId: 0 +// EnetIsReliable: true message GadgetInteractRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 818; - } - - int32 retcode = 1; - uint32 gadget_entity_id = 2; - InteractType interact_type = 3; - InterOpType op_type = 4; - uint32 gadget_id = 5; + int32 retcode = 4; + uint32 gadget_entity_id = 6; + InteractType interact_type = 9; + InterOpType op_type = 1; + uint32 gadget_id = 14; } diff --git a/proto/GadgetPlayInfo.proto b/proto/GadgetPlayInfo.proto index 2ad76e24..788f2c62 100644 --- a/proto/GadgetPlayInfo.proto +++ b/proto/GadgetPlayInfo.proto @@ -5,13 +5,13 @@ option java_package = "emu.grasscutter.net.proto"; import "GadgetCrucibleInfo.proto"; message GadgetPlayInfo { - oneof PlayInfo { - GadgetCrucibleInfo crucible_info = 21; - } uint32 play_type = 1; uint32 duration = 2; repeated uint32 progress_stage_list = 3; uint32 start_cd = 4; uint32 start_time = 5; uint32 progress = 6; + oneof play_info { + GadgetCrucibleInfo crucible_info = 21; + } } diff --git a/proto/GadgetStateNotify.proto b/proto/GadgetStateNotify.proto index 5c37b7cd..9ea3b052 100644 --- a/proto/GadgetStateNotify.proto +++ b/proto/GadgetStateNotify.proto @@ -2,8 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 841 +// EnetChannelId: 0 +// EnetIsReliable: true message GadgetStateNotify { - uint32 gadget_entity_id = 1; - uint32 gadget_state = 2; - bool is_enable_interact = 3; + uint32 gadget_entity_id = 2; + uint32 gadget_state = 11; + bool is_enable_interact = 10; } diff --git a/proto/GetActivityInfoReq.proto b/proto/GetActivityInfoReq.proto new file mode 100644 index 00000000..d3c75c66 --- /dev/null +++ b/proto/GetActivityInfoReq.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 2067 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message GetActivityInfoReq { + repeated uint32 activity_id_list = 14; +} diff --git a/proto/GetActivityInfoRsp.proto b/proto/GetActivityInfoRsp.proto index 6da523f8..f826d910 100644 --- a/proto/GetActivityInfoRsp.proto +++ b/proto/GetActivityInfoRsp.proto @@ -5,17 +5,12 @@ option java_package = "emu.grasscutter.net.proto"; import "ActivityInfo.proto"; import "Uint32Pair.proto"; +// CmdId: 2144 +// EnetChannelId: 0 +// EnetIsReliable: true message GetActivityInfoRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 2011; - } - - int32 retcode = 1; - repeated ActivityInfo activity_info_list = 2; - repeated uint32 activated_sale_id_list = 3; + int32 retcode = 13; + repeated ActivityInfo activity_info_list = 14; + repeated uint32 activated_sale_id_list = 2; repeated Uint32Pair disable_transfer_point_interaction_list = 4; } diff --git a/proto/GetAllMailReq.proto b/proto/GetAllMailReq.proto index 8c6bce10..73b95157 100644 --- a/proto/GetAllMailReq.proto +++ b/proto/GetAllMailReq.proto @@ -2,6 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 1455 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message GetAllMailReq { - bool is_gift_mail = 1; + bool ANKKGPJCINB = 7; } diff --git a/proto/GetAllMailRsp.proto b/proto/GetAllMailRsp.proto index 96891664..2d64a6d0 100644 --- a/proto/GetAllMailRsp.proto +++ b/proto/GetAllMailRsp.proto @@ -4,9 +4,12 @@ option java_package = "emu.grasscutter.net.proto"; import "MailData.proto"; +// CmdId: 1427 +// EnetChannelId: 0 +// EnetIsReliable: true message GetAllMailRsp { - int32 retcode = 1; - repeated MailData mail_list = 2; - bool is_truncated = 3; - bool isGiftMail = 4; + int32 retcode = 6; + repeated MailData mail_list = 9; + bool is_truncated = 5; + bool ANKKGPJCINB = 7; } diff --git a/proto/GetAllUnlockNameCardRsp.proto b/proto/GetAllUnlockNameCardRsp.proto index aaf13382..38891691 100644 --- a/proto/GetAllUnlockNameCardRsp.proto +++ b/proto/GetAllUnlockNameCardRsp.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4058 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message GetAllUnlockNameCardRsp { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4076; - } - - int32 retcode = 1; + int32 retcode = 13; repeated uint32 name_card_list = 2; } diff --git a/proto/GetAuthkeyReq.proto b/proto/GetAuthkeyReq.proto index 8816c814..1bf25903 100644 --- a/proto/GetAuthkeyReq.proto +++ b/proto/GetAuthkeyReq.proto @@ -2,18 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1435 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message GetAuthkeyReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 1442; - } - - string auth_appid = 1; - uint32 sign_type = 2; - uint32 authkey_ver = 3; + string auth_appid = 12; + uint32 sign_type = 15; + uint32 authkey_ver = 7; } diff --git a/proto/GetAuthkeyRsp.proto b/proto/GetAuthkeyRsp.proto index 35c1aee7..7ec1c684 100644 --- a/proto/GetAuthkeyRsp.proto +++ b/proto/GetAuthkeyRsp.proto @@ -2,20 +2,14 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1449 +// EnetChannelId: 0 +// EnetIsReliable: true message GetAuthkeyRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1461; - } - - int32 retcode = 1; - string authkey = 2; - string auth_appid = 3; - uint32 sign_type = 4; - uint32 authkey_ver = 5; - string game_biz = 6; + int32 retcode = 11; + string authkey = 1; + string auth_appid = 2; + uint32 sign_type = 7; + uint32 authkey_ver = 10; + string game_biz = 4; } diff --git a/proto/GetBattlePassProductReq.proto b/proto/GetBattlePassProductReq.proto new file mode 100644 index 00000000..9cee2e69 --- /dev/null +++ b/proto/GetBattlePassProductReq.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 2616 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message GetBattlePassProductReq { + uint32 battle_pass_product_play_type = 2; +} diff --git a/proto/GetBattlePassProductRsp.proto b/proto/GetBattlePassProductRsp.proto new file mode 100644 index 00000000..bb2e15f5 --- /dev/null +++ b/proto/GetBattlePassProductRsp.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 2601 +// EnetChannelId: 0 +// EnetIsReliable: true +message GetBattlePassProductRsp { + int32 retcode = 13; + uint32 battle_pass_product_play_type = 9; + uint32 cur_schedule_id = 12; + string product_id = 7; + string price_tier = 5; +} diff --git a/proto/GetDailyDungeonEntryInfoReq.proto b/proto/GetDailyDungeonEntryInfoReq.proto new file mode 100644 index 00000000..8b01cfd1 --- /dev/null +++ b/proto/GetDailyDungeonEntryInfoReq.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 929 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message GetDailyDungeonEntryInfoReq { + uint32 scene_id = 11; +} diff --git a/proto/GetDailyDungeonEntryInfoRsp.proto b/proto/GetDailyDungeonEntryInfoRsp.proto new file mode 100644 index 00000000..17c1b9ec --- /dev/null +++ b/proto/GetDailyDungeonEntryInfoRsp.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "DailyDungeonEntryInfo.proto"; + +// CmdId: 925 +// EnetChannelId: 0 +// EnetIsReliable: true +message GetDailyDungeonEntryInfoRsp { + int32 retcode = 9; + repeated DailyDungeonEntryInfo daily_dungeon_info_list = 4; +} diff --git a/proto/GetFriendShowAvatarInfoReq.proto b/proto/GetFriendShowAvatarInfoReq.proto index 33c888d4..98a047aa 100644 --- a/proto/GetFriendShowAvatarInfoReq.proto +++ b/proto/GetFriendShowAvatarInfoReq.proto @@ -2,15 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 4003 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message GetFriendShowAvatarInfoReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4007; - } - - uint32 uid = 1; + uint32 uid = 9; } diff --git a/proto/GetFriendShowAvatarInfoRsp.proto b/proto/GetFriendShowAvatarInfoRsp.proto index abd7d2aa..8e060a69 100644 --- a/proto/GetFriendShowAvatarInfoRsp.proto +++ b/proto/GetFriendShowAvatarInfoRsp.proto @@ -4,16 +4,11 @@ option java_package = "emu.grasscutter.net.proto"; import "ShowAvatarInfo.proto"; +// CmdId: 4034 +// EnetChannelId: 0 +// EnetIsReliable: true message GetFriendShowAvatarInfoRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4008; - } - - int32 retcode = 1; - uint32 uid = 2; - repeated ShowAvatarInfo show_avatar_info_list = 3; + int32 retcode = 14; + uint32 uid = 11; + repeated ShowAvatarInfo show_avatar_info_list = 7; } diff --git a/proto/GetFurnitureCurModuleArrangeCountReq.proto b/proto/GetFurnitureCurModuleArrangeCountReq.proto new file mode 100644 index 00000000..d8a61643 --- /dev/null +++ b/proto/GetFurnitureCurModuleArrangeCountReq.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 4603 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message GetFurnitureCurModuleArrangeCountReq { +} diff --git a/proto/GetGachaInfoRsp.proto b/proto/GetGachaInfoRsp.proto index 0aca2e46..ae177365 100644 --- a/proto/GetGachaInfoRsp.proto +++ b/proto/GetGachaInfoRsp.proto @@ -4,16 +4,13 @@ option java_package = "emu.grasscutter.net.proto"; import "GachaInfo.proto"; +// CmdId: 1531 +// EnetChannelId: 0 +// EnetIsReliable: true message GetGachaInfoRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1518; - } - - int32 retcode = 1; - repeated GachaInfo gacha_info_list = 2; - uint32 gacha_random = 3; + int32 retcode = 14; + repeated GachaInfo gacha_info_list = 12; + uint32 gacha_random = 13; + uint32 NKJOBOABFOJ = 7; + bool PODALHILIKF = 9; } diff --git a/proto/GetInvestigationMonsterReq.proto b/proto/GetInvestigationMonsterReq.proto index 418a3957..4e126fc6 100644 --- a/proto/GetInvestigationMonsterReq.proto +++ b/proto/GetInvestigationMonsterReq.proto @@ -2,15 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 1902 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message GetInvestigationMonsterReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 1916; - } - - repeated uint32 city_id_list = 1; + repeated uint32 city_id_list = 13; + bool ABFECCDJENJ = 11; } diff --git a/proto/GetInvestigationMonsterRsp.proto b/proto/GetInvestigationMonsterRsp.proto index f4c5e7b2..c8c678a5 100644 --- a/proto/GetInvestigationMonsterRsp.proto +++ b/proto/GetInvestigationMonsterRsp.proto @@ -4,16 +4,12 @@ option java_package = "emu.grasscutter.net.proto"; import "InvestigationMonster.proto"; +// CmdId: 1911 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message GetInvestigationMonsterRsp { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 1928; - } - - int32 retcode = 1; - repeated InvestigationMonster monster_list = 2; + int32 retcode = 9; + repeated InvestigationMonster monster_list = 7; + bool ABFECCDJENJ = 10; } diff --git a/proto/GetMailItemReq.proto b/proto/GetMailItemReq.proto index 259c8ba5..9189d3b1 100644 --- a/proto/GetMailItemReq.proto +++ b/proto/GetMailItemReq.proto @@ -2,6 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 1437 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message GetMailItemReq { - repeated uint32 mail_id_list = 1; + repeated uint32 mail_id_list = 8; } diff --git a/proto/GetMailItemRsp.proto b/proto/GetMailItemRsp.proto index e14bd54c..68e900b9 100644 --- a/proto/GetMailItemRsp.proto +++ b/proto/GetMailItemRsp.proto @@ -4,8 +4,11 @@ option java_package = "emu.grasscutter.net.proto"; import "EquipParam.proto"; +// CmdId: 1432 +// EnetChannelId: 0 +// EnetIsReliable: true message GetMailItemRsp { - int32 retcode = 1; - repeated uint32 mail_id_list = 2; - repeated EquipParam item_list = 3; + int32 retcode = 13; + repeated uint32 mail_id_list = 10; + repeated EquipParam item_list = 5; } diff --git a/proto/GetOnlinePlayerListReq.proto b/proto/GetOnlinePlayerListReq.proto index dafef1a9..5a713998 100644 --- a/proto/GetOnlinePlayerListReq.proto +++ b/proto/GetOnlinePlayerListReq.proto @@ -1,6 +1,10 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; +// CmdId: 35 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message GetOnlinePlayerListReq { -uint32 targetUid = 1; } diff --git a/proto/GetOnlinePlayerListRsp.proto b/proto/GetOnlinePlayerListRsp.proto index b202195b..c9f39885 100644 --- a/proto/GetOnlinePlayerListRsp.proto +++ b/proto/GetOnlinePlayerListRsp.proto @@ -1,10 +1,14 @@ syntax = "proto3"; + option java_package = "emu.grasscutter.net.proto"; + import "OnlinePlayerInfo.proto"; +// CmdId: 49 +// EnetChannelId: 0 +// EnetIsReliable: true message GetOnlinePlayerListRsp { - int32 retcode = 1; - repeated OnlinePlayerInfo player_info_list = 2; - uint32 param = 3; - uint32 targetUid = 4; + int32 retcode = 12; + repeated OnlinePlayerInfo player_info_list = 10; + uint32 param = 2; } diff --git a/proto/GetPlayerAskFriendListRsp.proto b/proto/GetPlayerAskFriendListRsp.proto index c3cfe926..35594993 100644 --- a/proto/GetPlayerAskFriendListRsp.proto +++ b/proto/GetPlayerAskFriendListRsp.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "FriendBrief.proto"; +// CmdId: 4004 +// EnetChannelId: 0 +// EnetIsReliable: true message GetPlayerAskFriendListRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4005; - } - - int32 retcode = 1; - repeated FriendBrief ask_friend_list = 2; + int32 retcode = 15; + repeated FriendBrief ask_friend_list = 13; } diff --git a/proto/GetPlayerBlacklistRsp.proto b/proto/GetPlayerBlacklistRsp.proto index 6a6966af..b9de72c7 100644 --- a/proto/GetPlayerBlacklistRsp.proto +++ b/proto/GetPlayerBlacklistRsp.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "FriendBrief.proto"; +// CmdId: 4072 +// EnetChannelId: 0 +// EnetIsReliable: true message GetPlayerBlacklistRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4020; - } - - int32 retcode = 1; - repeated FriendBrief blacklist = 2; + int32 retcode = 12; + repeated FriendBrief blacklist = 5; } diff --git a/proto/GetPlayerFriendListRsp.proto b/proto/GetPlayerFriendListRsp.proto index 044f3bc2..3ac03fc5 100644 --- a/proto/GetPlayerFriendListRsp.proto +++ b/proto/GetPlayerFriendListRsp.proto @@ -4,17 +4,12 @@ option java_package = "emu.grasscutter.net.proto"; import "FriendBrief.proto"; +// CmdId: 4031 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message GetPlayerFriendListRsp { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4018; - } - - int32 retcode = 1; - repeated FriendBrief friend_list = 2; - repeated FriendBrief ask_friend_list = 3; + int32 retcode = 3; + repeated FriendBrief friend_list = 6; + repeated FriendBrief ask_friend_list = 5; } diff --git a/proto/GetPlayerHomeCompInfoReq.proto b/proto/GetPlayerHomeCompInfoReq.proto new file mode 100644 index 00000000..a8723084 --- /dev/null +++ b/proto/GetPlayerHomeCompInfoReq.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 4845 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message GetPlayerHomeCompInfoReq { +} diff --git a/proto/GetPlayerSocialDetailReq.proto b/proto/GetPlayerSocialDetailReq.proto index c0a4bc40..6d9d8db2 100644 --- a/proto/GetPlayerSocialDetailReq.proto +++ b/proto/GetPlayerSocialDetailReq.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4049 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message GetPlayerSocialDetailReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4061; - } - - uint32 uid = 1; + uint32 uid = 14; } diff --git a/proto/GetPlayerSocialDetailRsp.proto b/proto/GetPlayerSocialDetailRsp.proto index 6ef02e88..f68f2d4e 100644 --- a/proto/GetPlayerSocialDetailRsp.proto +++ b/proto/GetPlayerSocialDetailRsp.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "SocialDetail.proto"; +// CmdId: 4082 +// EnetChannelId: 0 +// EnetIsReliable: true message GetPlayerSocialDetailRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4079; - } - - int32 retcode = 1; - SocialDetail detail_data = 2; + int32 retcode = 2; + SocialDetail detail_data = 15; } diff --git a/proto/GetPlayerTokenReq.proto b/proto/GetPlayerTokenReq.proto index f43d00d0..300058bd 100644 --- a/proto/GetPlayerTokenReq.proto +++ b/proto/GetPlayerTokenReq.proto @@ -2,30 +2,26 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 109 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message GetPlayerTokenReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 149; - } - - uint32 account_type = 1; - string account_uid = 2; - string account_token = 3; - string account_ext = 4; - uint32 uid = 5; - bool is_guest = 6; + uint32 account_type = 3; + string account_uid = 12; + string account_token = 14; + string account_ext = 2; + uint32 uid = 8; + bool is_guest = 4; uint32 platform_type = 7; - uint32 cloud_client_ip = 8; + uint32 cloud_client_ip = 13; string online_id = 9; - string psn_region = 10; - uint32 channel_id = 11; - uint32 sub_channel_id = 12; - string country_code = 13; - string psn_id = 14; - string client_ip_str = 15; + string psn_region = 15; + uint32 channel_id = 10; + uint32 sub_channel_id = 1; + string country_code = 11; + string psn_id = 5; + string client_ip_str = 6; + string birthday = 966; + uint32 NNCIBOLDIAI = 1883; } diff --git a/proto/GetPlayerTokenRsp.proto b/proto/GetPlayerTokenRsp.proto index d48a6661..39f87f2e 100644 --- a/proto/GetPlayerTokenRsp.proto +++ b/proto/GetPlayerTokenRsp.proto @@ -2,38 +2,35 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 131 +// EnetChannelId: 0 +// EnetIsReliable: true message GetPlayerTokenRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 118; - } - - int32 retcode = 1; - string msg = 2; - uint32 uid = 3; - string token = 4; - uint32 black_uid_end_time = 5; - uint32 account_type = 6; - string account_uid = 7; - bool is_proficient_player = 8; - string secret_key = 9; - uint32 gm_uid = 10; + int32 retcode = 7; + string msg = 10; + uint32 uid = 2; + string token = 1; + uint32 black_uid_end_time = 15; + uint32 account_type = 12; + string account_uid = 4; + bool is_proficient_player = 5; + string secret_key = 13; + uint32 gm_uid = 14; uint64 secret_key_seed = 11; - bytes security_cmd_buffer = 12; - uint32 platform_type = 13; - bytes extra_bin_data = 14; - bool is_guest = 15; - uint32 channel_id = 16; - uint32 sub_channel_id = 17; - uint32 tag = 18; - string country_code = 19; - bool is_login_white_list = 20; - string psn_id = 21; - string client_version_random_key = 22; - uint32 reg_platform = 23; - string client_ip_str = 24; + bytes security_cmd_buffer = 6; + uint32 platform_type = 3; + bytes extra_bin_data = 8; + bool is_guest = 9; + uint32 channel_id = 1614; + uint32 sub_channel_id = 1911; + uint32 tag = 1855; + string country_code = 739; + bool is_login_white_list = 977; + string psn_id = 245; + string client_version_random_key = 1387; + uint32 reg_platform = 633; + string client_ip_str = 1238; + string birthday = 1109; + uint32 NNCIBOLDIAI = 1728; + bool FNECFLEAKKO = 1679; } diff --git a/proto/GetSceneAreaReq.proto b/proto/GetSceneAreaReq.proto index 9ff73675..0d563436 100644 --- a/proto/GetSceneAreaReq.proto +++ b/proto/GetSceneAreaReq.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 238 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message GetSceneAreaReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 206; - } - - uint32 scene_id = 1; - uint32 belong_uid = 2; + uint32 scene_id = 4; + uint32 belong_uid = 3; } diff --git a/proto/GetSceneAreaRsp.proto b/proto/GetSceneAreaRsp.proto index c71a0ebb..d72b3f63 100644 --- a/proto/GetSceneAreaRsp.proto +++ b/proto/GetSceneAreaRsp.proto @@ -4,17 +4,12 @@ option java_package = "emu.grasscutter.net.proto"; import "CityInfo.proto"; +// CmdId: 206 +// EnetChannelId: 0 +// EnetIsReliable: true message GetSceneAreaRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 216; - } - - int32 retcode = 1; - uint32 scene_id = 2; - repeated uint32 area_id_list = 3; - repeated CityInfo city_info_list = 4; + int32 retcode = 2; + uint32 scene_id = 13; + repeated uint32 area_id_list = 6; + repeated CityInfo city_info_list = 3; } diff --git a/proto/GetScenePointReq.proto b/proto/GetScenePointReq.proto index d031cdf6..3c6bec97 100644 --- a/proto/GetScenePointReq.proto +++ b/proto/GetScenePointReq.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 230 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message GetScenePointReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 291; - } - - uint32 scene_id = 1; - uint32 belong_uid = 2; + uint32 scene_id = 4; + uint32 belong_uid = 10; } diff --git a/proto/GetScenePointRsp.proto b/proto/GetScenePointRsp.proto index 135ff2a5..3f1903cd 100644 --- a/proto/GetScenePointRsp.proto +++ b/proto/GetScenePointRsp.proto @@ -2,25 +2,20 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 297 +// EnetChannelId: 0 +// EnetIsReliable: true message GetScenePointRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 236; - } - - int32 retcode = 1; - uint32 scene_id = 2; - repeated uint32 unlocked_point_list = 3; - uint32 belong_uid = 4; - repeated uint32 unlock_area_list = 5; - repeated uint32 locked_point_list = 6; - repeated uint32 to_be_explore_dungeon_entry_list = 7; - repeated uint32 not_explored_dungeon_entry_list = 8; - repeated uint32 group_unlimit_point_list = 9; - repeated uint32 not_interact_dungeon_entry_list = 10; - repeated uint32 hide_point_list = 11; + int32 retcode = 5; + uint32 scene_id = 12; + repeated uint32 unlocked_point_list = 14; + uint32 belong_uid = 15; + repeated uint32 unlock_area_list = 11; + repeated uint32 locked_point_list = 4; + repeated uint32 to_be_explore_dungeon_entry_list = 8; + repeated uint32 not_explored_dungeon_entry_list = 3; + repeated uint32 group_unlimit_point_list = 6; + repeated uint32 not_interact_dungeon_entry_list = 1; + repeated uint32 hide_point_list = 9; + repeated uint32 unhide_point_list = 7; } diff --git a/proto/GetShopReq.proto b/proto/GetShopReq.proto index 66d4a310..fbc3e2a7 100644 --- a/proto/GetShopReq.proto +++ b/proto/GetShopReq.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 709 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message GetShopReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 749; - } - - uint32 shop_type = 1; + uint32 shop_type = 5; } diff --git a/proto/GetShopRsp.proto b/proto/GetShopRsp.proto index 99450835..3b2491f3 100644 --- a/proto/GetShopRsp.proto +++ b/proto/GetShopRsp.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "Shop.proto"; +// CmdId: 731 +// EnetChannelId: 0 +// EnetIsReliable: true message GetShopRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 718; - } - - int32 retcode = 1; - Shop shop = 2; + int32 retcode = 11; + Shop shop = 14; } diff --git a/proto/GetShopmallDataRsp.proto b/proto/GetShopmallDataRsp.proto index e2b8e61b..06bae172 100644 --- a/proto/GetShopmallDataRsp.proto +++ b/proto/GetShopmallDataRsp.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 717 +// EnetChannelId: 0 +// EnetIsReliable: true message GetShopmallDataRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 701; - } - - int32 retcode = 1; - repeated uint32 shop_type_list = 2; + int32 retcode = 4; + repeated uint32 shop_type_list = 15; } diff --git a/proto/GetWidgetSlotReq.proto b/proto/GetWidgetSlotReq.proto index cf43e24b..f0e3610a 100644 --- a/proto/GetWidgetSlotReq.proto +++ b/proto/GetWidgetSlotReq.proto @@ -2,15 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4267 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message GetWidgetSlotReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4285; - } - } diff --git a/proto/GetWidgetSlotRsp.proto b/proto/GetWidgetSlotRsp.proto index 96a00c35..c816bd1e 100644 --- a/proto/GetWidgetSlotRsp.proto +++ b/proto/GetWidgetSlotRsp.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "WidgetSlotData.proto"; +// CmdId: 4300 +// EnetChannelId: 0 +// EnetIsReliable: true message GetWidgetSlotRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4291; - } - - int32 retcode = 1; - repeated WidgetSlotData slot_list = 2; + int32 retcode = 12; + repeated WidgetSlotData slot_list = 8; } diff --git a/proto/GetWorldMpInfoRsp.proto b/proto/GetWorldMpInfoRsp.proto index 4e6faff5..ec4db00c 100644 --- a/proto/GetWorldMpInfoRsp.proto +++ b/proto/GetWorldMpInfoRsp.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 3179 +// EnetChannelId: 0 +// EnetIsReliable: true message GetWorldMpInfoRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 3394; - } - - int32 retcode = 1; - bool is_in_mp_mode = 2; - uint32 quit_mp_valid_time = 3; + int32 retcode = 11; + bool is_in_mp_mode = 5; + uint32 quit_mp_valid_time = 13; } diff --git a/proto/GroupSuiteNotify.proto b/proto/GroupSuiteNotify.proto index 884be64b..7bdf0994 100644 --- a/proto/GroupSuiteNotify.proto +++ b/proto/GroupSuiteNotify.proto @@ -2,14 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 3476 +// EnetChannelId: 0 +// EnetIsReliable: true message GroupSuiteNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 3098; - } - - map group_map = 1; + map group_map = 11; } diff --git a/proto/GroupUnloadNotify.proto b/proto/GroupUnloadNotify.proto new file mode 100644 index 00000000..a91350a6 --- /dev/null +++ b/proto/GroupUnloadNotify.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 3416 +// EnetChannelId: 0 +// EnetIsReliable: true +message GroupUnloadNotify { + repeated uint32 group_list = 1; +} diff --git a/proto/H5ActivityIdsNotify.proto b/proto/H5ActivityIdsNotify.proto index 1cd25d2b..c9eed0a8 100644 --- a/proto/H5ActivityIdsNotify.proto +++ b/proto/H5ActivityIdsNotify.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 5693 +// EnetChannelId: 0 +// EnetIsReliable: true message H5ActivityIdsNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 5677; - } - - map h5_activity_map = 1; - uint32 client_red_dot_timestamp = 2; + map h_5_activity_map = 3; + uint32 client_red_dot_timestamp = 15; } diff --git a/proto/HEMFKLPNNOM.proto b/proto/HEMFKLPNNOM.proto new file mode 100644 index 00000000..2ef843f6 --- /dev/null +++ b/proto/HEMFKLPNNOM.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +enum HEMFKLPNNOM { + HEMFKLPNNOM_ODJKANKMPPJ = 0; + HEMFKLPNNOM_EFGLHEIODFN = 1; + HEMFKLPNNOM_JPBBBCFGHAK = 2; + HEMFKLPNNOM_IDCMGHBHBFH = 3; + HEMFKLPNNOM_ODDBNNDFMBO = 4; + HEMFKLPNNOM_AGIDMOGJOBD = 5; +} diff --git a/proto/HitColliderType.proto b/proto/HitColliderType.proto index 6c04a4aa..be99dbe3 100644 --- a/proto/HitColliderType.proto +++ b/proto/HitColliderType.proto @@ -3,8 +3,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum HitColliderType { - HIT_COLLIDER_INVALID = 0; - HIT_COLLIDER_HIT_BOX = 1; - HIT_COLLIDER_WET_HIT_BOX = 2; - HIT_COLLIDER_HEAD_BOX = 3; + HIT_COLLIDER_TYPE_INVALID = 0; + HIT_COLLIDER_TYPE_HIT_BOX = 1; + HIT_COLLIDER_TYPE_WET_HIT_BOX = 2; + HIT_COLLIDER_TYPE_HEAD_BOX = 3; } diff --git a/proto/HitTreeNotify.proto b/proto/HitTreeNotify.proto new file mode 100644 index 00000000..856b92d5 --- /dev/null +++ b/proto/HitTreeNotify.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "Vector.proto"; + +// Command code: 5222 + +message HitTreeNotify { + Vector hit_postion = 3; + uint32 wood_type = 4; + Vector hit_postion_duplicated = 13; //I don't understand the reason why ** makes two same positions data +} diff --git a/proto/HomeAnimalData.proto b/proto/HomeAnimalData.proto new file mode 100644 index 00000000..846e7fa5 --- /dev/null +++ b/proto/HomeAnimalData.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "Vector.proto"; + +message HomeAnimalData { + uint32 furniture_id = 1; + Vector spawn_pos = 2; + Vector spawn_rot = 3; +} diff --git a/proto/HomeBasicInfo.proto b/proto/HomeBasicInfo.proto new file mode 100644 index 00000000..ac0ae04a --- /dev/null +++ b/proto/HomeBasicInfo.proto @@ -0,0 +1,16 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "HomeLimitedShopInfo.proto"; + +message HomeBasicInfo { + uint32 cur_module_id = 1; + uint32 cur_room_scene_id = 2; + bool is_in_edit_mode = 3; + uint64 exp = 4; + uint32 level = 5; + uint32 home_owner_uid = 6; + HomeLimitedShopInfo limited_shop_info = 7; + string owner_nick_name = 8; +} diff --git a/proto/HomeBasicInfoNotify.proto b/proto/HomeBasicInfoNotify.proto new file mode 100644 index 00000000..0ad50fc6 --- /dev/null +++ b/proto/HomeBasicInfoNotify.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "HomeBasicInfo.proto"; + +// CmdId: 4872 +// EnetChannelId: 0 +// EnetIsReliable: true +message HomeBasicInfoNotify { + HomeBasicInfo basic_info = 9; +} diff --git a/proto/HomeBlockArrangementInfo.proto b/proto/HomeBlockArrangementInfo.proto new file mode 100644 index 00000000..b58c712b --- /dev/null +++ b/proto/HomeBlockArrangementInfo.proto @@ -0,0 +1,29 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +//import "BIEMCDLIFOD.proto"; +//import "GOHMLAFNBGF.proto"; +import "HomeAnimalData.proto"; +import "HomeBlockDotPattern.proto"; +import "HomeBlockFieldData.proto"; +import "HomeFurnitureData.proto"; +import "HomeFurnitureSuiteData.proto"; +import "HomeNpcData.proto"; +//import "WeekendDjinnInfo.proto"; + +message HomeBlockArrangementInfo { + uint32 block_id = 1; + repeated HomeFurnitureData persistent_furniture_list = 2; + repeated HomeFurnitureData deploy_furniure_list = 3; + repeated HomeNpcData deploy_npc_list = 4; + repeated HomeFurnitureSuiteData furniture_suite_list = 5; + repeated HomeAnimalData deploy_animal_list = 6; + bool is_unlocked = 7; + uint32 comfort_value = 8; + //repeated WeekendDjinnInfo weekend_djinn_info_list = 9; + repeated HomeBlockDotPattern dot_pattern_list = 10; + repeated HomeBlockFieldData field_list = 11; +// repeated GOHMLAFNBGF BOCBLHLEKNJ = 12; +// repeated BIEMCDLIFOD CONIAKDJHAN = 13; +} diff --git a/proto/HomeBlockDotPattern.proto b/proto/HomeBlockDotPattern.proto new file mode 100644 index 00000000..895a39c2 --- /dev/null +++ b/proto/HomeBlockDotPattern.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message HomeBlockDotPattern { + uint32 height = 1; + uint32 width = 2; + bytes data = 3; +} diff --git a/proto/HomeBlockFieldData.proto b/proto/HomeBlockFieldData.proto new file mode 100644 index 00000000..fa95f5b0 --- /dev/null +++ b/proto/HomeBlockFieldData.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "HomeBlockSubFieldData.proto"; +import "Vector.proto"; + +message HomeBlockFieldData { + uint32 guid = 1; + uint32 furniture_id = 2; + Vector pos = 3; + Vector rot = 4; + repeated HomeBlockSubFieldData sub_field_list = 5; +} diff --git a/proto/HomeBlockNotify.proto b/proto/HomeBlockNotify.proto new file mode 100644 index 00000000..09e55627 --- /dev/null +++ b/proto/HomeBlockNotify.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 4542 +// EnetChannelId: 0 +// EnetIsReliable: true +message HomeBlockNotify { + uint32 end_time = 7; +} diff --git a/proto/HomeBlockSubFieldData.proto b/proto/HomeBlockSubFieldData.proto new file mode 100644 index 00000000..4e191479 --- /dev/null +++ b/proto/HomeBlockSubFieldData.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "Vector.proto"; + +message HomeBlockSubFieldData { + Vector pos = 1; + Vector rot = 2; +} diff --git a/proto/HomeChangeEditModeReq.proto b/proto/HomeChangeEditModeReq.proto new file mode 100644 index 00000000..f15bd8a1 --- /dev/null +++ b/proto/HomeChangeEditModeReq.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 4625 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message HomeChangeEditModeReq { + bool is_enter_edit_mode = 5; +} diff --git a/proto/HomeChangeEditModeRsp.proto b/proto/HomeChangeEditModeRsp.proto new file mode 100644 index 00000000..e11fda10 --- /dev/null +++ b/proto/HomeChangeEditModeRsp.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 4885 +// EnetChannelId: 0 +// EnetIsReliable: true +message HomeChangeEditModeRsp { + int32 retcode = 11; + bool is_enter_edit_mode = 5; +} diff --git a/proto/HomeChooseModuleReq.proto b/proto/HomeChooseModuleReq.proto index 9be2b91a..a75f8e8b 100644 --- a/proto/HomeChooseModuleReq.proto +++ b/proto/HomeChooseModuleReq.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4479 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message HomeChooseModuleReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4530; - } - - uint32 module_id = 1; -} \ No newline at end of file + uint32 module_id = 2; +} diff --git a/proto/HomeChooseModuleRsp.proto b/proto/HomeChooseModuleRsp.proto index 7425d419..dccf23fe 100644 --- a/proto/HomeChooseModuleRsp.proto +++ b/proto/HomeChooseModuleRsp.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4745 +// EnetChannelId: 0 +// EnetIsReliable: true message HomeChooseModuleRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4653; - } - - int32 retcode = 1; - uint32 module_id = 2; -} \ No newline at end of file + int32 retcode = 5; + uint32 module_id = 11; +} diff --git a/proto/HomeComfortInfoNotify.proto b/proto/HomeComfortInfoNotify.proto index e66e14d0..b5611011 100644 --- a/proto/HomeComfortInfoNotify.proto +++ b/proto/HomeComfortInfoNotify.proto @@ -4,14 +4,9 @@ option java_package = "emu.grasscutter.net.proto"; import "HomeModuleComfortInfo.proto"; +// CmdId: 4649 +// EnetChannelId: 0 +// EnetIsReliable: true message HomeComfortInfoNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4557; - } - - repeated HomeModuleComfortInfo module_info_list = 1; -} \ No newline at end of file + repeated HomeModuleComfortInfo module_info_list = 1; +} diff --git a/proto/HomeFurnitureData.proto b/proto/HomeFurnitureData.proto new file mode 100644 index 00000000..27e2c03f --- /dev/null +++ b/proto/HomeFurnitureData.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "Vector.proto"; + +message HomeFurnitureData { + uint32 furniture_id = 1; + Vector spawn_pos = 3; + Vector spawn_rot = 4; + int32 parent_furniture_index = 7; + uint32 guid = 8; + uint32 version = 9; +} diff --git a/proto/HomeFurnitureSuiteData.proto b/proto/HomeFurnitureSuiteData.proto new file mode 100644 index 00000000..3c2b893b --- /dev/null +++ b/proto/HomeFurnitureSuiteData.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "Vector.proto"; + +message HomeFurnitureSuiteData { + uint32 suite_id = 1; + Vector spawn_pos = 2; + repeated int32 included_furniture_index_list = 3; + uint32 guid = 5; + bool is_allow_summon = 6; +} diff --git a/proto/HomeGetArrangementInfoReq.proto b/proto/HomeGetArrangementInfoReq.proto new file mode 100644 index 00000000..c5ecb200 --- /dev/null +++ b/proto/HomeGetArrangementInfoReq.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 4848 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message HomeGetArrangementInfoReq { + repeated uint32 scene_id_list = 6; +} diff --git a/proto/HomeGetArrangementInfoRsp.proto b/proto/HomeGetArrangementInfoRsp.proto new file mode 100644 index 00000000..4b46a3ce --- /dev/null +++ b/proto/HomeGetArrangementInfoRsp.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "HomeSceneArrangementInfo.proto"; + +// CmdId: 4456 +// EnetChannelId: 0 +// EnetIsReliable: true +message HomeGetArrangementInfoRsp { + int32 retcode = 1; + repeated HomeSceneArrangementInfo scene_arrangement_info_list = 12; +} diff --git a/proto/HomeGetBasicInfoReq.proto b/proto/HomeGetBasicInfoReq.proto new file mode 100644 index 00000000..572cfd31 --- /dev/null +++ b/proto/HomeGetBasicInfoReq.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 4535 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message HomeGetBasicInfoReq { +} diff --git a/proto/HomeLimitedShopInfo.proto b/proto/HomeLimitedShopInfo.proto new file mode 100644 index 00000000..99319f40 --- /dev/null +++ b/proto/HomeLimitedShopInfo.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "Vector.proto"; + +message HomeLimitedShopInfo { + uint32 uid = 1; + uint32 next_open_time = 3; + uint32 next_guest_open_time = 4; + uint32 next_close_time = 5; + Vector djinn_pos = 6; + Vector djinn_rot = 7; +} diff --git a/proto/HomeMarkPointFurnitureData.proto b/proto/HomeMarkPointFurnitureData.proto new file mode 100644 index 00000000..6ad0abb9 --- /dev/null +++ b/proto/HomeMarkPointFurnitureData.proto @@ -0,0 +1,18 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "HomeMarkPointNPCData.proto"; +import "HomeMarkPointSuiteData.proto"; +import "Vector.proto"; + +message HomeMarkPointFurnitureData { + uint32 guid = 1; + uint32 furniture_id = 2; + uint32 furniture_type = 3; + Vector pos = 4; + oneof extra { + HomeMarkPointNPCData npc_data = 6; + HomeMarkPointSuiteData suite_data = 7; + } +} diff --git a/proto/HomeMarkPointNPCData.proto b/proto/HomeMarkPointNPCData.proto new file mode 100644 index 00000000..f81b20c6 --- /dev/null +++ b/proto/HomeMarkPointNPCData.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message HomeMarkPointNPCData { + uint32 avatar_id = 1; + uint32 costume_id = 2; +} diff --git a/proto/HomeMarkPointNotify.proto b/proto/HomeMarkPointNotify.proto new file mode 100644 index 00000000..d0c92275 --- /dev/null +++ b/proto/HomeMarkPointNotify.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "HomeMarkPointSceneData.proto"; + +// CmdId: 4746 +// EnetChannelId: 0 +// EnetIsReliable: true +message HomeMarkPointNotify { + repeated HomeMarkPointSceneData mark_point_data_list = 13; +} diff --git a/proto/HomeMarkPointSceneData.proto b/proto/HomeMarkPointSceneData.proto new file mode 100644 index 00000000..1a038fe6 --- /dev/null +++ b/proto/HomeMarkPointSceneData.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "HomeMarkPointFurnitureData.proto"; +import "Vector.proto"; + +message HomeMarkPointSceneData { + uint32 module_id = 1; + uint32 scene_id = 2; + repeated HomeMarkPointFurnitureData furniture_list = 3; + Vector teapot_spirit_pos = 4; +} diff --git a/proto/HomeMarkPointSuiteData.proto b/proto/HomeMarkPointSuiteData.proto new file mode 100644 index 00000000..e848f8a0 --- /dev/null +++ b/proto/HomeMarkPointSuiteData.proto @@ -0,0 +1,7 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message HomeMarkPointSuiteData { + uint32 suite_id = 1; +} diff --git a/proto/HomeModuleComfortInfo.proto b/proto/HomeModuleComfortInfo.proto index d7d54fc3..894c1fa5 100644 --- a/proto/HomeModuleComfortInfo.proto +++ b/proto/HomeModuleComfortInfo.proto @@ -2,9 +2,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message HomeModuleComfortInfo { - uint32 module_id = 1; - repeated uint32 world_scene_block_comfort_value_list = 2; - uint32 room_scene_comfort_value = 3; -} \ No newline at end of file + uint32 module_id = 1; + repeated uint32 world_scene_block_comfort_value_list = 2; + uint32 room_scene_comfort_value = 3; +} diff --git a/proto/HomeNpcData.proto b/proto/HomeNpcData.proto new file mode 100644 index 00000000..213f9055 --- /dev/null +++ b/proto/HomeNpcData.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "Vector.proto"; + +message HomeNpcData { + uint32 avatar_id = 1; + Vector spawn_pos = 2; + Vector spawn_rot = 3; + uint32 costume_id = 4; +} diff --git a/proto/HomeSceneArrangementInfo.proto b/proto/HomeSceneArrangementInfo.proto new file mode 100644 index 00000000..cb305070 --- /dev/null +++ b/proto/HomeSceneArrangementInfo.proto @@ -0,0 +1,22 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "HomeBlockArrangementInfo.proto"; +import "HomeFurnitureData.proto"; +import "Vector.proto"; + +message HomeSceneArrangementInfo { + uint32 scene_id = 1; + repeated HomeBlockArrangementInfo block_arrangement_info_list = 2; + bool is_set_born_pos = 3; + Vector born_pos = 4; + Vector born_rot = 5; + repeated HomeFurnitureData door_list = 7; + repeated HomeFurnitureData stair_list = 8; + HomeFurnitureData main_house = 9; + uint32 comfort_value = 10; + Vector djinn_pos = 11; + uint32 tmp_version = 12; + uint32 CNLMNOEGKME = 13; +} diff --git a/proto/HomeSceneInitFinishReq.proto b/proto/HomeSceneInitFinishReq.proto new file mode 100644 index 00000000..1cc367d6 --- /dev/null +++ b/proto/HomeSceneInitFinishReq.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 4552 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message HomeSceneInitFinishReq { +} diff --git a/proto/HomeSceneInitFinishRsp.proto b/proto/HomeSceneInitFinishRsp.proto new file mode 100644 index 00000000..ffdbd0ad --- /dev/null +++ b/proto/HomeSceneInitFinishRsp.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 4592 +// EnetChannelId: 0 +// EnetIsReliable: true +message HomeSceneInitFinishRsp { + int32 retcode = 7; +} diff --git a/proto/HomeSceneJumpReq.proto b/proto/HomeSceneJumpReq.proto new file mode 100644 index 00000000..6f3c8706 --- /dev/null +++ b/proto/HomeSceneJumpReq.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 4659 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message HomeSceneJumpReq { + bool is_enter_room_scene = 12; +} diff --git a/proto/HomeSceneJumpRsp.proto b/proto/HomeSceneJumpRsp.proto new file mode 100644 index 00000000..7eb5f1da --- /dev/null +++ b/proto/HomeSceneJumpRsp.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 4570 +// EnetChannelId: 0 +// EnetIsReliable: true +message HomeSceneJumpRsp { + int32 retcode = 10; + bool is_enter_room_scene = 8; +} diff --git a/proto/HomeUnknown1Notify.proto b/proto/HomeUnknown1Notify.proto new file mode 100644 index 00000000..5d00f34b --- /dev/null +++ b/proto/HomeUnknown1Notify.proto @@ -0,0 +1,7 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message HomeUnknown1Notify { + bool is_enter_edit_mode = 12; +} diff --git a/proto/HomeUpdateArrangementInfoReq.proto b/proto/HomeUpdateArrangementInfoReq.proto new file mode 100644 index 00000000..0d462a0f --- /dev/null +++ b/proto/HomeUpdateArrangementInfoReq.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "HomeSceneArrangementInfo.proto"; + +// CmdId: 4472 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message HomeUpdateArrangementInfoReq { + HomeSceneArrangementInfo scene_arrangement_info = 12; +} diff --git a/proto/HomeUpdateArrangementInfoRsp.proto b/proto/HomeUpdateArrangementInfoRsp.proto new file mode 100644 index 00000000..1e899785 --- /dev/null +++ b/proto/HomeUpdateArrangementInfoRsp.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 4822 +// EnetChannelId: 0 +// EnetIsReliable: true +message HomeUpdateArrangementInfoRsp { + int32 retcode = 1; +} diff --git a/proto/HostPlayerNotify.proto b/proto/HostPlayerNotify.proto index 39127be7..55a93a36 100644 --- a/proto/HostPlayerNotify.proto +++ b/proto/HostPlayerNotify.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 341 +// EnetChannelId: 0 +// EnetIsReliable: true message HostPlayerNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 389; - } - - uint32 host_uid = 1; - uint32 host_peer_id = 2; + uint32 host_uid = 10; + uint32 host_peer_id = 7; } diff --git a/proto/InterOpType.proto b/proto/InterOpType.proto index 79110918..744334e1 100644 --- a/proto/InterOpType.proto +++ b/proto/InterOpType.proto @@ -3,6 +3,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum InterOpType { - INTER_OP_FINISH = 0; - INTER_OP_START = 1; + INTER_OP_TYPE_FINISH = 0; + INTER_OP_TYPE_START = 1; } diff --git a/proto/InteractType.proto b/proto/InteractType.proto index cadaf32f..c99f1153 100644 --- a/proto/InteractType.proto +++ b/proto/InteractType.proto @@ -3,19 +3,20 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum InteractType { - INTERACT_NONE = 0; - INTERACT_PICK_ITEM = 1; - INTERACT_GATHER = 2; - INTERACT_OPEN_CHEST = 3; - INTERACT_OPEN_STATUE = 4; - INTERACT_CONSUM = 5; - INTERACT_MP_PLAY_REWARD = 6; - INTERACT_VIEW = 7; - INTERACT_GENERAL_REWARD = 8; - INTERACT_MIRACLE_RING = 9; - INTERACT_FOUNDATION = 10; - INTERACT_ECHO_SHELL = 11; - INTERACT_HOME_GATHER = 12; - INTERACT_ENV_ANIMAL = 13; - INTERACT_QUEST_GADGET = 14; + INTERACT_TYPE_NONE = 0; + INTERACT_TYPE_PICK_ITEM = 1; + INTERACT_TYPE_GATHER = 2; + INTERACT_TYPE_OPEN_CHEST = 3; + INTERACT_TYPE_OPEN_STATUE = 4; + INTERACT_TYPE_CONSUM = 5; + INTERACT_TYPE_MP_PLAY_REWARD = 6; + INTERACT_TYPE_VIEW = 7; + INTERACT_TYPE_GENERAL_REWARD = 8; + INTERACT_TYPE_MIRACLE_RING = 9; + INTERACT_TYPE_FOUNDATION = 10; + INTERACT_TYPE_ECHO_SHELL = 11; + INTERACT_TYPE_HOME_GATHER = 12; + INTERACT_TYPE_ENV_ANIMAL = 13; + INTERACT_TYPE_QUEST_GADGET = 14; + INTERACT_TYPE_LIEIKFDFMGF = 15; } diff --git a/proto/Item.proto b/proto/Item.proto index 98f80988..d9c049fd 100644 --- a/proto/Item.proto +++ b/proto/Item.proto @@ -2,16 +2,16 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "Material.proto"; import "Equip.proto"; import "Furniture.proto"; +import "Material.proto"; message Item { - oneof Detail { + uint32 item_id = 1; + uint64 guid = 2; + oneof detail { Material material = 5; Equip equip = 6; Furniture furniture = 7; } - uint32 item_id = 1; - uint64 guid = 2; } diff --git a/proto/ItemAddHintNotify.proto b/proto/ItemAddHintNotify.proto index c9b5be10..f6a0ec53 100644 --- a/proto/ItemAddHintNotify.proto +++ b/proto/ItemAddHintNotify.proto @@ -2,24 +2,19 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "Vector.proto"; import "ItemHint.proto"; +import "Vector.proto"; +// CmdId: 632 +// EnetChannelId: 0 +// EnetIsReliable: true message ItemAddHintNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 700; - } - - repeated ItemHint item_list = 1; - Vector position = 2; - bool is_position_valid = 3; - uint32 reason = 4; - uint32 quest_id = 5; - bool is_transfered_from_avatar_card = 6; - repeated ItemHint overflow_transformed_item_list = 7; - bool is_general_reward_hiden = 8; + repeated ItemHint item_list = 10; + Vector position = 12; + bool is_position_valid = 13; + uint32 reason = 5; + uint32 quest_id = 14; + bool is_transfered_from_avatar_card = 11; + repeated ItemHint overflow_transformed_item_list = 3; + bool is_general_reward_hiden = 7; } diff --git a/proto/ItemGivingReq.proto b/proto/ItemGivingReq.proto index 562e2ea4..08a82b34 100644 --- a/proto/ItemGivingReq.proto +++ b/proto/ItemGivingReq.proto @@ -4,17 +4,12 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; +// CmdId: 178 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message ItemGivingReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 187; - } - - uint32 giving_id = 1; - repeated ItemParam item_param_list = 2; - map item_guid_count_map = 3; + uint32 giving_id = 14; + repeated ItemParam item_param_list = 10; + map item_guid_count_map = 6; } diff --git a/proto/ItemGivingRsp.proto b/proto/ItemGivingRsp.proto index ac5d6f67..91c49e6d 100644 --- a/proto/ItemGivingRsp.proto +++ b/proto/ItemGivingRsp.proto @@ -2,16 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 108 +// EnetChannelId: 0 +// EnetIsReliable: true message ItemGivingRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 141; - } - - int32 retcode = 1; - uint32 giving_id = 2; + int32 retcode = 13; + uint32 giving_id = 6; + uint32 LEMILHEIALJ = 12; } diff --git a/proto/ItemHint.proto b/proto/ItemHint.proto index 5409b461..8788b8d4 100644 --- a/proto/ItemHint.proto +++ b/proto/ItemHint.proto @@ -2,9 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message ItemHint { uint32 item_id = 1; uint32 count = 2; bool is_new = 3; + uint64 guid = 4; } diff --git a/proto/ItemParam.proto b/proto/ItemParam.proto index 10b7572c..4c3280a2 100644 --- a/proto/ItemParam.proto +++ b/proto/ItemParam.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message ItemParam { uint32 item_id = 1; uint32 count = 2; diff --git a/proto/JDPMOMKAPIF.proto b/proto/JDPMOMKAPIF.proto new file mode 100644 index 00000000..b7884134 --- /dev/null +++ b/proto/JDPMOMKAPIF.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "KJDPNIKDKEJ.proto"; + +message JDPMOMKAPIF { + uint32 id = 1; + repeated KJDPNIKDKEJ OPNBOHLEDGG = 2; +} diff --git a/proto/JMPCGMBHJLG.proto b/proto/JMPCGMBHJLG.proto new file mode 100644 index 00000000..c9945300 --- /dev/null +++ b/proto/JMPCGMBHJLG.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "MLMEFKLMOEF.proto"; + +message JMPCGMBHJLG { + uint32 FFAPFBEDKOJ = 1; + repeated uint32 HLLKIKBMIPH = 2; + repeated MLMEFKLMOEF JAMBAKBBBCL = 3; +} diff --git a/proto/JOEPIGNPDGH.proto b/proto/JOEPIGNPDGH.proto new file mode 100644 index 00000000..69ca82a0 --- /dev/null +++ b/proto/JOEPIGNPDGH.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +enum JOEPIGNPDGH { + JOEPIGNPDGH_GIGONJIGKBM = 0; + JOEPIGNPDGH_AEKNMJMKIPN = 1; + JOEPIGNPDGH_LKCIHNNHIFO = 2; + JOEPIGNPDGH_EPAPGLMBAEB = 3; +} diff --git a/proto/KJDPNIKDKEJ.proto b/proto/KJDPNIKDKEJ.proto new file mode 100644 index 00000000..eda073f4 --- /dev/null +++ b/proto/KJDPNIKDKEJ.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "HEMFKLPNNOM.proto"; + +message KJDPNIKDKEJ { + HEMFKLPNNOM type = 1; + int32 value = 2; +} diff --git a/proto/LifeStateChangeNotify.proto b/proto/LifeStateChangeNotify.proto index 076b2761..a95b4383 100644 --- a/proto/LifeStateChangeNotify.proto +++ b/proto/LifeStateChangeNotify.proto @@ -5,20 +5,15 @@ option java_package = "emu.grasscutter.net.proto"; import "PlayerDieType.proto"; import "ServerBuff.proto"; +// CmdId: 1231 +// EnetChannelId: 0 +// EnetIsReliable: true message LifeStateChangeNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1218; - } - - uint32 entity_id = 1; - uint32 life_state = 2; - uint32 source_entity_id = 3; - string attack_tag = 4; - PlayerDieType die_type = 5; - uint32 move_reliable_seq = 6; - repeated ServerBuff server_buff_list = 7; + uint32 entity_id = 4; + uint32 life_state = 6; + uint32 source_entity_id = 5; + string attack_tag = 1; + PlayerDieType die_type = 13; + uint32 move_reliable_seq = 9; + repeated ServerBuff server_buff_list = 14; } diff --git a/proto/LockedPersonallineData.proto b/proto/LockedPersonallineData.proto new file mode 100644 index 00000000..5ca8be3c --- /dev/null +++ b/proto/LockedPersonallineData.proto @@ -0,0 +1,17 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message LockedPersonallineData { + uint32 personal_line_id = 1; + LockReason lock_reason = 2; + oneof param { + uint32 chapter_id = 3; + uint32 level = 4; + } + + enum LockReason { + LOCK_REASON_LEVEL = 0; + LOCK_REASON_QUEST = 1; + } +} diff --git a/proto/LunchBoxData.proto b/proto/LunchBoxData.proto index dc099eb0..3068abb3 100644 --- a/proto/LunchBoxData.proto +++ b/proto/LunchBoxData.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message LunchBoxData { map slot_material_map = 1; } diff --git a/proto/MLMEFKLMOEF.proto b/proto/MLMEFKLMOEF.proto new file mode 100644 index 00000000..676c8b58 --- /dev/null +++ b/proto/MLMEFKLMOEF.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "EAJCGENDICI.proto"; + +message MLMEFKLMOEF { + EAJCGENDICI type = 1; + int32 value = 2; +} diff --git a/proto/MailChangeNotify.proto b/proto/MailChangeNotify.proto index 1e362f6f..f27221e2 100644 --- a/proto/MailChangeNotify.proto +++ b/proto/MailChangeNotify.proto @@ -4,7 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "MailData.proto"; +// CmdId: 1431 +// EnetChannelId: 0 +// EnetIsReliable: true message MailChangeNotify { - repeated MailData mail_list = 1; - repeated uint32 del_mail_id_list = 2; + repeated MailData mail_list = 3; + repeated uint32 del_mail_id_list = 7; } diff --git a/proto/MailData.proto b/proto/MailData.proto index ba606c2e..b6d43976 100644 --- a/proto/MailData.proto +++ b/proto/MailData.proto @@ -2,19 +2,20 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "MailTextContent.proto"; +import "CBJEDMGOBPL.proto"; import "MailItem.proto"; +import "MailTextContent.proto"; 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; - uint32 state_value = 15; + 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; + CBJEDMGOBPL BHCAHLJIKFF = 15; } diff --git a/proto/MailItem.proto b/proto/MailItem.proto index da657815..3cdcdfd0 100644 --- a/proto/MailItem.proto +++ b/proto/MailItem.proto @@ -2,10 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "ItemParam.proto"; +import "EquipParam.proto"; import "MaterialDeleteInfo.proto"; message MailItem { - ItemParam item_param = 1; - MaterialDeleteInfo delete_info = 2; + EquipParam equip_param = 1; + MaterialDeleteInfo delete_info = 2; } diff --git a/proto/MailTextContent.proto b/proto/MailTextContent.proto index 097710f8..cd26a735 100644 --- a/proto/MailTextContent.proto +++ b/proto/MailTextContent.proto @@ -3,7 +3,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; message MailTextContent { - string title = 1; - string content = 2; - string sender = 3; + string title = 1; + string content = 2; + string sender = 3; } diff --git a/proto/MapMarkFromType.proto b/proto/MapMarkFromType.proto index 1dcbc0a0..16cd4e9d 100644 --- a/proto/MapMarkFromType.proto +++ b/proto/MapMarkFromType.proto @@ -3,7 +3,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum MapMarkFromType { - NOE = 0; - MONSTER = 1; - QUEST = 2; + MAP_MARK_FROM_TYPE_NOE = 0; + MAP_MARK_FROM_TYPE_MONSTER = 1; + MAP_MARK_FROM_TYPE_QUEST = 2; } diff --git a/proto/MapMarkPoint.proto b/proto/MapMarkPoint.proto index 2a615d49..62b7098b 100644 --- a/proto/MapMarkPoint.proto +++ b/proto/MapMarkPoint.proto @@ -2,9 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "Vector.proto"; -import "MapMarkPointType.proto"; import "MapMarkFromType.proto"; +import "MapMarkPointType.proto"; +import "Vector.proto"; message MapMarkPoint { uint32 scene_id = 1; diff --git a/proto/MapMarkTipsType.proto b/proto/MapMarkTipsType.proto index bb01d8a1..34459667 100644 --- a/proto/MapMarkTipsType.proto +++ b/proto/MapMarkTipsType.proto @@ -3,5 +3,5 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum MapMarkTipsType { - MARK_TIPS_DUNGEON_ELEMENT_TRIAL = 0; + MAP_MARK_TIPS_TYPE_DUNGEON_ELEMENT_TRIAL = 0; } diff --git a/proto/MarkEntityInMinMapNotify.proto b/proto/MarkEntityInMinMapNotify.proto index 95d0e472..ef02c245 100644 --- a/proto/MarkEntityInMinMapNotify.proto +++ b/proto/MarkEntityInMinMapNotify.proto @@ -4,16 +4,11 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; +// CmdId: 202 +// EnetChannelId: 0 +// EnetIsReliable: true message MarkEntityInMinMapNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 249; - } - - uint32 entity_id = 1; - Vector position = 2; - uint32 monster_id = 3; + uint32 entity_id = 5; + Vector position = 13; + uint32 monster_id = 6; } diff --git a/proto/MarkMapReq.proto b/proto/MarkMapReq.proto index 41e9fe2b..55acb13a 100644 --- a/proto/MarkMapReq.proto +++ b/proto/MarkMapReq.proto @@ -4,24 +4,19 @@ option java_package = "emu.grasscutter.net.proto"; import "MapMarkPoint.proto"; +// CmdId: 3208 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message MarkMapReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 3216; - } + Operation op = 15; + MapMarkPoint old = 10; + MapMarkPoint mark = 4; enum Operation { - ADD = 0; - MOD = 1; - DEL = 2; - GET = 3; + OPERATION_ADD = 0; + OPERATION_MOD = 1; + OPERATION_DEL = 2; + OPERATION_GET = 3; } - - Operation op = 1; - MapMarkPoint old = 2; - MapMarkPoint mark = 3; } diff --git a/proto/MarkMapRsp.proto b/proto/MarkMapRsp.proto index 1ed1e65d..0f92c823 100644 --- a/proto/MarkMapRsp.proto +++ b/proto/MarkMapRsp.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "MapMarkPoint.proto"; +// CmdId: 3421 +// EnetChannelId: 0 +// EnetIsReliable: true message MarkMapRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 3011; - } - - int32 retcode = 1; - repeated MapMarkPoint mark_list = 2; + int32 retcode = 11; + repeated MapMarkPoint mark_list = 7; } diff --git a/proto/MarkNewNotify.proto b/proto/MarkNewNotify.proto index ecc9f8c2..3104ff91 100644 --- a/proto/MarkNewNotify.proto +++ b/proto/MarkNewNotify.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1227 +// EnetChannelId: 0 +// EnetIsReliable: true message MarkNewNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1212; - } - - uint32 mark_new_type = 1; - repeated uint32 id_list = 2; + uint32 mark_new_type = 10; + repeated uint32 id_list = 13; } diff --git a/proto/MassivePropParam.proto b/proto/MassivePropParam.proto index 80ca7ee7..97725bb2 100644 --- a/proto/MassivePropParam.proto +++ b/proto/MassivePropParam.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message MassivePropParam { int32 type = 1; repeated uint32 reaction_info_list = 2; diff --git a/proto/MaterialDeleteInfo.proto b/proto/MaterialDeleteInfo.proto index 1c8877ca..e511c1db 100644 --- a/proto/MaterialDeleteInfo.proto +++ b/proto/MaterialDeleteInfo.proto @@ -2,25 +2,26 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message MaterialDeleteInfo { + bool has_delete_config = 1; + oneof delete_info { + CountDownDelete count_down_delete = 2; + DateTimeDelete date_delete = 3; + DelayWeekCountDownDelete delay_week_count_down_delete = 4; + } + message CountDownDelete { map delete_time_num_map = 1; uint32 config_count_down_time = 2; } + message DateTimeDelete { uint32 delete_time = 1; } + message DelayWeekCountDownDelete { map delete_time_num_map = 1; uint32 config_delay_week = 2; uint32 config_count_down_time = 3; } - - oneof DeleteInfo { - CountDownDelete count_down_delete = 2; - DateTimeDelete date_delete = 3; - DelayWeekCountDownDelete delay_week_count_down_delete = 4; - } - bool has_delete_config = 1; } diff --git a/proto/MathQuaternion.proto b/proto/MathQuaternion.proto index 131e9a1a..a3689667 100644 --- a/proto/MathQuaternion.proto +++ b/proto/MathQuaternion.proto @@ -2,10 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message MathQuaternion { - float X = 1; - float Y = 2; - float Z = 3; - float W = 4; + float x = 1; + float y = 2; + float z = 3; + float w = 4; } diff --git a/proto/McoinExchangeHcoinReq.proto b/proto/McoinExchangeHcoinReq.proto index 5b6f37ee..4ce94ddf 100644 --- a/proto/McoinExchangeHcoinReq.proto +++ b/proto/McoinExchangeHcoinReq.proto @@ -2,7 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 687 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message McoinExchangeHcoinReq { - uint32 mCoinNum = 1; - uint32 hCoinNum = 2; + uint32 mcoin_cost = 8; + uint32 hcoin = 12; } diff --git a/proto/McoinExchangeHcoinRsp.proto b/proto/McoinExchangeHcoinRsp.proto index 09034130..fe5e1bb1 100644 --- a/proto/McoinExchangeHcoinRsp.proto +++ b/proto/McoinExchangeHcoinRsp.proto @@ -2,6 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 689 +// EnetChannelId: 0 +// EnetIsReliable: true message McoinExchangeHcoinRsp { - int32 retcode = 1; + int32 retcode = 9; + uint32 mcoin_cost = 10; + uint32 hcoin = 15; } diff --git a/proto/ModifierDurability.proto b/proto/ModifierDurability.proto index f59ccd02..b6da88bf 100644 --- a/proto/ModifierDurability.proto +++ b/proto/ModifierDurability.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message ModifierDurability { float reduce_ratio = 1; float remaining_durability = 2; diff --git a/proto/MonsterBornType.proto b/proto/MonsterBornType.proto index d44d80f5..a79a9ba3 100644 --- a/proto/MonsterBornType.proto +++ b/proto/MonsterBornType.proto @@ -3,7 +3,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum MonsterBornType { - MONSTER_BORN_NONE = 0; - MONSTER_BORN_DEFAULT = 1; - MONSTER_BORN_RANDOM = 2; + MONSTER_BORN_TYPE_NONE = 0; + MONSTER_BORN_TYPE_DEFAULT = 1; + MONSTER_BORN_TYPE_RANDOM = 2; } diff --git a/proto/MotionInfo.proto b/proto/MotionInfo.proto index 3ce74eb9..7680ea8a 100644 --- a/proto/MotionInfo.proto +++ b/proto/MotionInfo.proto @@ -2,8 +2,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "Vector.proto"; import "MotionState.proto"; +import "Vector.proto"; message MotionInfo { Vector pos = 1; @@ -14,5 +14,5 @@ message MotionInfo { Vector ref_pos = 6; uint32 ref_id = 7; uint32 scene_time = 8; - uint32 interval_velocity = 9; + uint64 interval_velocity = 9; } diff --git a/proto/MotionState.proto b/proto/MotionState.proto index 6897fc38..c5f1eba5 100644 --- a/proto/MotionState.proto +++ b/proto/MotionState.proto @@ -3,59 +3,61 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum MotionState { - MOTION_NONE = 0; - MOTION_RESET = 1; - MOTION_STANDBY = 2; - MOTION_STANDBY_MOVE = 3; - MOTION_WALK = 4; - MOTION_RUN = 5; - MOTION_DASH = 6; - MOTION_CLIMB = 7; - MOTION_CLIMB_JUMP = 8; - MOTION_STANDBY_TO_CLIMB = 9; - MOTION_FIGHT = 10; - MOTION_JUMP = 11; - MOTION_DROP = 12; - MOTION_FLY = 13; - MOTION_SWIM_MOVE = 14; - MOTION_SWIM_IDLE = 15; - MOTION_SWIM_DASH = 16; - MOTION_SWIM_JUMP = 17; - MOTION_SLIP = 18; - MOTION_GO_UPSTAIRS = 19; - MOTION_FALL_ON_GROUND = 20; - MOTION_JUMP_UP_WALL_FOR_STANDBY = 21; - MOTION_JUMP_OFF_WALL = 22; - MOTION_POWERED_FLY = 23; - MOTION_LADDER_IDLE = 24; - MOTION_LADDER_MOVE = 25; - MOTION_LADDER_SLIP = 26; - MOTION_STANDBY_TO_LADDER = 27; - MOTION_LADDER_TO_STANDBY = 28; - MOTION_DANGER_STANDBY = 29; - MOTION_DANGER_STANDBY_MOVE = 30; - MOTION_DANGER_WALK = 31; - MOTION_DANGER_RUN = 32; - MOTION_DANGER_DASH = 33; - MOTION_CROUCH_IDLE = 34; - MOTION_CROUCH_MOVE = 35; - MOTION_CROUCH_ROLL = 36; - MOTION_NOTIFY = 37; - MOTION_LAND_SPEED = 38; - MOTION_MOVE_FAIL_ACK = 39; - MOTION_WATERFALL = 40; - MOTION_DASH_BEFORE_SHAKE = 41; - MOTION_SIT_IDLE = 42; - MOTION_FORCE_SET_POS = 43; - MOTION_QUEST_FORCE_DRAG = 44; - MOTION_FOLLOW_ROUTE = 45; - MOTION_SKIFF_BOARDING = 46; - MOTION_SKIFF_NORMAL = 47; - MOTION_SKIFF_DASH = 48; - MOTION_SKIFF_POWERED_DASH = 49; - MOTION_DESTROY_VEHICLE = 50; - MOTION_FLY_IDLE = 51; - MOTION_FLY_SLOW = 52; - MOTION_FLY_FAST = 53; - MOTION_NUM = 54; + 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_NUM = 54; + MOTION_STATE_OOFNNHKLEFE = 55; + MOTION_STATE_KMIGLMEGNOK = 56; } diff --git a/proto/MovingPlatformType.proto b/proto/MovingPlatformType.proto index 9821a837..1baaa02a 100644 --- a/proto/MovingPlatformType.proto +++ b/proto/MovingPlatformType.proto @@ -3,8 +3,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum MovingPlatformType { - MOVING_PLATFORM_NONE = 0; - MOVING_PLATFORM_USE_CONFIG = 1; - MOVING_PLATFORM_ABILITY = 2; - MOVING_PLATFORM_ROUTE = 3; + 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 886f1e43..3766677b 100644 --- a/proto/MpSettingType.proto +++ b/proto/MpSettingType.proto @@ -3,7 +3,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum MpSettingType { - MP_SETTING_NO_ENTER = 0; - MP_SETTING_ENTER_FREELY = 1; - MP_SETTING_ENTER_AFTER_APPLY = 2; + MP_SETTING_TYPE_NO_ENTER = 0; + MP_SETTING_TYPE_ENTER_FREELY = 1; + MP_SETTING_TYPE_ENTER_AFTER_APPLY = 2; } diff --git a/proto/MusicBeatmap.proto b/proto/MusicBeatmap.proto new file mode 100644 index 00000000..48da4526 --- /dev/null +++ b/proto/MusicBeatmap.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "MusicBeatmapList.proto"; + +message MusicBeatmap { + uint32 music_id = 1; + repeated MusicBeatmapList beatmap_item_list = 2; +} diff --git a/proto/MusicBeatmapList.proto b/proto/MusicBeatmapList.proto new file mode 100644 index 00000000..5da8e21a --- /dev/null +++ b/proto/MusicBeatmapList.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "MusicBeatmapNote.proto"; + +message MusicBeatmapList { + repeated MusicBeatmapNote beatmap_note_list = 1; +} diff --git a/proto/MusicBeatmapNote.proto b/proto/MusicBeatmapNote.proto new file mode 100644 index 00000000..d83fe0a9 --- /dev/null +++ b/proto/MusicBeatmapNote.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message MusicBeatmapNote { + uint32 start_time = 1; + uint32 end_time = 2; +} diff --git a/proto/MusicBriefInfo.proto b/proto/MusicBriefInfo.proto new file mode 100644 index 00000000..160e361c --- /dev/null +++ b/proto/MusicBriefInfo.proto @@ -0,0 +1,26 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message MusicBriefInfo { + uint64 music_share_id = 1; + uint32 music_id = 2; + string author_nickname = 3; + uint32 music_note_count = 4; + uint32 max_score = 5; + uint32 score = 6; + uint32 create_time = 7; + uint32 share_time = 8; + uint32 position = 9; + bool settle = 10; + uint32 version = 11; + bool can_share = 12; + bool OAPKHNELBPH = 13; + bool NJHAMJMHPAA = 14; + uint64 ADIBIKKNPKK = 15; + uint32 unknown = 21; + repeated uint32 GIDFMAJFIFE = 22; + repeated uint32 OKBJPAKOLIH = 23; + uint32 FAOPBAMDFJB = 24; + uint32 FELMANEFAOE = 25; +} diff --git a/proto/MusicGameActivityDetailInfo.proto b/proto/MusicGameActivityDetailInfo.proto new file mode 100644 index 00000000..1d38dd8e --- /dev/null +++ b/proto/MusicGameActivityDetailInfo.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "MusicBriefInfo.proto"; +import "MusicGameRecord.proto"; + +message MusicGameActivityDetailInfo { + map music_game_record_map = 1; + repeated MusicBriefInfo person_custom_beatmap = 2; + repeated MusicBriefInfo others_custom_beatmap = 3; +} diff --git a/proto/MusicGameCreateBeatmapReq.proto b/proto/MusicGameCreateBeatmapReq.proto new file mode 100644 index 00000000..a2274d13 --- /dev/null +++ b/proto/MusicGameCreateBeatmapReq.proto @@ -0,0 +1,21 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "MusicBeatmap.proto"; +import "MusicBriefInfo.proto"; +import "MusicGameUnknown1Enum.proto"; + +// CmdId: 6326 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message MusicGameCreateBeatmapReq { + MusicGameUnknown1Enum unknown_enum1 = 12; + oneof beatmap { + MusicBeatmap music_record = 10; + } + oneof brief_info { + MusicBriefInfo music_brief_info = 1021; + } +} diff --git a/proto/MusicGameCreateBeatmapRsp.proto b/proto/MusicGameCreateBeatmapRsp.proto new file mode 100644 index 00000000..66ce2f58 --- /dev/null +++ b/proto/MusicGameCreateBeatmapRsp.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "MusicGameUnknown1Enum.proto"; + +// CmdId: 6347 +// EnetChannelId: 0 +// EnetIsReliable: true + +message MusicGameCreateBeatmapRsp { + int32 retcode = 10; + MusicGameUnknown1Enum unknown_enum1 = 12; + uint64 music_share_id = 5; +} diff --git a/proto/MusicGameGetBeatmapReq.proto b/proto/MusicGameGetBeatmapReq.proto new file mode 100644 index 00000000..2946ffd0 --- /dev/null +++ b/proto/MusicGameGetBeatmapReq.proto @@ -0,0 +1,19 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "MusicGameUnknown2Enum.proto"; +import "MusicGameGetBeatmapReqType.proto"; +import "MusicGameUnknown1Enum.proto"; + +// CmdId: 6318 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message MusicGameGetBeatmapReq { + MusicGameUnknown1Enum unknown_enum1 = 1; + uint64 music_share_id = 10; + MusicGameUnknown2Enum unknown_enum2 = 12; + bool CDFOGGDLKNA = 15; + MusicGameGetBeatmapReqType req_type = 11; +} diff --git a/proto/MusicGameGetBeatmapReqType.proto b/proto/MusicGameGetBeatmapReqType.proto new file mode 100644 index 00000000..63935da1 --- /dev/null +++ b/proto/MusicGameGetBeatmapReqType.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +enum MusicGameGetBeatmapReqType { + MusicGameGetBeatmapReqType_u1 = 0; + // edit_beatmap + MusicGameGetBeatmapReqType_u2 = 1; + // play_others + MusicGameGetBeatmapReqType_u3 = 2; + // try + MusicGameGetBeatmapReqType_u4 = 3; + MusicGameGetBeatmapReqType_u5 = 4; +} diff --git a/proto/MusicGameGetBeatmapRsp.proto b/proto/MusicGameGetBeatmapRsp.proto new file mode 100644 index 00000000..e4174dba --- /dev/null +++ b/proto/MusicGameGetBeatmapRsp.proto @@ -0,0 +1,24 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "MusicGameGetBeatmapReqType.proto"; +import "MusicBeatmap.proto"; +import "MusicBriefInfo.proto"; +import "MusicGameUnknown1Enum.proto"; + +// CmdId: 6309 +// EnetChannelId: 0 +// EnetIsReliable: true +message MusicGameGetBeatmapRsp { + int32 retcode = 13; + MusicGameUnknown1Enum unknown_enum1 = 1; + uint64 music_share_id = 5; + MusicGameGetBeatmapReqType req_type = 2; + oneof beatmap { + MusicBeatmap music_record = 9; + } + oneof brief_info { + MusicBriefInfo music_brief_info = 953; + } +} diff --git a/proto/MusicGameRecord.proto b/proto/MusicGameRecord.proto new file mode 100644 index 00000000..6eb29f29 --- /dev/null +++ b/proto/MusicGameRecord.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message MusicGameRecord { + uint32 max_score = 1; + uint32 max_combo = 2; + bool is_unlock = 3; +} diff --git a/proto/MusicGameSearchBeatmapReq.proto b/proto/MusicGameSearchBeatmapReq.proto new file mode 100644 index 00000000..d17e921f --- /dev/null +++ b/proto/MusicGameSearchBeatmapReq.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "MusicGameUnknown1Enum.proto"; + +// CmdId: 6343 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message MusicGameSearchBeatmapReq { + MusicGameUnknown1Enum unknown_enum1 = 10; + uint64 music_share_id = 6; +} diff --git a/proto/MusicGameSearchBeatmapRsp.proto b/proto/MusicGameSearchBeatmapRsp.proto new file mode 100644 index 00000000..3ce4ffca --- /dev/null +++ b/proto/MusicGameSearchBeatmapRsp.proto @@ -0,0 +1,18 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "MusicBriefInfo.proto"; +import "MusicGameUnknown1Enum.proto"; + +// CmdId: 6304 +// EnetChannelId: 0 +// EnetIsReliable: true +message MusicGameSearchBeatmapRsp { + int32 retcode = 9; + MusicGameUnknown1Enum unknown_enum1 = 3; + uint64 music_share_id = 4; + oneof ELBEIFGDBMM { + MusicBriefInfo music_brief_info = 11; + } +} diff --git a/proto/MusicGameSettleReq.proto b/proto/MusicGameSettleReq.proto new file mode 100644 index 00000000..2cb18a08 --- /dev/null +++ b/proto/MusicGameSettleReq.proto @@ -0,0 +1,31 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 8745 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message MusicGameSettleReq { + uint32 music_basic_id = 14; + uint32 score = 2; + uint32 combo = 10; + uint32 correct_hit = 8; + uint64 music_share_id = 11; + // is_default_beatmap + bool KJNDJLBOJLM = 4; + uint32 FBELCAFFGIJ = 3; + uint32 OOFMAKIDFOL = 15; + // beatmap_difficulty_level + uint32 HJPDEIMECHB = 1; + repeated uint32 MNCMGANHCFI = 13; + uint32 max_combo = 9; + uint32 JJADNMELLAH = 1975; + // detail_score + repeated uint32 EIAGEEFABPO = 1171; + uint32 CPIFLFBHNJP = 1104; + bool success = 998; + uint32 GGHBOMGJGFP = 268; + bool PFHCIHKCJFJ = 238; + float speed = 887; +} diff --git a/proto/MusicGameSettleRsp.proto b/proto/MusicGameSettleRsp.proto new file mode 100644 index 00000000..1e8b0dc6 --- /dev/null +++ b/proto/MusicGameSettleRsp.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 8288 +// EnetChannelId: 0 +// EnetIsReliable: true +message MusicGameSettleRsp { + int32 retcode = 7; + uint32 music_basic_id = 9; + bool is_unlock_next_level = 1; + bool is_new_record = 3; + uint64 music_share_id = 11; +} diff --git a/proto/MusicGameStartReq.proto b/proto/MusicGameStartReq.proto new file mode 100644 index 00000000..b0c940e9 --- /dev/null +++ b/proto/MusicGameStartReq.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 8927 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message MusicGameStartReq { + uint32 music_basic_id = 10; + uint64 music_share_id = 8; + bool KJNDJLBOJLM = 5; +} diff --git a/proto/MusicGameStartRsp.proto b/proto/MusicGameStartRsp.proto new file mode 100644 index 00000000..6660eeff --- /dev/null +++ b/proto/MusicGameStartRsp.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 8101 +// EnetChannelId: 0 +// EnetIsReliable: true +message MusicGameStartRsp { + int32 retcode = 5; + uint32 music_basic_id = 14; + uint64 music_share_id = 12; +} diff --git a/proto/MusicGameStartToPlayOthersBeatmapReq.proto b/proto/MusicGameStartToPlayOthersBeatmapReq.proto new file mode 100644 index 00000000..3c7e9e8e --- /dev/null +++ b/proto/MusicGameStartToPlayOthersBeatmapReq.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "MusicGameUnknown1Enum.proto"; + +// CmdId: 6302 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message MusicGameStartToPlayOthersBeatmapReq { + MusicGameUnknown1Enum unknown_enum1 = 12; +} diff --git a/proto/MusicGameStartToPlayOthersBeatmapRsp.proto b/proto/MusicGameStartToPlayOthersBeatmapRsp.proto new file mode 100644 index 00000000..7e62025b --- /dev/null +++ b/proto/MusicGameStartToPlayOthersBeatmapRsp.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "MusicGameUnknown1Enum.proto"; + +// CmdId: 6313 +// EnetChannelId: 0 +// EnetIsReliable: true +message MusicGameStartToPlayOthersBeatmapRsp { + int32 retcode = 2; + MusicGameUnknown1Enum unknown_enum1 = 11; + repeated uint64 AMNODOLNOIM = 6; +} diff --git a/proto/MusicGameUnknown1Enum.proto b/proto/MusicGameUnknown1Enum.proto new file mode 100644 index 00000000..ea660c3b --- /dev/null +++ b/proto/MusicGameUnknown1Enum.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +enum MusicGameUnknown1Enum { + MusicGameUnknown1Enum_NONE = 0; + MusicGameUnknown1Enum_u2 = 1; +} diff --git a/proto/MusicGameUnknown2Enum.proto b/proto/MusicGameUnknown2Enum.proto new file mode 100644 index 00000000..b64a7510 --- /dev/null +++ b/proto/MusicGameUnknown2Enum.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +enum MusicGameUnknown2Enum { + MusicGameUnknown2Enum_u1 = 0; + MusicGameUnknown2Enum_MINE = 1; + MusicGameUnknown2Enum_u3 = 2; +} diff --git a/proto/NpcTalkReq.proto b/proto/NpcTalkReq.proto index e6a90f06..917db99c 100644 --- a/proto/NpcTalkReq.proto +++ b/proto/NpcTalkReq.proto @@ -2,17 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 509 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message NpcTalkReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 549; - } - - uint32 npc_entity_id = 1; - uint32 talk_id = 3; - uint32 entity_id = 4; + uint32 npc_entity_id = 5; + uint32 talk_id = 7; + uint32 entity_id = 6; } diff --git a/proto/NpcTalkRsp.proto b/proto/NpcTalkRsp.proto index 5e398ad1..745d5dcc 100644 --- a/proto/NpcTalkRsp.proto +++ b/proto/NpcTalkRsp.proto @@ -2,17 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 531 +// EnetChannelId: 0 +// EnetIsReliable: true message NpcTalkRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 518; - } - - int32 retcode = 1; - uint32 npc_entity_id = 2; - uint32 cur_talk_id = 4; - uint32 entity_id = 5; + int32 retcode = 12; + uint32 npc_entity_id = 9; + uint32 cur_talk_id = 6; + uint32 entity_id = 7; } diff --git a/proto/OneoffGatherPointDetectorDataNotify.proto b/proto/OneoffGatherPointDetectorDataNotify.proto index d8911c23..ac8ba3df 100644 --- a/proto/OneoffGatherPointDetectorDataNotify.proto +++ b/proto/OneoffGatherPointDetectorDataNotify.proto @@ -4,14 +4,9 @@ option java_package = "emu.grasscutter.net.proto"; import "OneoffGatherPointDetectorData.proto"; +// CmdId: 4262 +// EnetChannelId: 0 +// EnetIsReliable: true message OneoffGatherPointDetectorDataNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4288; - } - - repeated OneoffGatherPointDetectorData oneoff_gather_point_detector_data_list = 1; + repeated OneoffGatherPointDetectorData oneoff_gather_point_detector_data_list = 6; } diff --git a/proto/OpenStateUpdateNotify.proto b/proto/OpenStateUpdateNotify.proto index 8d70a9d0..b902aefe 100644 --- a/proto/OpenStateUpdateNotify.proto +++ b/proto/OpenStateUpdateNotify.proto @@ -2,15 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 119 +// EnetChannelId: 0 +// EnetIsReliable: true message OpenStateUpdateNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 196; - } - - map open_state_map = 1; + map open_state_map = 12; } diff --git a/proto/ParentQuest.proto b/proto/ParentQuest.proto index 477366e6..e73e1f2f 100644 --- a/proto/ParentQuest.proto +++ b/proto/ParentQuest.proto @@ -2,8 +2,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "ParentQuestRandomInfo.proto"; import "ChildQuest.proto"; +import "ParentQuestRandomInfo.proto"; message ParentQuest { uint32 parent_quest_id = 1; @@ -15,4 +15,5 @@ message ParentQuest { uint32 parent_quest_state = 7; uint32 quest_var_seq = 8; map time_var_map = 9; + uint64 GJJJKEIPAPC = 10; } diff --git a/proto/PersonalLineAllDataReq.proto b/proto/PersonalLineAllDataReq.proto new file mode 100644 index 00000000..9365a337 --- /dev/null +++ b/proto/PersonalLineAllDataReq.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 446 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message PersonalLineAllDataReq { +} diff --git a/proto/PersonalLineAllDataRsp.proto b/proto/PersonalLineAllDataRsp.proto new file mode 100644 index 00000000..eee4ad91 --- /dev/null +++ b/proto/PersonalLineAllDataRsp.proto @@ -0,0 +1,17 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "LockedPersonallineData.proto"; + +// CmdId: 433 +// EnetChannelId: 0 +// EnetIsReliable: true +message PersonalLineAllDataRsp { + int32 retcode = 1; + uint32 cur_finished_daily_task_count = 4; + uint32 legendary_key_count = 3; + repeated uint32 ongoing_personal_line_list = 13; + repeated uint32 can_be_unlocked_personal_line_list = 12; + repeated LockedPersonallineData locked_personal_line_list = 14; +} diff --git a/proto/PersonalSceneJumpReq.proto b/proto/PersonalSceneJumpReq.proto index cc269f25..808ccee4 100644 --- a/proto/PersonalSceneJumpReq.proto +++ b/proto/PersonalSceneJumpReq.proto @@ -2,15 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 266 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message PersonalSceneJumpReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 260; - } - - uint32 point_id = 1; + uint32 point_id = 2; } diff --git a/proto/PersonalSceneJumpRsp.proto b/proto/PersonalSceneJumpRsp.proto index a91f6b5c..d1b47473 100644 --- a/proto/PersonalSceneJumpRsp.proto +++ b/proto/PersonalSceneJumpRsp.proto @@ -4,16 +4,11 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; +// CmdId: 248 +// EnetChannelId: 0 +// EnetIsReliable: true message PersonalSceneJumpRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 228; - } - - int32 retcode = 1; + int32 retcode = 15; uint32 dest_scene_id = 2; - Vector dest_pos = 3; + Vector dest_pos = 6; } diff --git a/proto/PingReq.proto b/proto/PingReq.proto index e5bc38cc..78604854 100644 --- a/proto/PingReq.proto +++ b/proto/PingReq.proto @@ -2,20 +2,14 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 32 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message PingReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 100; - } - - uint32 seq = 1; - uint32 client_time = 2; - bytes sc_data = 3; - float ue_time = 4; - double total_tick_time = 5; + uint32 seq = 2; + uint32 client_time = 14; + bytes sc_data = 11; + float ue_time = 15; + double total_tick_time = 12; } diff --git a/proto/PingRsp.proto b/proto/PingRsp.proto index b898469e..bd8cee3a 100644 --- a/proto/PingRsp.proto +++ b/proto/PingRsp.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 17 +// EnetChannelId: 0 +// EnetIsReliable: true message PingRsp { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - CMD_ID = 1; - ENET_IS_RELIABLE = 1; - } - - int32 retcode = 1; - uint32 seq = 2; - uint32 client_time = 3; + int32 retcode = 9; + uint32 seq = 4; + uint32 client_time = 8; } diff --git a/proto/PlatformInfo.proto b/proto/PlatformInfo.proto index 659afc37..8c3046bd 100644 --- a/proto/PlatformInfo.proto +++ b/proto/PlatformInfo.proto @@ -2,10 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "Vector.proto"; import "MathQuaternion.proto"; import "MovingPlatformType.proto"; import "Route.proto"; +import "Vector.proto"; message PlatformInfo { uint32 route_id = 1; diff --git a/proto/PlatformType.proto b/proto/PlatformType.proto index 8f490462..134bb680 100644 --- a/proto/PlatformType.proto +++ b/proto/PlatformType.proto @@ -3,15 +3,17 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum PlatformType { - EDITOR = 0; - IOS = 1; - ANDROID = 2; - PC = 3; - PS4 = 4; - SERVER = 5; - CLOUD_ANDROID = 6; - CLOUD_IOS = 7; - PS5 = 8; - CLOUD_WEB = 9; - CLOUD_TV = 10; + PLATFORM_TYPE_EDITOR = 0; + PLATFORM_TYPE_IOS = 1; + PLATFORM_TYPE_ANDROID = 2; + PLATFORM_TYPE_PC = 3; + PLATFORM_TYPE_PS_4 = 4; + PLATFORM_TYPE_SERVER = 5; + PLATFORM_TYPE_CLOUD_ANDROID = 6; + PLATFORM_TYPE_CLOUD_IOS = 7; + PLATFORM_TYPE_PS_5 = 8; + PLATFORM_TYPE_CLOUD_WEB = 9; + PLATFORM_TYPE_CLOUD_TV = 10; + PLATFORM_TYPE_IBBEKBJLMAJ = 11; + PLATFORM_TYPE_BCEICMDNIIG = 12; } diff --git a/proto/PlayerApplyEnterMpNotify.proto b/proto/PlayerApplyEnterMpNotify.proto index b742a422..d38addc2 100644 --- a/proto/PlayerApplyEnterMpNotify.proto +++ b/proto/PlayerApplyEnterMpNotify.proto @@ -4,16 +4,11 @@ option java_package = "emu.grasscutter.net.proto"; import "OnlinePlayerInfo.proto"; +// CmdId: 1818 +// EnetChannelId: 0 +// EnetIsReliable: true message PlayerApplyEnterMpNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1803; - } - - OnlinePlayerInfo src_player_info = 1; - uint32 src_app_id = 2; - uint32 src_thread_index = 3; + OnlinePlayerInfo src_player_info = 11; + uint32 src_app_id = 6; + uint32 src_thread_index = 13; } diff --git a/proto/PlayerApplyEnterMpReq.proto b/proto/PlayerApplyEnterMpReq.proto index 8d4c5f18..7670dfef 100644 --- a/proto/PlayerApplyEnterMpReq.proto +++ b/proto/PlayerApplyEnterMpReq.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1809 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message PlayerApplyEnterMpReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 1843; - } - - uint32 target_uid = 1; + uint32 target_uid = 3; } diff --git a/proto/PlayerApplyEnterMpResultNotify.proto b/proto/PlayerApplyEnterMpResultNotify.proto index 7c8921ad..2915ada8 100644 --- a/proto/PlayerApplyEnterMpResultNotify.proto +++ b/proto/PlayerApplyEnterMpResultNotify.proto @@ -2,35 +2,29 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1804 +// EnetChannelId: 0 +// EnetIsReliable: true message PlayerApplyEnterMpResultNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1805; - } + uint32 target_uid = 7; + bool is_agreed = 4; + Reason reason = 14; + string target_nickname = 5; enum Reason { - PLAYER_JUDGE = 0; - SCENE_CANNOT_ENTER = 1; - PLAYER_CANNOT_ENTER_MP = 2; - SYSTEM_JUDGE = 3; - ALLOW_ENTER_PLAYER_FULL = 4; - WORLD_LEVEL_LOWER_THAN_HOST = 5; - HOST_IN_MATCH = 6; - PLAYER_IN_BLACKLIST = 7; - PS_PLAYER_NOT_ACCEPT_OTHERS = 8; - HOST_IS_BLOCKED = 9; - OTHER_DATA_VERSION_NOT_LATEST = 10; - DATA_VERSION_NOT_LATEST = 11; - PLAYER_NOT_IN_PLAYER_WORLD = 12; - MAX_PLAYER = 13; + REASON_PLAYER_JUDGE = 0; + REASON_SCENE_CANNOT_ENTER = 1; + REASON_PLAYER_CANNOT_ENTER_MP = 2; + REASON_SYSTEM_JUDGE = 3; + REASON_ALLOW_ENTER_PLAYER_FULL = 4; + REASON_WORLD_LEVEL_LOWER_THAN_HOST = 5; + REASON_HOST_IN_MATCH = 6; + REASON_PLAYER_IN_BLACKLIST = 7; + REASON_PS_PLAYER_NOT_ACCEPT_OTHERS = 8; + REASON_HOST_IS_BLOCKED = 9; + REASON_OTHER_DATA_VERSION_NOT_LATEST = 10; + REASON_DATA_VERSION_NOT_LATEST = 11; + REASON_PLAYER_NOT_IN_PLAYER_WORLD = 12; + REASON_MAX_PLAYER = 13; } - - uint32 target_uid = 1; - bool is_agreed = 2; - Reason reason = 3; - string target_nickname = 4; } diff --git a/proto/PlayerApplyEnterMpResultReq.proto b/proto/PlayerApplyEnterMpResultReq.proto index c084c00f..9b9170bf 100644 --- a/proto/PlayerApplyEnterMpResultReq.proto +++ b/proto/PlayerApplyEnterMpResultReq.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1828 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message PlayerApplyEnterMpResultReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 1824; - } - - uint32 apply_uid = 1; - bool is_agreed = 2; + uint32 apply_uid = 15; + bool is_agreed = 9; } diff --git a/proto/PlayerApplyEnterMpResultRsp.proto b/proto/PlayerApplyEnterMpResultRsp.proto index d7d42eb6..e2361266 100644 --- a/proto/PlayerApplyEnterMpResultRsp.proto +++ b/proto/PlayerApplyEnterMpResultRsp.proto @@ -2,18 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1803 +// EnetChannelId: 0 +// EnetIsReliable: true message PlayerApplyEnterMpResultRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1832; - } - - int32 retcode = 1; - uint32 apply_uid = 2; - bool is_agreed = 3; - uint32 param = 4; + int32 retcode = 6; + uint32 apply_uid = 4; + bool is_agreed = 12; + uint32 param = 9; } diff --git a/proto/PlayerApplyEnterMpRsp.proto b/proto/PlayerApplyEnterMpRsp.proto index 05e7e349..93559b37 100644 --- a/proto/PlayerApplyEnterMpRsp.proto +++ b/proto/PlayerApplyEnterMpRsp.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1843 +// EnetChannelId: 0 +// EnetIsReliable: true message PlayerApplyEnterMpRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1827; - } - - int32 retcode = 1; - uint32 target_uid = 2; - uint32 param = 3; + int32 retcode = 5; + uint32 target_uid = 4; + uint32 param = 9; } diff --git a/proto/PlayerChatNotify.proto b/proto/PlayerChatNotify.proto index 738602a0..4ab075b4 100644 --- a/proto/PlayerChatNotify.proto +++ b/proto/PlayerChatNotify.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "ChatInfo.proto"; +// CmdId: 3295 +// EnetChannelId: 0 +// EnetIsReliable: true message PlayerChatNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 3122; - } - - uint32 channel_id = 1; - ChatInfo chat_info = 2; + uint32 channel_id = 14; + ChatInfo chat_info = 12; } diff --git a/proto/PlayerChatReq.proto b/proto/PlayerChatReq.proto index 4568a6b2..85585125 100644 --- a/proto/PlayerChatReq.proto +++ b/proto/PlayerChatReq.proto @@ -4,16 +4,11 @@ option java_package = "emu.grasscutter.net.proto"; import "ChatInfo.proto"; +// CmdId: 3378 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message PlayerChatReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 3326; - } - - uint32 channel_id = 1; - ChatInfo chat_info = 2; + uint32 channel_id = 9; + ChatInfo chat_info = 1; } diff --git a/proto/PlayerChatRsp.proto b/proto/PlayerChatRsp.proto index 1b9e8e04..2495c1d4 100644 --- a/proto/PlayerChatRsp.proto +++ b/proto/PlayerChatRsp.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 3321 +// EnetChannelId: 0 +// EnetIsReliable: true message PlayerChatRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 3485; - } - - int32 retcode = 1; - uint32 chat_forbidden_endtime = 2; + int32 retcode = 4; + uint32 chat_forbidden_endtime = 15; } diff --git a/proto/PlayerCookArgsReq.proto b/proto/PlayerCookArgsReq.proto new file mode 100644 index 00000000..5ba09fbd --- /dev/null +++ b/proto/PlayerCookArgsReq.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 104 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message PlayerCookArgsReq { + uint32 recipe_id = 3; + uint32 assist_avatar = 15; +} diff --git a/proto/PlayerCookArgsRsp.proto b/proto/PlayerCookArgsRsp.proto new file mode 100644 index 00000000..018ad59b --- /dev/null +++ b/proto/PlayerCookArgsRsp.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 105 +// EnetChannelId: 0 +// EnetIsReliable: true +message PlayerCookArgsRsp { + int32 retcode = 1; + float qte_range_ratio = 15; +} diff --git a/proto/PlayerCookReq.proto b/proto/PlayerCookReq.proto new file mode 100644 index 00000000..c5879a62 --- /dev/null +++ b/proto/PlayerCookReq.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 158 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message PlayerCookReq { + uint32 recipe_id = 6; + uint32 qte_quality = 2; + uint32 assist_avatar = 11; + uint32 cook_count = 7; +} diff --git a/proto/PlayerCookRsp.proto b/proto/PlayerCookRsp.proto new file mode 100644 index 00000000..c8389ffa --- /dev/null +++ b/proto/PlayerCookRsp.proto @@ -0,0 +1,18 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "CookRecipeData.proto"; +import "ItemParam.proto"; + +// CmdId: 150 +// EnetChannelId: 0 +// EnetIsReliable: true +message PlayerCookRsp { + int32 retcode = 9; + CookRecipeData recipe_data = 14; + repeated ItemParam item_list = 13; + uint32 qte_quality = 11; + uint32 cook_count = 15; + repeated ItemParam extral_item_list = 3; +} diff --git a/proto/PlayerDataNotify.proto b/proto/PlayerDataNotify.proto index 117e4fdc..ddf86e63 100644 --- a/proto/PlayerDataNotify.proto +++ b/proto/PlayerDataNotify.proto @@ -4,18 +4,13 @@ option java_package = "emu.grasscutter.net.proto"; import "PropValue.proto"; +// CmdId: 135 +// EnetChannelId: 0 +// EnetIsReliable: true message PlayerDataNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 142; - } - - string nick_name = 1; + string nick_name = 15; uint64 server_time = 2; - bool is_first_login_today = 3; - uint32 region_id = 4; - map prop_map = 6; + bool is_first_login_today = 11; + uint32 region_id = 9; + map prop_map = 8; } diff --git a/proto/PlayerDieType.proto b/proto/PlayerDieType.proto index bd9edaf6..05bff89e 100644 --- a/proto/PlayerDieType.proto +++ b/proto/PlayerDieType.proto @@ -3,13 +3,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum PlayerDieType { - PLAYER_DIE_NONE = 0; - PLAYER_DIE_KILL_BY_MONSTER = 1; - PLAYER_DIE_KILL_BY_GEAR = 2; - PLAYER_DIE_FALL = 3; - PLAYER_DIE_DRAWN = 4; - PLAYER_DIE_ABYSS = 5; - PLAYER_DIE_GM = 6; - PLAYER_DIE_CLIMATE_COLD = 7; - PLAYER_DIE_STORM_LIGHTING = 8; + 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; } diff --git a/proto/PlayerEnterDungeonReq.proto b/proto/PlayerEnterDungeonReq.proto index aef860d1..e18790d4 100644 --- a/proto/PlayerEnterDungeonReq.proto +++ b/proto/PlayerEnterDungeonReq.proto @@ -2,7 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 941 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message PlayerEnterDungeonReq { - uint32 point_id = 1; - uint32 dungeon_id = 2; + uint32 point_id = 5; + uint32 dungeon_id = 12; } diff --git a/proto/PlayerEnterDungeonRsp.proto b/proto/PlayerEnterDungeonRsp.proto index ba9325eb..ce73f6b5 100644 --- a/proto/PlayerEnterDungeonRsp.proto +++ b/proto/PlayerEnterDungeonRsp.proto @@ -2,8 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 937 +// EnetChannelId: 0 +// EnetIsReliable: true message PlayerEnterDungeonRsp { - int32 retcode = 1; - uint32 point_id = 2; - uint32 dungeon_id = 3; + int32 retcode = 2; + uint32 point_id = 1; + uint32 dungeon_id = 13; } diff --git a/proto/PlayerEnterSceneInfoNotify.proto b/proto/PlayerEnterSceneInfoNotify.proto index 1202f058..9f74e3eb 100644 --- a/proto/PlayerEnterSceneInfoNotify.proto +++ b/proto/PlayerEnterSceneInfoNotify.proto @@ -2,23 +2,18 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "TeamEnterSceneInfo.proto"; -import "MPLevelEntityInfo.proto"; import "AvatarEnterSceneInfo.proto"; +import "MPLevelEntityInfo.proto"; +import "TeamEnterSceneInfo.proto"; +// CmdId: 274 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message PlayerEnterSceneInfoNotify { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 246; - } - - uint32 cur_avatar_entity_id = 1; - repeated AvatarEnterSceneInfo avatar_enter_info = 2; - TeamEnterSceneInfo team_enter_info = 3; - MPLevelEntityInfo mp_level_entity_info = 4; - uint32 enter_scene_token = 5; + uint32 cur_avatar_entity_id = 8; + repeated AvatarEnterSceneInfo avatar_enter_info = 14; + TeamEnterSceneInfo team_enter_info = 9; + MPLevelEntityInfo mp_level_entity_info = 5; + uint32 enter_scene_token = 7; } diff --git a/proto/PlayerEnterSceneNotify.proto b/proto/PlayerEnterSceneNotify.proto index 3dc84e10..8c7d79c8 100644 --- a/proto/PlayerEnterSceneNotify.proto +++ b/proto/PlayerEnterSceneNotify.proto @@ -2,32 +2,27 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "Vector.proto"; import "EnterType.proto"; +import "Vector.proto"; +// CmdId: 209 +// EnetChannelId: 0 +// EnetIsReliable: true message PlayerEnterSceneNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 249; - } - - uint32 scene_id = 1; - Vector pos = 2; - uint64 scene_begin_time = 3; - EnterType type = 4; - uint32 target_uid = 6; - uint32 prev_scene_id = 9; - Vector prev_pos = 10; - uint32 dungeon_id = 11; - uint32 world_level = 12; - uint32 enter_scene_token = 13; - bool is_first_login_enter_scene = 14; - repeated uint32 scene_tag_id_list = 15; - bool is_skip_ui = 16; - uint32 enter_reason = 17; - uint32 world_type = 18; - string scene_transaction = 19; + uint32 scene_id = 14; + Vector pos = 15; + uint64 scene_begin_time = 12; + EnterType type = 2; + uint32 target_uid = 4; + uint32 prev_scene_id = 7; + Vector prev_pos = 6; + uint32 dungeon_id = 13; + uint32 world_level = 3; + uint32 enter_scene_token = 9; + bool is_first_login_enter_scene = 11; + repeated uint32 scene_tag_id_list = 1; + bool is_skip_ui = 1430; + uint32 enter_reason = 1982; + uint32 world_type = 1067; + string scene_transaction = 1081; } diff --git a/proto/PlayerGameTimeNotify.proto b/proto/PlayerGameTimeNotify.proto index 53f0daf9..b9e526da 100644 --- a/proto/PlayerGameTimeNotify.proto +++ b/proto/PlayerGameTimeNotify.proto @@ -2,18 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 155 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message PlayerGameTimeNotify { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 112; - } - - uint32 game_time = 1; - uint32 uid = 2; - bool is_home = 3; + uint32 game_time = 7; + uint32 uid = 13; + bool is_home = 12; } diff --git a/proto/PlayerGetForceQuitBanInfoRsp.proto b/proto/PlayerGetForceQuitBanInfoRsp.proto index bdac2277..ac27d5c8 100644 --- a/proto/PlayerGetForceQuitBanInfoRsp.proto +++ b/proto/PlayerGetForceQuitBanInfoRsp.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4162 +// EnetChannelId: 0 +// EnetIsReliable: true message PlayerGetForceQuitBanInfoRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4188; - } - - int32 retcode = 1; - uint32 match_id = 2; - uint32 expire_time = 3; + int32 retcode = 11; + uint32 match_id = 8; + uint32 expire_time = 5; } diff --git a/proto/PlayerHomeCompInfo.proto b/proto/PlayerHomeCompInfo.proto index a3015df8..1668d65a 100644 --- a/proto/PlayerHomeCompInfo.proto +++ b/proto/PlayerHomeCompInfo.proto @@ -5,8 +5,8 @@ option java_package = "emu.grasscutter.net.proto"; import "FriendEnterHomeOption.proto"; message PlayerHomeCompInfo { - FriendEnterHomeOption friend_enter_home_option = 1; - repeated uint32 unlocked_module_id_list = 2; - repeated uint32 levelup_reward_got_level_list = 3; - repeated uint32 seen_module_id_list = 4; -} \ No newline at end of file + FriendEnterHomeOption friend_enter_home_option = 1; + repeated uint32 unlocked_module_id_list = 2; + repeated uint32 levelup_reward_got_level_list = 3; + repeated uint32 seen_module_id_list = 4; +} diff --git a/proto/PlayerHomeCompInfoNotify.proto b/proto/PlayerHomeCompInfoNotify.proto index 61ec3e7f..b9021918 100644 --- a/proto/PlayerHomeCompInfoNotify.proto +++ b/proto/PlayerHomeCompInfoNotify.proto @@ -4,14 +4,9 @@ option java_package = "emu.grasscutter.net.proto"; import "PlayerHomeCompInfo.proto"; +// CmdId: 4563 +// EnetChannelId: 0 +// EnetIsReliable: true message PlayerHomeCompInfoNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4628; - } - - PlayerHomeCompInfo comp_info = 1; -} \ No newline at end of file + PlayerHomeCompInfo comp_info = 2; +} diff --git a/proto/PlayerLevelRewardUpdateNotify.proto b/proto/PlayerLevelRewardUpdateNotify.proto index dc3dd44d..3266ee40 100644 --- a/proto/PlayerLevelRewardUpdateNotify.proto +++ b/proto/PlayerLevelRewardUpdateNotify.proto @@ -2,15 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 143 +// EnetChannelId: 0 +// EnetIsReliable: true message PlayerLevelRewardUpdateNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 152; - } - - repeated uint32 level_list = 1; + repeated uint32 level_list = 14; } diff --git a/proto/PlayerLoginReq.proto b/proto/PlayerLoginReq.proto index 095047fa..dd702cb4 100644 --- a/proto/PlayerLoginReq.proto +++ b/proto/PlayerLoginReq.proto @@ -2,55 +2,54 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "TrackingIOInfo.proto"; import "AdjustTrackingInfo.proto"; +import "TrackingIOInfo.proto"; +// CmdId: 141 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message PlayerLoginReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 189; - } - - string token = 1; - string client_version = 2; - string system_version = 3; - string device_name = 4; - string device_uuid = 5; - uint32 target_uid = 6; - uint64 login_rand = 7; - bool is_editor = 8; - uint32 language_type = 9; - uint32 account_type = 10; - string account_uid = 11; - string platform = 12; - string device_info = 13; - uint32 platform_type = 14; - bool is_guest = 15; - uint32 cloud_client_ip = 16; - uint32 gm_uid = 17; - string checksum = 18; - string online_id = 19; - uint32 client_token = 20; - bytes security_cmd_reply = 21; - bytes extra_bin_data = 22; - string cps = 23; - uint32 channel_id = 24; - uint32 sub_channel_id = 25; - string checksum_client_version = 26; - uint32 tag = 27; - TrackingIOInfo tracking_io_info = 28; - string country_code = 29; - uint32 client_data_version = 30; - bytes environment_error_code = 31; - uint32 target_home_owner_uid = 32; - string psn_id = 33; - string client_verison_hash = 34; - bool is_transfer = 35; - uint32 reg_platform = 36; - uint32 target_home_param = 37; - AdjustTrackingInfo adjust_tracking_info = 38; + string token = 5; + string client_version = 7; + string system_version = 12; + string device_name = 3; + string device_uuid = 14; + uint32 target_uid = 15; + uint64 login_rand = 11; + bool is_editor = 2; + uint32 language_type = 13; + uint32 account_type = 1; + string account_uid = 8; + string platform = 6; + string device_info = 4; + uint32 platform_type = 10; + bool is_guest = 9; + uint32 cloud_client_ip = 233; + uint32 gm_uid = 1423; + string checksum = 485; + string online_id = 1974; + uint32 client_token = 133; + bytes security_cmd_reply = 96; + bytes extra_bin_data = 814; + string cps = 467; + uint32 channel_id = 2028; + uint32 sub_channel_id = 1571; + string checksum_client_version = 1844; + uint32 tag = 843; + TrackingIOInfo tracking_io_info = 1882; + string country_code = 1060; + uint32 client_data_version = 1570; + bytes environment_error_code = 1303; + uint32 target_home_owner_uid = 1054; + string psn_id = 921; + string client_verison_hash = 1972; + bool is_transfer = 1918; + uint32 reg_platform = 167; + uint32 target_home_param = 1129; + AdjustTrackingInfo adjust_tracking_info = 280; + string birthday = 174; + string MADLMMNJICA = 135; + string CCLJBEJHFOP = 745; + uint32 LKCFGDBHHIL = 1881; } diff --git a/proto/PlayerLoginRsp.proto b/proto/PlayerLoginRsp.proto index 0aa59e21..5591755b 100644 --- a/proto/PlayerLoginRsp.proto +++ b/proto/PlayerLoginRsp.proto @@ -2,51 +2,47 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "ResVersionConfig.proto"; import "BlockInfo.proto"; -import "ShortAbilityHashPair.proto"; import "FeatureBlockInfo.proto"; +import "ResVersionConfig.proto"; +import "ShortAbilityHashPair.proto"; +// CmdId: 137 +// EnetChannelId: 0 +// EnetIsReliable: true message PlayerLoginRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 184; - } - int32 retcode = 1; - bytes player_data = 2; - bool is_new_player = 3; - uint32 target_uid = 4; - uint64 login_rand = 5; - bool is_use_ability_hash = 6; + bytes player_data = 6; + bool is_new_player = 11; + uint32 target_uid = 15; + uint64 login_rand = 12; + bool is_use_ability_hash = 3; int32 ability_hash_code = 7; - map ability_hash_map = 8; - uint32 client_data_version = 9; - bool is_relogin = 11; - uint32 client_silence_data_version = 13; - string game_biz = 14; - uint32 player_data_version = 15; - string client_md5 = 16; - string client_silence_md5 = 17; - ResVersionConfig res_version_config = 20; - map block_info_map = 21; - string client_version_suffix = 24; - string client_silence_version_suffix = 25; - repeated ShortAbilityHashPair short_ability_hash_map = 27; - bytes sc_info = 28; - bool is_audit = 29; - bool is_sc_open = 30; - string register_cps = 31; - repeated FeatureBlockInfo feature_block_info_list = 32; - bool is_data_need_relogin = 33; - string country_code = 34; - ResVersionConfig next_res_version_config = 35; - string next_resource_url = 36; - uint32 target_home_owner_uid = 37; - bool is_enable_client_hash_debug = 38; - bool is_transfer = 39; - double total_tick_time = 40; + map ability_hash_map = 13; + uint32 client_data_version = 14; + bool is_relogin = 2; + uint32 client_silence_data_version = 10; + string game_biz = 9; + uint32 player_data_version = 8; + string client_md_5 = 1706; + string client_silence_md_5 = 271; + ResVersionConfig res_version_config = 933; + map block_info_map = 1156; + string client_version_suffix = 1984; + string client_silence_version_suffix = 49; + repeated ShortAbilityHashPair short_ability_hash_map = 364; + bytes sc_info = 2014; + bool is_audit = 1545; + bool is_sc_open = 1974; + string register_cps = 715; + repeated FeatureBlockInfo feature_block_info_list = 408; + bool is_data_need_relogin = 110; + string country_code = 1306; + ResVersionConfig next_res_version_config = 749; + string next_resource_url = 1744; + uint32 target_home_owner_uid = 945; + bool is_enable_client_hash_debug = 713; + bool is_transfer = 138; + double total_tick_time = 1923; + string birthday = 1977; } diff --git a/proto/PlayerLuaShellNotify.proto b/proto/PlayerLuaShellNotify.proto new file mode 100644 index 00000000..85fc1c5b --- /dev/null +++ b/proto/PlayerLuaShellNotify.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "JOEPIGNPDGH.proto"; + +// CmdId: 110 +// EnetChannelId: 0 +// EnetIsReliable: true +message PlayerLuaShellNotify { + uint32 id = 6; + bytes lua_shell = 12; + uint32 use_type = 10; + JOEPIGNPDGH HHKAMAJOOLD = 2; +} diff --git a/proto/PlayerPropNotify.proto b/proto/PlayerPropNotify.proto index 22d32bdc..9223a569 100644 --- a/proto/PlayerPropNotify.proto +++ b/proto/PlayerPropNotify.proto @@ -4,14 +4,9 @@ option java_package = "emu.grasscutter.net.proto"; import "PropValue.proto"; +// CmdId: 127 +// EnetChannelId: 0 +// EnetIsReliable: true message PlayerPropNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 126; - } - - map prop_map = 1; + map prop_map = 10; } diff --git a/proto/PlayerQuitDungeonReq.proto b/proto/PlayerQuitDungeonReq.proto index b94eb997..2f8d5058 100644 --- a/proto/PlayerQuitDungeonReq.proto +++ b/proto/PlayerQuitDungeonReq.proto @@ -2,7 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 932 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message PlayerQuitDungeonReq { - uint32 point_id = 1; - bool is_quit_immediately = 2; + uint32 point_id = 12; + bool is_quit_immediately = 4; } diff --git a/proto/PlayerQuitDungeonRsp.proto b/proto/PlayerQuitDungeonRsp.proto index c2538b63..78d2f5b4 100644 --- a/proto/PlayerQuitDungeonRsp.proto +++ b/proto/PlayerQuitDungeonRsp.proto @@ -2,7 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 917 +// EnetChannelId: 0 +// EnetIsReliable: true message PlayerQuitDungeonRsp { - int32 retcode = 1; - uint32 point_id = 2; + int32 retcode = 12; + uint32 point_id = 6; } diff --git a/proto/PlayerRTTInfo.proto b/proto/PlayerRTTInfo.proto index 4618fcb0..2ed54331 100644 --- a/proto/PlayerRTTInfo.proto +++ b/proto/PlayerRTTInfo.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message PlayerRTTInfo { uint32 uid = 1; uint32 rtt = 2; diff --git a/proto/PlayerSetPauseReq.proto b/proto/PlayerSetPauseReq.proto index 442bc47c..fbc0f768 100644 --- a/proto/PlayerSetPauseReq.proto +++ b/proto/PlayerSetPauseReq.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 159 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message PlayerSetPauseReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 121; - } - - bool is_paused = 1; + bool is_paused = 7; } diff --git a/proto/PlayerStoreNotify.proto b/proto/PlayerStoreNotify.proto index b81b7847..8d3d17e6 100644 --- a/proto/PlayerStoreNotify.proto +++ b/proto/PlayerStoreNotify.proto @@ -2,19 +2,14 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "StoreType.proto"; import "Item.proto"; +import "StoreType.proto"; +// CmdId: 609 +// EnetChannelId: 0 +// EnetIsReliable: true message PlayerStoreNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 649; - } - - StoreType store_type = 1; - repeated Item item_list = 2; - uint32 weight_limit = 3; + StoreType store_type = 4; + repeated Item item_list = 3; + uint32 weight_limit = 15; } diff --git a/proto/PlayerTimeNotify.proto b/proto/PlayerTimeNotify.proto index 3b004f6f..4c6a0eed 100644 --- a/proto/PlayerTimeNotify.proto +++ b/proto/PlayerTimeNotify.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 172 +// EnetChannelId: 0 +// EnetIsReliable: true message PlayerTimeNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 120; - } - - bool is_paused = 1; - uint64 player_time = 2; - uint64 server_time = 3; + bool is_paused = 8; + uint64 player_time = 4; + uint64 server_time = 14; } diff --git a/proto/PlayerWorldSceneInfo.proto b/proto/PlayerWorldSceneInfo.proto new file mode 100644 index 00000000..24f94034 --- /dev/null +++ b/proto/PlayerWorldSceneInfo.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message PlayerWorldSceneInfo { + uint32 scene_id = 1; + bool is_locked = 2; + repeated uint32 scene_tag_id_list = 3; +} diff --git a/proto/PlayerWorldSceneInfoListNotify.proto b/proto/PlayerWorldSceneInfoListNotify.proto index 9c38b6d9..c51e74c0 100644 --- a/proto/PlayerWorldSceneInfoListNotify.proto +++ b/proto/PlayerWorldSceneInfoListNotify.proto @@ -2,8 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "SceneUnlockInfo.proto"; +import "PlayerWorldSceneInfo.proto"; +// CmdId: 3172 +// EnetChannelId: 0 +// EnetIsReliable: true message PlayerWorldSceneInfoListNotify { - repeated SceneUnlockInfo unlockInfos = 1; + repeated PlayerWorldSceneInfo info_list = 5; } diff --git a/proto/PostEnterSceneRsp.proto b/proto/PostEnterSceneRsp.proto index 7e836219..06496ffa 100644 --- a/proto/PostEnterSceneRsp.proto +++ b/proto/PostEnterSceneRsp.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 3344 +// EnetChannelId: 0 +// EnetIsReliable: true message PostEnterSceneRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 3139; - } - - int32 retcode = 1; - uint32 enter_scene_token = 2; + int32 retcode = 13; + uint32 enter_scene_token = 15; } diff --git a/proto/PrivateChatNotify.proto b/proto/PrivateChatNotify.proto index d40a879f..68d72055 100644 --- a/proto/PrivateChatNotify.proto +++ b/proto/PrivateChatNotify.proto @@ -4,14 +4,9 @@ option java_package = "emu.grasscutter.net.proto"; import "ChatInfo.proto"; +// CmdId: 4991 +// EnetChannelId: 0 +// EnetIsReliable: true message PrivateChatNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 5039; - } - ChatInfo chat_info = 1; } diff --git a/proto/PrivateChatReq.proto b/proto/PrivateChatReq.proto index 388d254a..f4650186 100644 --- a/proto/PrivateChatReq.proto +++ b/proto/PrivateChatReq.proto @@ -2,20 +2,14 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4959 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message PrivateChatReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4999; + uint32 target_uid = 2; + oneof content { + string text = 8; + uint32 icon = 6; } - - oneof Content { - string text = 2; - uint32 icon = 3; - } - uint32 target_uid = 1; } diff --git a/proto/PrivateChatRsp.proto b/proto/PrivateChatRsp.proto index cbea58d7..a831234b 100644 --- a/proto/PrivateChatRsp.proto +++ b/proto/PrivateChatRsp.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4981 +// EnetChannelId: 0 +// EnetIsReliable: true message PrivateChatRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4968; - } - - int32 retcode = 1; - uint32 chat_forbidden_endtime = 2; + int32 retcode = 2; + uint32 chat_forbidden_endtime = 10; } diff --git a/proto/PropChangeReason.proto b/proto/PropChangeReason.proto index f947a8ea..62ee20ad 100644 --- a/proto/PropChangeReason.proto +++ b/proto/PropChangeReason.proto @@ -3,18 +3,18 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum PropChangeReason { - PROP_CHANGE_NONE = 0; - PROP_CHANGE_STATUE_RECOVER = 1; - PROP_CHANGE_ENERGY_BALL = 2; - PROP_CHANGE_ABILITY = 3; - PROP_CHANGE_LEVELUP = 4; - PROP_CHANGE_ITEM = 5; - PROP_CHANGE_AVATAR_CARD = 6; - PROP_CHANGE_CITY_LEVELUP = 7; - PROP_CHANGE_AVATAR_UPGRADE = 8; - PROP_CHANGE_AVATAR_PROMOTE = 9; - PROP_CHANGE_PLAYER_ADD_EXP = 10; - PROP_CHANGE_FINISH_QUEST = 11; - PROP_CHANGE_GM = 12; - PROP_CHANGE_MANUAL_ADJUST_WORLD_LEVEL = 13; + PROP_CHANGE_REASON_NONE = 0; + PROP_CHANGE_REASON_STATUE_RECOVER = 1; + PROP_CHANGE_REASON_ENERGY_BALL = 2; + PROP_CHANGE_REASON_ABILITY = 3; + PROP_CHANGE_REASON_LEVELUP = 4; + PROP_CHANGE_REASON_ITEM = 5; + PROP_CHANGE_REASON_AVATAR_CARD = 6; + PROP_CHANGE_REASON_CITY_LEVELUP = 7; + PROP_CHANGE_REASON_AVATAR_UPGRADE = 8; + PROP_CHANGE_REASON_AVATAR_PROMOTE = 9; + PROP_CHANGE_REASON_PLAYER_ADD_EXP = 10; + PROP_CHANGE_REASON_FINISH_QUEST = 11; + PROP_CHANGE_REASON_GM = 12; + PROP_CHANGE_REASON_MANUAL_ADJUST_WORLD_LEVEL = 13; } diff --git a/proto/PropValue.proto b/proto/PropValue.proto index 15ff0e37..988205cb 100644 --- a/proto/PropValue.proto +++ b/proto/PropValue.proto @@ -2,12 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message PropValue { - oneof Value { + uint32 type = 1; + int64 val = 4; + oneof value { int64 ival = 2; float fval = 3; } - uint32 type = 1; - int64 val = 4; } diff --git a/proto/ProtEntityType.proto b/proto/ProtEntityType.proto index 03a451c2..17fcf4f7 100644 --- a/proto/ProtEntityType.proto +++ b/proto/ProtEntityType.proto @@ -3,19 +3,19 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum ProtEntityType { - PROT_ENTITY_NONE = 0; - PROT_ENTITY_AVATAR = 1; - PROT_ENTITY_MONSTER = 2; - PROT_ENTITY_NPC = 3; - PROT_ENTITY_GADGET = 4; - PROT_ENTITY_REGION = 5; - PROT_ENTITY_WEAPON = 6; - PROT_ENTITY_WEATHER = 7; - PROT_ENTITY_SCENE = 8; - PROT_ENTITY_TEAM = 9; - PROT_ENTITY_MASSIVE_ENTITY = 10; - PROT_ENTITY_MP_LEVEL = 11; - PROT_ENTITY_PLAY_TEAM_ENTITY = 12; - PROT_ENTITY_EYE_POINT = 13; - PROT_ENTITY_MAX = 14; + 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_MASSIVE_ENTITY = 10; + 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/ProudSkillChangeNotify.proto b/proto/ProudSkillChangeNotify.proto index eab25780..f0bdc561 100644 --- a/proto/ProudSkillChangeNotify.proto +++ b/proto/ProudSkillChangeNotify.proto @@ -2,18 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1055 +// EnetChannelId: 0 +// EnetIsReliable: true message ProudSkillChangeNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1012; - } - - uint64 avatar_guid = 1; - uint32 entity_id = 2; - uint32 skill_depot_id = 3; + uint64 avatar_guid = 12; + uint32 entity_id = 11; + uint32 skill_depot_id = 7; repeated uint32 proud_skill_list = 4; } diff --git a/proto/ProudSkillExtraLevelNotify.proto b/proto/ProudSkillExtraLevelNotify.proto index 77d5e666..1c62e0e0 100644 --- a/proto/ProudSkillExtraLevelNotify.proto +++ b/proto/ProudSkillExtraLevelNotify.proto @@ -2,18 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1097 +// EnetChannelId: 0 +// EnetIsReliable: true message ProudSkillExtraLevelNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1036; - } - - uint64 avatar_guid = 1; - uint32 talent_type = 2; - uint32 talent_index = 3; - uint32 extra_level = 4; + uint64 avatar_guid = 14; + uint32 talent_type = 10; + uint32 talent_index = 4; + uint32 extra_level = 5; } diff --git a/proto/PullPrivateChatReq.proto b/proto/PullPrivateChatReq.proto index 8dc4d5fc..a0cf0a64 100644 --- a/proto/PullPrivateChatReq.proto +++ b/proto/PullPrivateChatReq.proto @@ -2,18 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4967 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message PullPrivateChatReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4951; - } - - uint32 target_uid = 1; - uint32 from_sequence = 2; - uint32 pull_num = 3; + uint32 target_uid = 2; + uint32 from_sequence = 7; + uint32 pull_num = 5; } diff --git a/proto/PullPrivateChatRsp.proto b/proto/PullPrivateChatRsp.proto index 3a3c44ce..61e4ad60 100644 --- a/proto/PullPrivateChatRsp.proto +++ b/proto/PullPrivateChatRsp.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "ChatInfo.proto"; +// CmdId: 5035 +// EnetChannelId: 0 +// EnetIsReliable: true message PullPrivateChatRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 5044; - } - - int32 retcode = 1; - repeated ChatInfo chat_info = 2; + int32 retcode = 15; + repeated ChatInfo chat_info = 12; } diff --git a/proto/PullRecentChatRsp.proto b/proto/PullRecentChatRsp.proto index 43ab77dd..8049c9e8 100644 --- a/proto/PullRecentChatRsp.proto +++ b/proto/PullRecentChatRsp.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "ChatInfo.proto"; +// CmdId: 4999 +// EnetChannelId: 0 +// EnetIsReliable: true message PullRecentChatRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 5011; - } - - int32 retcode = 1; - repeated ChatInfo chat_info = 2; + int32 retcode = 13; + repeated ChatInfo chat_info = 12; } diff --git a/proto/QueryCodexMonsterBeKilledNumReq.proto b/proto/QueryCodexMonsterBeKilledNumReq.proto index e2a00d2a..032fc036 100644 --- a/proto/QueryCodexMonsterBeKilledNumReq.proto +++ b/proto/QueryCodexMonsterBeKilledNumReq.proto @@ -2,15 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 4207 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message QueryCodexMonsterBeKilledNumReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4201; - } - - repeated uint32 codex_id_list = 1; + repeated uint32 codex_id_list = 11; } diff --git a/proto/QueryCodexMonsterBeKilledNumRsp.proto b/proto/QueryCodexMonsterBeKilledNumRsp.proto index 53e513b0..f92211d3 100644 --- a/proto/QueryCodexMonsterBeKilledNumRsp.proto +++ b/proto/QueryCodexMonsterBeKilledNumRsp.proto @@ -2,17 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 4205 +// EnetChannelId: 0 +// EnetIsReliable: true message QueryCodexMonsterBeKilledNumRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4210; - } - int32 retcode = 1; - repeated uint32 codex_id_list = 2; - repeated uint32 be_killed_num_list = 3; - repeated uint32 be_killed_num_empty_list = 4; + repeated uint32 codex_id_list = 4; + repeated uint32 be_killed_num_list = 11; + repeated uint32 CHPBKCLKPCJ = 2; } diff --git a/proto/QueryFilter.proto b/proto/QueryFilter.proto new file mode 100644 index 00000000..76a6c14f --- /dev/null +++ b/proto/QueryFilter.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message QueryFilter { + int32 type_id = 1; + int32 area_mask = 2; +} diff --git a/proto/QueryPathReq.proto b/proto/QueryPathReq.proto new file mode 100644 index 00000000..e7c96c95 --- /dev/null +++ b/proto/QueryPathReq.proto @@ -0,0 +1,28 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "QueryFilter.proto"; +import "Vector.proto"; +import "Vector3Int.proto"; + +// CmdId: 2309 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message QueryPathReq { + OptionType query_type = 9; + int32 query_id = 4; + uint32 scene_id = 8; + Vector source_pos = 14; + repeated Vector destination_pos = 11; + QueryFilter filter = 5; + Vector3Int destination_extend = 7; + Vector3Int source_extend = 15; + + enum OptionType { + OPTION_TYPE_NONE = 0; + OPTION_TYPE_NORMAL = 1; + OPTION_TYPE_FIRST_CAN_GO = 2; + } +} diff --git a/proto/QueryPathRsp.proto b/proto/QueryPathRsp.proto new file mode 100644 index 00000000..aba4e932 --- /dev/null +++ b/proto/QueryPathRsp.proto @@ -0,0 +1,21 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "Vector.proto"; + +// CmdId: 2331 +// EnetChannelId: 0 +// EnetIsReliable: true +message QueryPathRsp { + int32 retcode = 14; + int32 query_id = 2; + PathStatusType query_status = 5; + repeated Vector corners = 12; + + enum PathStatusType { + PATH_STATUS_TYPE_FAIL = 0; + PATH_STATUS_TYPE_SUCC = 1; + PATH_STATUS_TYPE_PARTIAL = 2; + } +} diff --git a/proto/QuestDelNotify.proto b/proto/QuestDelNotify.proto index 0365ec30..6828e522 100644 --- a/proto/QuestDelNotify.proto +++ b/proto/QuestDelNotify.proto @@ -2,6 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 441 +// EnetChannelId: 0 +// EnetIsReliable: true message QuestDelNotify { - uint32 quest_id = 1; + uint32 quest_id = 12; } diff --git a/proto/QuestGlobalVarNotify.proto b/proto/QuestGlobalVarNotify.proto index 0803f348..7308f736 100644 --- a/proto/QuestGlobalVarNotify.proto +++ b/proto/QuestGlobalVarNotify.proto @@ -4,6 +4,9 @@ option java_package = "emu.grasscutter.net.proto"; import "QuestGlobalVar.proto"; +// CmdId: 411 +// EnetChannelId: 0 +// EnetIsReliable: true message QuestGlobalVarNotify { - repeated QuestGlobalVar var_list = 1; + repeated QuestGlobalVar var_list = 9; } diff --git a/proto/QuestListNotify.proto b/proto/QuestListNotify.proto index ae40ba1a..1a57d6dc 100644 --- a/proto/QuestListNotify.proto +++ b/proto/QuestListNotify.proto @@ -4,6 +4,9 @@ option java_package = "emu.grasscutter.net.proto"; import "Quest.proto"; +// CmdId: 409 +// EnetChannelId: 0 +// EnetIsReliable: true message QuestListNotify { - repeated Quest quest_list = 1; + repeated Quest quest_list = 12; } diff --git a/proto/QuestListUpdateNotify.proto b/proto/QuestListUpdateNotify.proto index 5e78079b..af895405 100644 --- a/proto/QuestListUpdateNotify.proto +++ b/proto/QuestListUpdateNotify.proto @@ -4,6 +4,9 @@ option java_package = "emu.grasscutter.net.proto"; import "Quest.proto"; +// CmdId: 431 +// EnetChannelId: 0 +// EnetIsReliable: true message QuestListUpdateNotify { - repeated Quest quest_list = 1; + repeated Quest quest_list = 13; } diff --git a/proto/QuestProgressUpdateNotify.proto b/proto/QuestProgressUpdateNotify.proto index ac3fccd3..94827174 100644 --- a/proto/QuestProgressUpdateNotify.proto +++ b/proto/QuestProgressUpdateNotify.proto @@ -2,8 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 445 +// EnetChannelId: 0 +// EnetIsReliable: true message QuestProgressUpdateNotify { - uint32 quest_id = 1; - repeated uint32 finish_progress_list = 2; - repeated uint32 fail_progress_list = 3; + uint32 quest_id = 14; + repeated uint32 finish_progress_list = 7; + repeated uint32 fail_progress_list = 12; } diff --git a/proto/QuestUpdateQuestVarNotify.proto b/proto/QuestUpdateQuestVarNotify.proto index ba61ac4c..709aaa99 100644 --- a/proto/QuestUpdateQuestVarNotify.proto +++ b/proto/QuestUpdateQuestVarNotify.proto @@ -2,8 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 463 +// EnetChannelId: 0 +// EnetIsReliable: true message QuestUpdateQuestVarNotify { - uint32 parent_quest_id = 1; - repeated int32 quest_var = 2; - uint32 parent_quest_var_seq = 3; + uint32 parent_quest_id = 3; + repeated int32 quest_var = 6; + uint32 parent_quest_var_seq = 15; } diff --git a/proto/QuestUpdateQuestVarReq.proto b/proto/QuestUpdateQuestVarReq.proto index c89e7f0e..84394870 100644 --- a/proto/QuestUpdateQuestVarReq.proto +++ b/proto/QuestUpdateQuestVarReq.proto @@ -4,9 +4,13 @@ option java_package = "emu.grasscutter.net.proto"; import "QuestVarOp.proto"; +// CmdId: 490 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message QuestUpdateQuestVarReq { - uint32 quest_id = 1; - repeated QuestVarOp quest_var_op_list = 2; + uint32 quest_id = 15; + repeated QuestVarOp quest_var_op_list = 11; uint32 parent_quest_id = 3; - uint32 parent_quest_var_seq = 4; + uint32 parent_quest_var_seq = 8; } diff --git a/proto/QuestUpdateQuestVarRsp.proto b/proto/QuestUpdateQuestVarRsp.proto index 6f28cfb5..49735c37 100644 --- a/proto/QuestUpdateQuestVarRsp.proto +++ b/proto/QuestUpdateQuestVarRsp.proto @@ -2,9 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 486 +// EnetChannelId: 0 +// EnetIsReliable: true message QuestUpdateQuestVarRsp { - int32 retcode = 1; - uint32 quest_id = 2; - uint32 parent_quest_id = 3; - uint32 parent_quest_var_seq = 4; + int32 retcode = 8; + uint32 quest_id = 7; + uint32 parent_quest_id = 12; + uint32 parent_quest_var_seq = 3; } diff --git a/proto/QuickUseWidgetReq.proto b/proto/QuickUseWidgetReq.proto index 86b912c8..34e778f7 100644 --- a/proto/QuickUseWidgetReq.proto +++ b/proto/QuickUseWidgetReq.proto @@ -2,25 +2,20 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "WidgetCreateLocationInfo.proto"; import "WidgetCameraInfo.proto"; +import "WidgetCreateLocationInfo.proto"; import "WidgetCreatorInfo.proto"; import "WidgetThunderBirdFeatherInfo.proto"; +// CmdId: 4251 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message QuickUseWidgetReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4300; - } - - oneof Param { - WidgetCreateLocationInfo location_info = 20; - WidgetCameraInfo camera_info = 21; - WidgetCreatorInfo creator_info = 22; - WidgetThunderBirdFeatherInfo thunder_bird_feather_info = 23; + oneof param { + WidgetCreateLocationInfo location_info = 1800; + WidgetCameraInfo camera_info = 479; + WidgetCreatorInfo creator_info = 1204; + WidgetThunderBirdFeatherInfo thunder_bird_feather_info = 1198; } } diff --git a/proto/QuickUseWidgetRsp.proto b/proto/QuickUseWidgetRsp.proto index 8a6f9a95..568e601e 100644 --- a/proto/QuickUseWidgetRsp.proto +++ b/proto/QuickUseWidgetRsp.proto @@ -2,20 +2,19 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "OneoffGatherPointDetectorData.proto"; +//import "AHCELAJGOLN.proto"; import "ClientCollectorData.proto"; +import "OneoffGatherPointDetectorData.proto"; +// CmdId: 4252 +// EnetChannelId: 0 +// EnetIsReliable: true message QuickUseWidgetRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4258; + int32 retcode = 9; + uint32 material_id = 1; + oneof ELHGGAPPEBG { + OneoffGatherPointDetectorData detector_data = 11; + ClientCollectorData client_collector_data = 3; + //AHCELAJGOLN sky_crystal_detector_quick_use_result = 32767; } - - int32 retcode = 1; - uint32 material_id = 2; - OneoffGatherPointDetectorData detector_data = 3; - ClientCollectorData client_collector_data = 4; } diff --git a/proto/ReadMailNotify.proto b/proto/ReadMailNotify.proto index f485c8a6..796a57cf 100644 --- a/proto/ReadMailNotify.proto +++ b/proto/ReadMailNotify.proto @@ -2,6 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 1441 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message ReadMailNotify { - repeated uint32 mail_id_list = 1; + repeated uint32 mail_id_list = 9; } diff --git a/proto/Reliquary.proto b/proto/Reliquary.proto index a38387ba..73743905 100644 --- a/proto/Reliquary.proto +++ b/proto/Reliquary.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message Reliquary { uint32 level = 1; uint32 exp = 2; diff --git a/proto/ReliquaryDecomposeReq.proto b/proto/ReliquaryDecomposeReq.proto new file mode 100644 index 00000000..e0637a5d --- /dev/null +++ b/proto/ReliquaryDecomposeReq.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 615 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message ReliquaryDecomposeReq { + uint32 config_id = 1; + uint32 target_count = 4; + repeated uint64 guid_list = 15; +} diff --git a/proto/ReliquaryDecomposeRsp.proto b/proto/ReliquaryDecomposeRsp.proto new file mode 100644 index 00000000..a4b1ea8e --- /dev/null +++ b/proto/ReliquaryDecomposeRsp.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 692 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message ReliquaryDecomposeRsp { + int32 retcode = 9; + repeated uint64 guid_list = 14; +} diff --git a/proto/ReliquaryPromoteReq.proto b/proto/ReliquaryPromoteReq.proto index 780844be..75c120b3 100644 --- a/proto/ReliquaryPromoteReq.proto +++ b/proto/ReliquaryPromoteReq.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 612 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message ReliquaryPromoteReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 622; - } - - uint64 target_guid = 1; - uint64 item_guid = 2; + uint64 target_guid = 4; + uint64 item_guid = 14; } diff --git a/proto/ReliquaryPromoteRsp.proto b/proto/ReliquaryPromoteRsp.proto index 36cd6aec..d6a2180c 100644 --- a/proto/ReliquaryPromoteRsp.proto +++ b/proto/ReliquaryPromoteRsp.proto @@ -2,20 +2,14 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 658 +// EnetChannelId: 0 +// EnetIsReliable: true message ReliquaryPromoteRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 676; - } - - int32 retcode = 1; - uint64 target_reliquary_guid = 2; - uint32 old_promote_level = 3; - uint32 cur_promote_level = 4; - repeated uint32 old_append_prop_list = 5; - repeated uint32 cur_append_prop_list = 6; + int32 retcode = 2; + uint64 target_reliquary_guid = 4; + uint32 old_promote_level = 11; + uint32 cur_promote_level = 14; + repeated uint32 old_append_prop_list = 3; + repeated uint32 cur_append_prop_list = 13; } diff --git a/proto/ReliquaryUpgradeReq.proto b/proto/ReliquaryUpgradeReq.proto index 78e136bb..6649b6de 100644 --- a/proto/ReliquaryUpgradeReq.proto +++ b/proto/ReliquaryUpgradeReq.proto @@ -4,17 +4,12 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; +// CmdId: 606 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message ReliquaryUpgradeReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 616; - } - - uint64 target_reliquary_guid = 1; - repeated uint64 food_reliquary_guid_list = 2; - repeated ItemParam item_param_list = 3; + uint64 target_reliquary_guid = 5; + repeated uint64 food_reliquary_guid_list = 15; + repeated ItemParam item_param_list = 13; } diff --git a/proto/ReliquaryUpgradeRsp.proto b/proto/ReliquaryUpgradeRsp.proto index f5fe7eae..9f770838 100644 --- a/proto/ReliquaryUpgradeRsp.proto +++ b/proto/ReliquaryUpgradeRsp.proto @@ -2,21 +2,15 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 619 +// EnetChannelId: 0 +// EnetIsReliable: true message ReliquaryUpgradeRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 696; - } - int32 retcode = 1; - uint64 target_reliquary_guid = 2; - uint32 old_level = 3; - uint32 cur_level = 4; - uint32 power_up_rate = 5; - repeated uint32 old_append_prop_list = 6; - repeated uint32 cur_append_prop_list = 7; + uint64 target_reliquary_guid = 10; + uint32 old_level = 5; + uint32 cur_level = 6; + uint32 power_up_rate = 2; + repeated uint32 old_append_prop_list = 7; + repeated uint32 cur_append_prop_list = 14; } diff --git a/proto/ResVersionConfig.proto b/proto/ResVersionConfig.proto index 36073f2a..d22a8ef5 100644 --- a/proto/ResVersionConfig.proto +++ b/proto/ResVersionConfig.proto @@ -2,11 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message ResVersionConfig { uint32 version = 1; bool relogin = 2; - string md5 = 3; + string md_5 = 3; string release_total_size = 4; string version_suffix = 5; string branch = 6; diff --git a/proto/ResinChangeNotify.proto b/proto/ResinChangeNotify.proto index d68c0db2..5041f4a6 100644 --- a/proto/ResinChangeNotify.proto +++ b/proto/ResinChangeNotify.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 670 +// EnetChannelId: 0 +// EnetIsReliable: true message ResinChangeNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 611; - } - - uint32 cur_value = 1; + uint32 cur_value = 4; uint32 next_add_timestamp = 2; uint32 cur_buy_count = 3; } diff --git a/proto/ResinCostType.proto b/proto/ResinCostType.proto index 92e39550..c22cfa79 100644 --- a/proto/ResinCostType.proto +++ b/proto/ResinCostType.proto @@ -3,10 +3,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum ResinCostType { - NONE = 0; - NORMAL = 1; - CONDENSE = 2; - REUNION_PRIVILEGE = 3; - OP_ACTIVITY = 4; - MATERIAL = 5; + RESIN_COST_TYPE_NONE = 0; + RESIN_COST_TYPE_NORMAL = 1; + RESIN_COST_TYPE_CONDENSE = 2; + RESIN_COST_TYPE_REUNION_PRIVILEGE = 3; + RESIN_COST_TYPE_OP_ACTIVITY = 4; + RESIN_COST_TYPE_MATERIAL = 5; } diff --git a/proto/RoguelikeDungeonSettleInfo.proto b/proto/RoguelikeDungeonSettleInfo.proto new file mode 100644 index 00000000..720158b9 --- /dev/null +++ b/proto/RoguelikeDungeonSettleInfo.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "RoguelikeSettleCoinInfo.proto"; + +message RoguelikeDungeonSettleInfo { + uint32 stage_id = 1; + uint32 cur_level = 2; + map finished_challenge_cell_num_map = 3; + bool is_final_level = 4; + uint32 total_coin_b_num = 5; + uint32 total_coin_c_num = 6; + bool is_coin_c_reach_limit = 7; +} diff --git a/proto/RoguelikeSettleCoinInfo.proto b/proto/RoguelikeSettleCoinInfo.proto new file mode 100644 index 00000000..465a7321 --- /dev/null +++ b/proto/RoguelikeSettleCoinInfo.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message RoguelikeSettleCoinInfo { + uint32 cell_num = 1; + uint32 coin_b = 2; + uint32 coin_c = 3; +} diff --git a/proto/RoutePoint.proto b/proto/RoutePoint.proto index d6266de5..5390d5b6 100644 --- a/proto/RoutePoint.proto +++ b/proto/RoutePoint.proto @@ -2,19 +2,19 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "Vector.proto"; import "MathQuaternion.proto"; +import "Vector.proto"; message RoutePoint { - oneof MoveParams { + Vector position = 1; + float arrive_range = 2; + oneof move_params { float velocity = 11; float time = 12; } - oneof RotateParams { + oneof rotate_params { Vector rotation = 21; MathQuaternion rotation_speed = 22; MathQuaternion axis_speed = 23; } - Vector position = 1; - float arrive_range = 2; } diff --git a/proto/SceneAreaWeatherNotify.proto b/proto/SceneAreaWeatherNotify.proto index 51b16813..8ae1b43c 100644 --- a/proto/SceneAreaWeatherNotify.proto +++ b/proto/SceneAreaWeatherNotify.proto @@ -2,19 +2,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 229 +// EnetChannelId: 0 +// EnetIsReliable: true message SceneAreaWeatherNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 251; - } - - uint32 weather_gadget_id = 1; - map weather_value_map = 2; - uint32 weather_area_id = 3; - uint32 climate_type = 4; - float trans_duration = 5; + uint32 weather_gadget_id = 13; + map weather_value_map = 10; + uint32 weather_area_id = 15; + uint32 climate_type = 14; + float trans_duration = 11; } diff --git a/proto/SceneAvatarInfo.proto b/proto/SceneAvatarInfo.proto index f6b23cf0..617c3fc5 100644 --- a/proto/SceneAvatarInfo.proto +++ b/proto/SceneAvatarInfo.proto @@ -2,10 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "SceneWeaponInfo.proto"; -import "CurVehicleInfo.proto"; import "AvatarExcelInfo.proto"; +import "CurVehicleInfo.proto"; import "SceneReliquaryInfo.proto"; +import "SceneWeaponInfo.proto"; import "ServerBuff.proto"; message SceneAvatarInfo { diff --git a/proto/SceneEntityAiInfo.proto b/proto/SceneEntityAiInfo.proto index bc85ef4f..8eb55e72 100644 --- a/proto/SceneEntityAiInfo.proto +++ b/proto/SceneEntityAiInfo.proto @@ -2,8 +2,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "Vector.proto"; import "ServantInfo.proto"; +import "Vector.proto"; message SceneEntityAiInfo { bool is_ai_open = 1; diff --git a/proto/SceneEntityAppearNotify.proto b/proto/SceneEntityAppearNotify.proto index 388c69dc..9f0e4dff 100644 --- a/proto/SceneEntityAppearNotify.proto +++ b/proto/SceneEntityAppearNotify.proto @@ -2,19 +2,14 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "VisionType.proto"; import "SceneEntityInfo.proto"; +import "VisionType.proto"; +// CmdId: 217 +// EnetChannelId: 0 +// EnetIsReliable: true message SceneEntityAppearNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 201; - } - - repeated SceneEntityInfo entity_list = 1; - VisionType appear_type = 2; - uint32 param = 3; + repeated SceneEntityInfo entity_list = 6; + VisionType appear_type = 8; + uint32 param = 11; } diff --git a/proto/SceneEntityDisappearNotify.proto b/proto/SceneEntityDisappearNotify.proto index 45a4c02f..adb5d470 100644 --- a/proto/SceneEntityDisappearNotify.proto +++ b/proto/SceneEntityDisappearNotify.proto @@ -4,15 +4,11 @@ option java_package = "emu.grasscutter.net.proto"; import "VisionType.proto"; +// CmdId: 285 +// EnetChannelId: 0 +// EnetIsReliable: true message SceneEntityDisappearNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 294; - } - - repeated uint32 entity_list = 1; - VisionType disappear_type = 2; + repeated uint32 entity_list = 9; + VisionType disappear_type = 10; + uint32 param = 6; } diff --git a/proto/SceneEntityDrownReq.proto b/proto/SceneEntityDrownReq.proto index a0a98e9c..8b822e93 100644 --- a/proto/SceneEntityDrownReq.proto +++ b/proto/SceneEntityDrownReq.proto @@ -2,15 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 212 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message SceneEntityDrownReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 222; - } - - uint32 entity_id = 1; + uint32 entity_id = 14; } diff --git a/proto/SceneEntityDrownRsp.proto b/proto/SceneEntityDrownRsp.proto index 8db1aece..1d323d3a 100644 --- a/proto/SceneEntityDrownRsp.proto +++ b/proto/SceneEntityDrownRsp.proto @@ -2,15 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 258 +// EnetChannelId: 0 +// EnetIsReliable: true message SceneEntityDrownRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 276; - } - - int32 retcode = 1; - uint32 entity_id = 2; + int32 retcode = 14; + uint32 entity_id = 10; } diff --git a/proto/SceneEntityInfo.proto b/proto/SceneEntityInfo.proto index 0c56b704..6cd667b0 100644 --- a/proto/SceneEntityInfo.proto +++ b/proto/SceneEntityInfo.proto @@ -2,27 +2,21 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +import "AnimatorParameterValueInfoPair.proto"; +import "EntityAuthorityInfo.proto"; +import "EntityClientData.proto"; +import "EntityEnvironmentInfo.proto"; +import "FightPropPair.proto"; +import "MotionInfo.proto"; +import "PropPair.proto"; +import "ProtEntityType.proto"; import "SceneAvatarInfo.proto"; +import "SceneGadgetInfo.proto"; import "SceneMonsterInfo.proto"; import "SceneNpcInfo.proto"; -import "SceneGadgetInfo.proto"; -import "ProtEntityType.proto"; -import "MotionInfo.proto"; -import "EntityClientData.proto"; -import "EntityAuthorityInfo.proto"; -import "PropPair.proto"; -import "FightPropPair.proto"; -import "AnimatorParameterValueInfoPair.proto"; -import "EntityEnvironmentInfo.proto"; import "ServerBuff.proto"; message SceneEntityInfo { - oneof Entity { - SceneAvatarInfo avatar = 10; - SceneMonsterInfo monster = 11; - SceneNpcInfo npc = 12; - SceneGadgetInfo gadget = 13; - } ProtEntityType entity_type = 1; uint32 entity_id = 2; string name = 3; @@ -38,4 +32,10 @@ message SceneEntityInfo { EntityAuthorityInfo entity_authority_info = 21; repeated string tag_list = 22; repeated ServerBuff server_buff_list = 23; + oneof entity { + SceneAvatarInfo avatar = 10; + SceneMonsterInfo monster = 11; + SceneNpcInfo npc = 12; + SceneGadgetInfo gadget = 13; + } } diff --git a/proto/SceneEntityMoveNotify.proto b/proto/SceneEntityMoveNotify.proto index 58b430c6..116b5a13 100644 --- a/proto/SceneEntityMoveNotify.proto +++ b/proto/SceneEntityMoveNotify.proto @@ -4,17 +4,12 @@ option java_package = "emu.grasscutter.net.proto"; import "MotionInfo.proto"; +// CmdId: 227 +// EnetChannelId: 1 +// EnetIsReliable: true message SceneEntityMoveNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_IS_RELIABLE = 1; - ENET_CHANNEL_ID = 1; - CMD_ID = 226; - } - - uint32 entity_id = 1; - MotionInfo motion_info = 2; - uint32 scene_time = 3; - uint32 reliable_seq = 4; + uint32 entity_id = 10; + MotionInfo motion_info = 3; + uint32 scene_time = 12; + uint32 reliable_seq = 11; } diff --git a/proto/SceneFishInfo.proto b/proto/SceneFishInfo.proto index 212a244c..b5b0368d 100644 --- a/proto/SceneFishInfo.proto +++ b/proto/SceneFishInfo.proto @@ -9,4 +9,5 @@ message SceneFishInfo { uint32 fish_pool_entity_id = 2; Vector fish_pool_pos = 3; uint32 fish_pool_gadget_id = 4; + uint32 LPNFLHKPHEC = 5; } diff --git a/proto/SceneForceUnlockNotify.proto b/proto/SceneForceUnlockNotify.proto index b260606d..8acaf733 100644 --- a/proto/SceneForceUnlockNotify.proto +++ b/proto/SceneForceUnlockNotify.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 201 +// EnetChannelId: 0 +// EnetIsReliable: true message SceneForceUnlockNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 292; - } - repeated uint32 force_id_list = 1; - bool is_add = 2; + bool is_add = 5; } diff --git a/proto/SceneGadgetInfo.proto b/proto/SceneGadgetInfo.proto index 0c405e47..ac847eab 100644 --- a/proto/SceneGadgetInfo.proto +++ b/proto/SceneGadgetInfo.proto @@ -2,31 +2,49 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "Item.proto"; -import "GatherGadgetInfo.proto"; -import "WorktopInfo.proto"; -import "ClientGadgetInfo.proto"; -import "WeatherInfo.proto"; import "AbilityGadgetInfo.proto"; -import "StatueGadgetInfo.proto"; -import "BossChestInfo.proto"; import "BlossomChestInfo.proto"; -import "MpPlayRewardInfo.proto"; -import "GadgetGeneralRewardInfo.proto"; -import "OfferingInfo.proto"; -import "FoundationInfo.proto"; -import "VehicleInfo.proto"; -import "EchoShellInfo.proto"; -import "ScreenInfo.proto"; -import "FishPoolInfo.proto"; +import "BossChestInfo.proto"; +import "ClientGadgetInfo.proto"; import "CustomGadgetTreeInfo.proto"; -import "RoguelikeGadgetInfo.proto"; +import "EchoShellInfo.proto"; +import "FishPoolInfo.proto"; +import "FoundationInfo.proto"; import "GadgetBornType.proto"; -import "PlatformInfo.proto"; +import "GadgetGeneralRewardInfo.proto"; import "GadgetPlayInfo.proto"; +import "GatherGadgetInfo.proto"; +import "Item.proto"; +import "MpPlayRewardInfo.proto"; +import "OfferingInfo.proto"; +import "PlatformInfo.proto"; +import "RoguelikeGadgetInfo.proto"; +import "ScreenInfo.proto"; +import "StatueGadgetInfo.proto"; +import "VehicleInfo.proto"; +import "WeatherInfo.proto"; +import "WorktopInfo.proto"; message SceneGadgetInfo { - oneof Content { + uint32 gadget_id = 1; + uint32 group_id = 2; + uint32 config_id = 3; + uint32 owner_entity_id = 4; + GadgetBornType born_type = 5; + uint32 gadget_state = 6; + uint32 gadget_type = 7; + bool is_show_cutscene = 8; + uint32 authority_peer_id = 9; + bool is_enable_interact = 10; + uint32 interact_id = 11; + uint32 mark_flag = 21; + uint32 prop_owner_entity_id = 22; + PlatformInfo platform = 23; + repeated uint32 interact_uid_list = 24; + uint32 draft_id = 25; + uint32 gadget_talk_state = 26; + GadgetPlayInfo play_info = 100; + oneof content { Item trifle_item = 12; GatherGadgetInfo gather_gadget = 13; WorktopInfo worktop = 14; @@ -47,22 +65,4 @@ message SceneGadgetInfo { CustomGadgetTreeInfo custom_gadget_tree_info = 60; RoguelikeGadgetInfo roguelike_gadget_info = 61; } - uint32 gadget_id = 1; - uint32 group_id = 2; - uint32 config_id = 3; - uint32 owner_entity_id = 4; - GadgetBornType born_type = 5; - uint32 gadget_state = 6; - uint32 gadget_type = 7; - bool is_show_cutscene = 8; - uint32 authority_peer_id = 9; - bool is_enable_interact = 10; - uint32 interact_id = 11; - uint32 mark_flag = 21; - uint32 prop_owner_entity_id = 22; - PlatformInfo platform = 23; - repeated uint32 interact_uid_list = 24; - uint32 draft_id = 25; - uint32 gadget_talk_state = 26; - GadgetPlayInfo play_info = 100; } diff --git a/proto/SceneInitFinishRsp.proto b/proto/SceneInitFinishRsp.proto index bdc518b8..cec0970e 100644 --- a/proto/SceneInitFinishRsp.proto +++ b/proto/SceneInitFinishRsp.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 232 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message SceneInitFinishRsp { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 300; - } - - int32 retcode = 1; - uint32 enter_scene_token = 2; + int32 retcode = 10; + uint32 enter_scene_token = 15; } diff --git a/proto/SceneKickPlayerNotify.proto b/proto/SceneKickPlayerNotify.proto index cb8e5f07..f4a6bcb9 100644 --- a/proto/SceneKickPlayerNotify.proto +++ b/proto/SceneKickPlayerNotify.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 292 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message SceneKickPlayerNotify { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 235; - } - - uint32 kicker_uid = 1; - uint32 target_uid = 2; + uint32 kicker_uid = 9; + uint32 target_uid = 13; } diff --git a/proto/SceneKickPlayerReq.proto b/proto/SceneKickPlayerReq.proto index eada835a..61b83f5b 100644 --- a/proto/SceneKickPlayerReq.proto +++ b/proto/SceneKickPlayerReq.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 295 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message SceneKickPlayerReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 268; - } - - uint32 target_uid = 1; + uint32 target_uid = 12; } diff --git a/proto/SceneKickPlayerRsp.proto b/proto/SceneKickPlayerRsp.proto index 68eadc25..4e61298b 100644 --- a/proto/SceneKickPlayerRsp.proto +++ b/proto/SceneKickPlayerRsp.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 215 +// EnetChannelId: 0 +// EnetIsReliable: true message SceneKickPlayerRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 272; - } - - int32 retcode = 1; - uint32 target_uid = 2; + int32 retcode = 9; + uint32 target_uid = 12; } diff --git a/proto/SceneMonsterInfo.proto b/proto/SceneMonsterInfo.proto index ef957281..291ce0ac 100644 --- a/proto/SceneMonsterInfo.proto +++ b/proto/SceneMonsterInfo.proto @@ -2,15 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "SceneFishInfo.proto"; import "MonsterBornType.proto"; import "MonsterRoute.proto"; +import "SceneFishInfo.proto"; import "SceneWeaponInfo.proto"; message SceneMonsterInfo { - oneof Content { - SceneFishInfo fish_info = 50; - } uint32 monster_id = 1; uint32 group_id = 2; uint32 config_id = 3; @@ -32,4 +29,7 @@ message SceneMonsterInfo { uint32 ai_config_id = 19; uint32 level_route_id = 20; uint32 init_pose_id = 21; + oneof content { + SceneFishInfo fish_info = 50; + } } diff --git a/proto/SceneNpcInfo.proto b/proto/SceneNpcInfo.proto index b04265cb..76d878af 100644 --- a/proto/SceneNpcInfo.proto +++ b/proto/SceneNpcInfo.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message SceneNpcInfo { uint32 npc_id = 1; uint32 room_id = 2; diff --git a/proto/ScenePlayerInfoNotify.proto b/proto/ScenePlayerInfoNotify.proto index 7f789f3f..bb515149 100644 --- a/proto/ScenePlayerInfoNotify.proto +++ b/proto/ScenePlayerInfoNotify.proto @@ -4,14 +4,9 @@ option java_package = "emu.grasscutter.net.proto"; import "ScenePlayerInfo.proto"; +// CmdId: 225 +// EnetChannelId: 0 +// EnetIsReliable: true message ScenePlayerInfoNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 293; - } - - repeated ScenePlayerInfo player_info_list = 1; + repeated ScenePlayerInfo player_info_list = 11; } diff --git a/proto/ScenePlayerLocationNotify.proto b/proto/ScenePlayerLocationNotify.proto index 6e847884..60fd1fc3 100644 --- a/proto/ScenePlayerLocationNotify.proto +++ b/proto/ScenePlayerLocationNotify.proto @@ -5,16 +5,11 @@ option java_package = "emu.grasscutter.net.proto"; import "PlayerLocationInfo.proto"; import "VehicleLocationInfo.proto"; +// CmdId: 207 +// EnetChannelId: 1 +// EnetIsReliable: true message ScenePlayerLocationNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_IS_RELIABLE = 1; - ENET_CHANNEL_ID = 1; - CMD_ID = 224; - } - uint32 scene_id = 1; - repeated PlayerLocationInfo player_loc_list = 2; - repeated VehicleLocationInfo vehicle_loc_list = 3; + repeated PlayerLocationInfo player_loc_list = 8; + repeated VehicleLocationInfo vehicle_loc_list = 5; } diff --git a/proto/SceneReliquaryInfo.proto b/proto/SceneReliquaryInfo.proto index 8d785d45..782d41de 100644 --- a/proto/SceneReliquaryInfo.proto +++ b/proto/SceneReliquaryInfo.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message SceneReliquaryInfo { uint32 item_id = 1; uint64 guid = 2; diff --git a/proto/SceneTeamAvatar.proto b/proto/SceneTeamAvatar.proto index 1b09ddb4..8ad79b45 100644 --- a/proto/SceneTeamAvatar.proto +++ b/proto/SceneTeamAvatar.proto @@ -2,11 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +import "AbilityControlBlock.proto"; +import "AbilitySyncStateInfo.proto"; import "AvatarInfo.proto"; import "SceneAvatarInfo.proto"; -import "AbilitySyncStateInfo.proto"; import "SceneEntityInfo.proto"; -import "AbilityControlBlock.proto"; import "ServerBuff.proto"; message SceneTeamAvatar { diff --git a/proto/SceneTeamUpdateNotify.proto b/proto/SceneTeamUpdateNotify.proto index 183d88f8..44800556 100644 --- a/proto/SceneTeamUpdateNotify.proto +++ b/proto/SceneTeamUpdateNotify.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "SceneTeamAvatar.proto"; +// CmdId: 1699 +// EnetChannelId: 0 +// EnetIsReliable: true message SceneTeamUpdateNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1793; - } - - repeated SceneTeamAvatar scene_team_avatar_list = 1; - bool is_in_mp = 3; + repeated SceneTeamAvatar scene_team_avatar_list = 11; + bool is_in_mp = 1; } diff --git a/proto/SceneTimeNotify.proto b/proto/SceneTimeNotify.proto index 601be277..6130e053 100644 --- a/proto/SceneTimeNotify.proto +++ b/proto/SceneTimeNotify.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 262 +// EnetChannelId: 0 +// EnetIsReliable: true message SceneTimeNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 230; - } - - uint32 scene_id = 1; - bool is_paused = 2; - uint64 scene_time = 3; + uint32 scene_id = 3; + bool is_paused = 5; + uint64 scene_time = 14; } diff --git a/proto/SceneTransToPointReq.proto b/proto/SceneTransToPointReq.proto index aed746d3..7b366cbe 100644 --- a/proto/SceneTransToPointReq.proto +++ b/proto/SceneTransToPointReq.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 286 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message SceneTransToPointReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 270; - } - - uint32 scene_id = 1; - uint32 point_id = 2; + uint32 scene_id = 12; + uint32 point_id = 4; } diff --git a/proto/SceneTransToPointRsp.proto b/proto/SceneTransToPointRsp.proto index 3448f263..a880f56a 100644 --- a/proto/SceneTransToPointRsp.proto +++ b/proto/SceneTransToPointRsp.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 263 +// EnetChannelId: 0 +// EnetIsReliable: true message SceneTransToPointRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 232; - } - - int32 retcode = 1; - uint32 scene_id = 2; - uint32 point_id = 3; + int32 retcode = 4; + uint32 scene_id = 11; + uint32 point_id = 13; } diff --git a/proto/SceneWeaponInfo.proto b/proto/SceneWeaponInfo.proto index db45af89..8ef4dae9 100644 --- a/proto/SceneWeaponInfo.proto +++ b/proto/SceneWeaponInfo.proto @@ -3,6 +3,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "AbilitySyncStateInfo.proto"; +import "EntityRendererChangedInfo.proto"; message SceneWeaponInfo { uint32 entity_id = 1; @@ -13,4 +14,5 @@ message SceneWeaponInfo { uint32 promote_level = 6; AbilitySyncStateInfo ability_info = 7; map affix_map = 8; + EntityRendererChangedInfo renderer_changed_info = 9; } diff --git a/proto/SelectWorktopOptionReq.proto b/proto/SelectWorktopOptionReq.proto index 10f36bc4..449cfe51 100644 --- a/proto/SelectWorktopOptionReq.proto +++ b/proto/SelectWorktopOptionReq.proto @@ -2,7 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 832 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message SelectWorktopOptionReq { - uint32 gadget_entity_id = 1; - uint32 option_id = 2; + uint32 gadget_entity_id = 2; + uint32 option_id = 5; } diff --git a/proto/SelectWorktopOptionRsp.proto b/proto/SelectWorktopOptionRsp.proto index 423882e4..13beed8e 100644 --- a/proto/SelectWorktopOptionRsp.proto +++ b/proto/SelectWorktopOptionRsp.proto @@ -2,8 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 817 +// EnetChannelId: 0 +// EnetIsReliable: true message SelectWorktopOptionRsp { - int32 retcode = 1; - uint32 gadget_entity_id = 2; - uint32 option_id = 3; + int32 retcode = 7; + uint32 gadget_entity_id = 12; + uint32 option_id = 10; } diff --git a/proto/ServantInfo.proto b/proto/ServantInfo.proto index 3ed3e9b0..28b5bff0 100644 --- a/proto/ServantInfo.proto +++ b/proto/ServantInfo.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message ServantInfo { uint32 master_entity_id = 1; uint32 born_slot_index = 2; diff --git a/proto/ServerAnnounceNotify.proto b/proto/ServerAnnounceNotify.proto new file mode 100644 index 00000000..271cafa2 --- /dev/null +++ b/proto/ServerAnnounceNotify.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "AnnounceData.proto"; + +// CmdId: 2029 +// EnetChannelId: 0 +// EnetIsReliable: true +message ServerAnnounceNotify { + repeated AnnounceData announce_data_list = 8; +} diff --git a/proto/ServerAnnounceRevokeNotify.proto b/proto/ServerAnnounceRevokeNotify.proto new file mode 100644 index 00000000..c1d6062e --- /dev/null +++ b/proto/ServerAnnounceRevokeNotify.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 2141 +// EnetChannelId: 0 +// EnetIsReliable: true +message ServerAnnounceRevokeNotify { + repeated uint32 config_id_list = 15; +} diff --git a/proto/ServerBuff.proto b/proto/ServerBuff.proto index bc969584..92f0829d 100644 --- a/proto/ServerBuff.proto +++ b/proto/ServerBuff.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message ServerBuff { uint32 server_buff_uid = 1; uint32 server_buff_id = 2; diff --git a/proto/ServerCondMeetQuestListUpdateNotify.proto b/proto/ServerCondMeetQuestListUpdateNotify.proto index 4326518a..615c704d 100644 --- a/proto/ServerCondMeetQuestListUpdateNotify.proto +++ b/proto/ServerCondMeetQuestListUpdateNotify.proto @@ -2,7 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 401 +// EnetChannelId: 0 +// EnetIsReliable: true message ServerCondMeetQuestListUpdateNotify { - repeated uint32 add_quest_id_list = 1; - repeated uint32 del_quest_id_list = 2; + repeated uint32 add_quest_id_list = 9; + repeated uint32 del_quest_id_list = 6; } diff --git a/proto/ServerTimeNotify.proto b/proto/ServerTimeNotify.proto index f20266a0..efc231af 100644 --- a/proto/ServerTimeNotify.proto +++ b/proto/ServerTimeNotify.proto @@ -2,15 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 82 +// EnetChannelId: 1 +// EnetIsReliable: true message ServerTimeNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_IS_RELIABLE = 1; - ENET_CHANNEL_ID = 1; - CMD_ID = 79; - } - - uint64 server_time = 1; + uint64 server_time = 15; } diff --git a/proto/SetBattlePassViewedReq.proto b/proto/SetBattlePassViewedReq.proto new file mode 100644 index 00000000..42e52ad5 --- /dev/null +++ b/proto/SetBattlePassViewedReq.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 2637 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message SetBattlePassViewedReq { + uint32 schedule_id = 6; +} diff --git a/proto/SetBattlePassViewedRsp.proto b/proto/SetBattlePassViewedRsp.proto new file mode 100644 index 00000000..3fb81d2f --- /dev/null +++ b/proto/SetBattlePassViewedRsp.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 2632 +// EnetChannelId: 0 +// EnetIsReliable: true +message SetBattlePassViewedRsp { + int32 retcode = 15; + uint32 schedule_id = 10; +} diff --git a/proto/SetEntityClientDataNotify.proto b/proto/SetEntityClientDataNotify.proto index 2760a4d5..b61e44d4 100644 --- a/proto/SetEntityClientDataNotify.proto +++ b/proto/SetEntityClientDataNotify.proto @@ -4,16 +4,11 @@ option java_package = "emu.grasscutter.net.proto"; import "EntityClientData.proto"; +// CmdId: 3375 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message SetEntityClientDataNotify { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 3187; - } - - uint32 entity_id = 1; - EntityClientData entity_client_data = 2; + uint32 entity_id = 13; + EntityClientData entity_client_data = 1; } diff --git a/proto/SetEquipLockStateReq.proto b/proto/SetEquipLockStateReq.proto index 91c97d47..9280ee17 100644 --- a/proto/SetEquipLockStateReq.proto +++ b/proto/SetEquipLockStateReq.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 604 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message SetEquipLockStateReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 605; - } - - uint64 target_equip_guid = 1; - bool is_locked = 2; + uint64 target_equip_guid = 10; + bool is_locked = 11; } diff --git a/proto/SetEquipLockStateRsp.proto b/proto/SetEquipLockStateRsp.proto index 7afa7503..11808184 100644 --- a/proto/SetEquipLockStateRsp.proto +++ b/proto/SetEquipLockStateRsp.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 605 +// EnetChannelId: 0 +// EnetIsReliable: true message SetEquipLockStateRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 662; - } - - int32 retcode = 1; - uint64 target_equip_guid = 2; - bool is_locked = 3; + int32 retcode = 7; + uint64 target_equip_guid = 13; + bool is_locked = 5; } diff --git a/proto/SetNameCardReq.proto b/proto/SetNameCardReq.proto index d89eedb1..a0edfb69 100644 --- a/proto/SetNameCardReq.proto +++ b/proto/SetNameCardReq.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4006 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message SetNameCardReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4016; - } - - uint32 name_card_id = 1; + uint32 name_card_id = 4; } diff --git a/proto/SetNameCardRsp.proto b/proto/SetNameCardRsp.proto index f45961a5..d7c5a557 100644 --- a/proto/SetNameCardRsp.proto +++ b/proto/SetNameCardRsp.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4019 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message SetNameCardRsp { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4096; - } - - int32 retcode = 1; + int32 retcode = 11; uint32 name_card_id = 2; } diff --git a/proto/SetPlayerBirthdayReq.proto b/proto/SetPlayerBirthdayReq.proto index 3085c75b..ceeeb0b7 100644 --- a/proto/SetPlayerBirthdayReq.proto +++ b/proto/SetPlayerBirthdayReq.proto @@ -1,18 +1,13 @@ syntax = "proto3"; -import "Birthday.proto"; - option java_package = "emu.grasscutter.net.proto"; -message SetPlayerBirthdayReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4024; - } +import "Birthday.proto"; - Birthday birthday = 1; +// CmdId: 4007 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message SetPlayerBirthdayReq { + Birthday birthday = 10; } diff --git a/proto/SetPlayerBirthdayRsp.proto b/proto/SetPlayerBirthdayRsp.proto index a7ac3c01..1f2b92f8 100644 --- a/proto/SetPlayerBirthdayRsp.proto +++ b/proto/SetPlayerBirthdayRsp.proto @@ -1,18 +1,13 @@ syntax = "proto3"; -import "Birthday.proto"; - option java_package = "emu.grasscutter.net.proto"; -message SetPlayerBirthdayRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4091; - } +import "Birthday.proto"; - int32 retcode = 1; - Birthday birthday = 2; +// CmdId: 4030 +// EnetChannelId: 0 +// EnetIsReliable: true +message SetPlayerBirthdayRsp { + int32 retcode = 12; + Birthday birthday = 14; } diff --git a/proto/SetPlayerBornDataReq.proto b/proto/SetPlayerBornDataReq.proto index ce0594d3..cd5cbf4b 100644 --- a/proto/SetPlayerBornDataReq.proto +++ b/proto/SetPlayerBornDataReq.proto @@ -2,16 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 198 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message SetPlayerBornDataReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 119; - } - - uint32 avatar_id = 1; - string nick_name = 2; + uint32 avatar_id = 3; + string nick_name = 12; } diff --git a/proto/SetPlayerBornDataRsp.proto b/proto/SetPlayerBornDataRsp.proto index 9192576c..fd505107 100644 --- a/proto/SetPlayerBornDataRsp.proto +++ b/proto/SetPlayerBornDataRsp.proto @@ -2,14 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 145 +// EnetChannelId: 0 +// EnetIsReliable: true message SetPlayerBornDataRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 114; - } - - int32 retcode = 1; + int32 retcode = 4; } diff --git a/proto/SetPlayerHeadImageReq.proto b/proto/SetPlayerHeadImageReq.proto index d2182baa..53e6ce18 100644 --- a/proto/SetPlayerHeadImageReq.proto +++ b/proto/SetPlayerHeadImageReq.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4045 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message SetPlayerHeadImageReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4014; - } - - uint32 avatar_id = 1; + uint32 avatar_id = 4; } diff --git a/proto/SetPlayerHeadImageRsp.proto b/proto/SetPlayerHeadImageRsp.proto index 28d568ca..5cbef4f1 100644 --- a/proto/SetPlayerHeadImageRsp.proto +++ b/proto/SetPlayerHeadImageRsp.proto @@ -4,16 +4,11 @@ option java_package = "emu.grasscutter.net.proto"; import "ProfilePicture.proto"; +// CmdId: 4090 +// EnetChannelId: 0 +// EnetIsReliable: true message SetPlayerHeadImageRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4015; - } - - int32 retcode = 1; - uint32 avatar_id = 2; - ProfilePicture profile_picture = 3; + int32 retcode = 13; + uint32 avatar_id = 3; + ProfilePicture profile_picture = 5; } diff --git a/proto/SetPlayerNameReq.proto b/proto/SetPlayerNameReq.proto index d9b60621..962b188a 100644 --- a/proto/SetPlayerNameReq.proto +++ b/proto/SetPlayerNameReq.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 163 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message SetPlayerNameReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 132; - } - - string nick_name = 1; + string nick_name = 8; } diff --git a/proto/SetPlayerNameRsp.proto b/proto/SetPlayerNameRsp.proto index 0e4be099..c59cc222 100644 --- a/proto/SetPlayerNameRsp.proto +++ b/proto/SetPlayerNameRsp.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 124 +// EnetChannelId: 0 +// EnetIsReliable: true message SetPlayerNameRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 147; - } - - int32 retcode = 1; - string nick_name = 2; + int32 retcode = 12; + string nick_name = 6; } diff --git a/proto/SetPlayerPropReq.proto b/proto/SetPlayerPropReq.proto index 41b018ed..1f8e286d 100644 --- a/proto/SetPlayerPropReq.proto +++ b/proto/SetPlayerPropReq.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "PropValue.proto"; +// CmdId: 130 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message SetPlayerPropReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 191; - } - - repeated PropValue prop_list = 1; + repeated PropValue prop_list = 14; } diff --git a/proto/SetPlayerPropRsp.proto b/proto/SetPlayerPropRsp.proto index 935754f1..9c486533 100644 --- a/proto/SetPlayerPropRsp.proto +++ b/proto/SetPlayerPropRsp.proto @@ -2,15 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 197 +// EnetChannelId: 0 +// EnetIsReliable: true message SetPlayerPropRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 136; - } - - int32 retcode = 1; + int32 retcode = 5; } diff --git a/proto/SetPlayerSignatureReq.proto b/proto/SetPlayerSignatureReq.proto index dd1f5e8b..5e006a60 100644 --- a/proto/SetPlayerSignatureReq.proto +++ b/proto/SetPlayerSignatureReq.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4097 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message SetPlayerSignatureReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4036; - } - - string signature = 1; + string signature = 15; } diff --git a/proto/SetPlayerSignatureRsp.proto b/proto/SetPlayerSignatureRsp.proto index b225cec4..268760e7 100644 --- a/proto/SetPlayerSignatureRsp.proto +++ b/proto/SetPlayerSignatureRsp.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4098 +// EnetChannelId: 0 +// EnetIsReliable: true message SetPlayerSignatureRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4019; - } - - int32 retcode = 1; - string signature = 2; + int32 retcode = 14; + string signature = 6; } diff --git a/proto/SetUpAvatarTeamReq.proto b/proto/SetUpAvatarTeamReq.proto index 3c2db15d..418c3a2e 100644 --- a/proto/SetUpAvatarTeamReq.proto +++ b/proto/SetUpAvatarTeamReq.proto @@ -2,18 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1753 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message SetUpAvatarTeamReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 1653; - } - - uint32 team_id = 1; - repeated uint64 avatar_team_guid_list = 2; - uint64 cur_avatar_guid = 3; + uint32 team_id = 10; + repeated uint64 avatar_team_guid_list = 1; + uint64 cur_avatar_guid = 2; } diff --git a/proto/SetUpAvatarTeamRsp.proto b/proto/SetUpAvatarTeamRsp.proto index dbcc81d6..bdba9900 100644 --- a/proto/SetUpAvatarTeamRsp.proto +++ b/proto/SetUpAvatarTeamRsp.proto @@ -2,18 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1664 +// EnetChannelId: 0 +// EnetIsReliable: true message SetUpAvatarTeamRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1744; - } - - int32 retcode = 1; - uint32 team_id = 2; - repeated uint64 avatar_team_guid_list = 3; - uint64 cur_avatar_guid = 4; + int32 retcode = 2; + uint32 team_id = 5; + repeated uint64 avatar_team_guid_list = 12; + uint64 cur_avatar_guid = 3; } diff --git a/proto/SetUpLunchBoxWidgetReq.proto b/proto/SetUpLunchBoxWidgetReq.proto index a3e0293c..e6f4b4f8 100644 --- a/proto/SetUpLunchBoxWidgetReq.proto +++ b/proto/SetUpLunchBoxWidgetReq.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "LunchBoxData.proto"; +// CmdId: 4297 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message SetUpLunchBoxWidgetReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4265; - } - - LunchBoxData lunch_box_data = 1; + LunchBoxData lunch_box_data = 12; } diff --git a/proto/SetUpLunchBoxWidgetRsp.proto b/proto/SetUpLunchBoxWidgetRsp.proto index e2c70dd0..d58ecb56 100644 --- a/proto/SetUpLunchBoxWidgetRsp.proto +++ b/proto/SetUpLunchBoxWidgetRsp.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "LunchBoxData.proto"; +// CmdId: 4266 +// EnetChannelId: 0 +// EnetIsReliable: true message SetUpLunchBoxWidgetRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4297; - } - - int32 retcode = 1; - LunchBoxData lunch_box_data = 2; + int32 retcode = 9; + LunchBoxData lunch_box_data = 3; } diff --git a/proto/SetWidgetSlotReq.proto b/proto/SetWidgetSlotReq.proto index 2d140a52..72ce5a0d 100644 --- a/proto/SetWidgetSlotReq.proto +++ b/proto/SetWidgetSlotReq.proto @@ -5,17 +5,12 @@ option java_package = "emu.grasscutter.net.proto"; import "WidgetSlotOp.proto"; import "WidgetSlotTag.proto"; +// CmdId: 4269 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message SetWidgetSlotReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4269; - } - - WidgetSlotOp op = 2; - repeated WidgetSlotTag tag_list = 3; - uint32 material_id = 4; + WidgetSlotOp op = 4; + repeated WidgetSlotTag tag_list = 11; + uint32 material_id = 9; } diff --git a/proto/SetWidgetSlotRsp.proto b/proto/SetWidgetSlotRsp.proto index 7d7b34a3..821729c1 100644 --- a/proto/SetWidgetSlotRsp.proto +++ b/proto/SetWidgetSlotRsp.proto @@ -5,17 +5,12 @@ option java_package = "emu.grasscutter.net.proto"; import "WidgetSlotOp.proto"; import "WidgetSlotTag.proto"; +// CmdId: 4260 +// EnetChannelId: 0 +// EnetIsReliable: true message SetWidgetSlotRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4279; - } - - int32 retcode = 1; - WidgetSlotOp op = 2; - repeated WidgetSlotTag tag_list = 3; - uint32 material_id = 4; + int32 retcode = 7; + WidgetSlotOp op = 14; + repeated WidgetSlotTag tag_list = 4; + uint32 material_id = 9; } diff --git a/proto/Shop.proto b/proto/Shop.proto index a5b9ad6e..1b9cc4b5 100644 --- a/proto/Shop.proto +++ b/proto/Shop.proto @@ -2,10 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "ShopGoods.proto"; -import "ShopMcoinProduct.proto"; import "ShopCardProduct.proto"; import "ShopConcertProduct.proto"; +import "ShopGoods.proto"; +import "ShopMcoinProduct.proto"; message Shop { uint32 shop_type = 1; diff --git a/proto/ShopCardProduct.proto b/proto/ShopCardProduct.proto index 45971007..c583fbc9 100644 --- a/proto/ShopCardProduct.proto +++ b/proto/ShopCardProduct.proto @@ -5,14 +5,6 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; message ShopCardProduct { - message ResinCard { - repeated ItemParam base_item_list = 1; - repeated ItemParam per_day_item_list = 2; - } - - oneof ExtraCardData { - ResinCard resin_card = 101; - } string product_id = 1; string price_tier = 2; uint32 mcoin_base = 3; @@ -20,4 +12,12 @@ message ShopCardProduct { uint32 days = 5; uint32 remain_reward_days = 6; uint32 card_product_type = 7; + oneof extra_card_data { + ResinCard resin_card = 101; + } + + message ResinCard { + repeated ItemParam base_item_list = 1; + repeated ItemParam per_day_item_list = 2; + } } diff --git a/proto/ShopMcoinProduct.proto b/proto/ShopMcoinProduct.proto index 3962ad17..e4ab5086 100644 --- a/proto/ShopMcoinProduct.proto +++ b/proto/ShopMcoinProduct.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message ShopMcoinProduct { string product_id = 1; string price_tier = 2; diff --git a/proto/ShortAbilityHashPair.proto b/proto/ShortAbilityHashPair.proto index ec02252a..5272cc29 100644 --- a/proto/ShortAbilityHashPair.proto +++ b/proto/ShortAbilityHashPair.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message ShortAbilityHashPair { int32 ability_name_hash = 1; int32 ability_config_hash = 2; diff --git a/proto/ShowAvatarInfo.proto b/proto/ShowAvatarInfo.proto index 61be51d8..b6188c41 100644 --- a/proto/ShowAvatarInfo.proto +++ b/proto/ShowAvatarInfo.proto @@ -2,8 +2,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "AvatarFetterInfo.proto"; import "AvatarExcelInfo.proto"; +import "AvatarFetterInfo.proto"; import "PropValue.proto"; import "ShowEquip.proto"; diff --git a/proto/ShowEquip.proto b/proto/ShowEquip.proto index a35882de..29807b7a 100644 --- a/proto/ShowEquip.proto +++ b/proto/ShowEquip.proto @@ -6,9 +6,9 @@ import "Reliquary.proto"; import "Weapon.proto"; message ShowEquip { - oneof Detail { + uint32 item_id = 1; + oneof detail { Reliquary reliquary = 2; Weapon weapon = 3; } - uint32 item_id = 1; } diff --git a/proto/SocialDetail.proto b/proto/SocialDetail.proto index 0d8752c9..875ac7ed 100644 --- a/proto/SocialDetail.proto +++ b/proto/SocialDetail.proto @@ -3,8 +3,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "Birthday.proto"; -import "FriendOnlineState.proto"; import "FriendEnterHomeOption.proto"; +import "FriendOnlineState.proto"; import "ProfilePicture.proto"; import "SocialShowAvatarInfo.proto"; diff --git a/proto/SocialShowAvatarInfo.proto b/proto/SocialShowAvatarInfo.proto index c682d366..6e69bb8e 100644 --- a/proto/SocialShowAvatarInfo.proto +++ b/proto/SocialShowAvatarInfo.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message SocialShowAvatarInfo { uint32 avatar_id = 1; uint32 level = 2; diff --git a/proto/StoreItemChangeNotify.proto b/proto/StoreItemChangeNotify.proto index c76d0ef7..5644b71f 100644 --- a/proto/StoreItemChangeNotify.proto +++ b/proto/StoreItemChangeNotify.proto @@ -2,18 +2,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "StoreType.proto"; import "Item.proto"; +import "StoreType.proto"; +// CmdId: 641 +// EnetChannelId: 0 +// EnetIsReliable: true message StoreItemChangeNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 689; - } - - StoreType store_type = 1; - repeated Item item_list = 2; + StoreType store_type = 9; + repeated Item item_list = 3; } diff --git a/proto/StoreItemDelNotify.proto b/proto/StoreItemDelNotify.proto index bf9f2326..40af0508 100644 --- a/proto/StoreItemDelNotify.proto +++ b/proto/StoreItemDelNotify.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "StoreType.proto"; +// CmdId: 637 +// EnetChannelId: 0 +// EnetIsReliable: true message StoreItemDelNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 684; - } - - StoreType store_type = 1; - repeated uint64 guid_list = 2; + StoreType store_type = 14; + repeated uint64 guid_list = 10; } diff --git a/proto/StoreType.proto b/proto/StoreType.proto index 91163c52..29108515 100644 --- a/proto/StoreType.proto +++ b/proto/StoreType.proto @@ -3,7 +3,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum StoreType { - STORE_NONE = 0; - STORE_PACK = 1; - STORE_DEPOT = 2; + STORE_TYPE_NONE = 0; + STORE_TYPE_PACK = 1; + STORE_TYPE_DEPOT = 2; } diff --git a/proto/StoreWeightLimitNotify.proto b/proto/StoreWeightLimitNotify.proto index 24e58560..097f6ee0 100644 --- a/proto/StoreWeightLimitNotify.proto +++ b/proto/StoreWeightLimitNotify.proto @@ -4,19 +4,14 @@ option java_package = "emu.grasscutter.net.proto"; import "StoreType.proto"; +// CmdId: 631 +// EnetChannelId: 0 +// EnetIsReliable: true message StoreWeightLimitNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 618; - } - - StoreType store_type = 1; - uint32 weight_limit = 3; - uint32 material_count_limit = 4; + StoreType store_type = 4; + uint32 weight_limit = 2; + uint32 material_count_limit = 1; uint32 weapon_count_limit = 5; uint32 reliquary_count_limit = 6; - uint32 furniture_count_limit = 7; + uint32 furniture_count_limit = 8; } diff --git a/proto/SyncScenePlayTeamEntityNotify.proto b/proto/SyncScenePlayTeamEntityNotify.proto index e14237da..5e48cb64 100644 --- a/proto/SyncScenePlayTeamEntityNotify.proto +++ b/proto/SyncScenePlayTeamEntityNotify.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "PlayTeamEntityInfo.proto"; +// CmdId: 3096 +// EnetChannelId: 0 +// EnetIsReliable: true message SyncScenePlayTeamEntityNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 3375; - } - - uint32 scene_id = 1; + uint32 scene_id = 13; repeated PlayTeamEntityInfo entity_info_list = 2; } diff --git a/proto/SyncTeamEntityNotify.proto b/proto/SyncTeamEntityNotify.proto index e4152517..ca32092b 100644 --- a/proto/SyncTeamEntityNotify.proto +++ b/proto/SyncTeamEntityNotify.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "TeamEntityInfo.proto"; +// CmdId: 334 +// EnetChannelId: 0 +// EnetIsReliable: true message SyncTeamEntityNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 308; - } - - uint32 scene_id = 1; + uint32 scene_id = 13; repeated TeamEntityInfo team_entity_info_list = 2; } diff --git a/proto/TakeAchievementRewardReq.proto b/proto/TakeAchievementRewardReq.proto index 64ac2d3a..1534895b 100644 --- a/proto/TakeAchievementRewardReq.proto +++ b/proto/TakeAchievementRewardReq.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "AchievementInfo.proto"; +// CmdId: 2693 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message TakeAchievementRewardReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 2677; - } - - repeated AchievementInfo a_list = 1; + repeated uint32 id_list = 2; } diff --git a/proto/TakeBattlePassMissionPointReq.proto b/proto/TakeBattlePassMissionPointReq.proto new file mode 100644 index 00000000..b0bba957 --- /dev/null +++ b/proto/TakeBattlePassMissionPointReq.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 2626 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message TakeBattlePassMissionPointReq { + repeated uint32 mission_id_list = 7; +} diff --git a/proto/TakeBattlePassMissionPointRsp.proto b/proto/TakeBattlePassMissionPointRsp.proto new file mode 100644 index 00000000..bd6fa87e --- /dev/null +++ b/proto/TakeBattlePassMissionPointRsp.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 2647 +// EnetChannelId: 0 +// EnetIsReliable: true +message TakeBattlePassMissionPointRsp { + int32 retcode = 12; + repeated uint32 mission_id_list = 2; +} diff --git a/proto/TakeBattlePassRewardReq.proto b/proto/TakeBattlePassRewardReq.proto new file mode 100644 index 00000000..3da3c006 --- /dev/null +++ b/proto/TakeBattlePassRewardReq.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "BattlePassRewardTakeOption.proto"; + +// CmdId: 2628 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message TakeBattlePassRewardReq { + repeated BattlePassRewardTakeOption take_option_list = 4; +} diff --git a/proto/TakeBattlePassRewardRsp.proto b/proto/TakeBattlePassRewardRsp.proto new file mode 100644 index 00000000..e4eb03db --- /dev/null +++ b/proto/TakeBattlePassRewardRsp.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "BattlePassRewardTakeOption.proto"; +import "ItemParam.proto"; + +// CmdId: 2603 +// EnetChannelId: 0 +// EnetIsReliable: true +message TakeBattlePassRewardRsp { + int32 retcode = 2; + repeated BattlePassRewardTakeOption take_option_list = 1; + repeated ItemParam item_list = 5; +} diff --git a/proto/TakeFurnitureMakeReq.proto b/proto/TakeFurnitureMakeReq.proto new file mode 100644 index 00000000..d2f8b05f --- /dev/null +++ b/proto/TakeFurnitureMakeReq.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 4768 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message TakeFurnitureMakeReq { + uint32 index = 9; + uint32 make_id = 4; + bool is_fast_finish = 2; +} diff --git a/proto/TakeFurnitureMakeRsp.proto b/proto/TakeFurnitureMakeRsp.proto new file mode 100644 index 00000000..4c33aeb3 --- /dev/null +++ b/proto/TakeFurnitureMakeRsp.proto @@ -0,0 +1,17 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "FurnitureMakeSlot.proto"; +import "ItemParam.proto"; + +// CmdId: 4599 +// EnetChannelId: 0 +// EnetIsReliable: true +message TakeFurnitureMakeRsp { + int32 retcode = 9; + uint32 make_id = 2; + FurnitureMakeSlot furniture_make_slot = 15; + repeated ItemParam output_item_list = 10; + repeated ItemParam return_item_list = 5; +} diff --git a/proto/TakePlayerLevelRewardReq.proto b/proto/TakePlayerLevelRewardReq.proto index fbaa3c1b..e5483d66 100644 --- a/proto/TakePlayerLevelRewardReq.proto +++ b/proto/TakePlayerLevelRewardReq.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 160 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message TakePlayerLevelRewardReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 173; - } - - uint32 level = 1; + uint32 level = 5; } diff --git a/proto/TakePlayerLevelRewardRsp.proto b/proto/TakePlayerLevelRewardRsp.proto index ec1944c2..d6afc7f5 100644 --- a/proto/TakePlayerLevelRewardRsp.proto +++ b/proto/TakePlayerLevelRewardRsp.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 177 +// EnetChannelId: 0 +// EnetIsReliable: true message TakePlayerLevelRewardRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 102; - } - - int32 retcode = 1; - uint32 level = 2; - uint32 reward_id = 3; + int32 retcode = 14; + uint32 level = 13; + uint32 reward_id = 12; } diff --git a/proto/TakeoffEquipReq.proto b/proto/TakeoffEquipReq.proto index e956faee..3275c5fe 100644 --- a/proto/TakeoffEquipReq.proto +++ b/proto/TakeoffEquipReq.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 698 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message TakeoffEquipReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 619; - } - - uint64 avatar_guid = 1; - uint32 slot = 2; + uint64 avatar_guid = 15; + uint32 slot = 9; } diff --git a/proto/TakeoffEquipRsp.proto b/proto/TakeoffEquipRsp.proto index db6dceda..834a6fe3 100644 --- a/proto/TakeoffEquipRsp.proto +++ b/proto/TakeoffEquipRsp.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 645 +// EnetChannelId: 0 +// EnetIsReliable: true message TakeoffEquipRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 614; - } - - int32 retcode = 1; - uint64 avatar_guid = 2; - uint32 slot = 3; + int32 retcode = 8; + uint64 avatar_guid = 3; + uint32 slot = 4; } diff --git a/proto/TeamEnterSceneInfo.proto b/proto/TeamEnterSceneInfo.proto index b6adbe8c..3d26987b 100644 --- a/proto/TeamEnterSceneInfo.proto +++ b/proto/TeamEnterSceneInfo.proto @@ -2,8 +2,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "AbilitySyncStateInfo.proto"; import "AbilityControlBlock.proto"; +import "AbilitySyncStateInfo.proto"; message TeamEnterSceneInfo { uint32 team_entity_id = 1; diff --git a/proto/TeamResonanceChangeNotify.proto b/proto/TeamResonanceChangeNotify.proto index fe8e8b4e..fbebbed8 100644 --- a/proto/TeamResonanceChangeNotify.proto +++ b/proto/TeamResonanceChangeNotify.proto @@ -4,14 +4,9 @@ option java_package = "emu.grasscutter.net.proto"; import "AvatarTeamResonanceInfo.proto"; +// CmdId: 1045 +// EnetChannelId: 0 +// EnetIsReliable: true message TeamResonanceChangeNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1014; - } - - repeated AvatarTeamResonanceInfo info_list = 1; + repeated AvatarTeamResonanceInfo info_list = 15; } diff --git a/proto/TowerAllDataRsp.proto b/proto/TowerAllDataRsp.proto index e99d6287..414084f6 100644 --- a/proto/TowerAllDataRsp.proto +++ b/proto/TowerAllDataRsp.proto @@ -3,33 +3,28 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "TowerCurLevelRecord.proto"; -import "TowerMonthlyBrief.proto"; import "TowerFloorRecord.proto"; +import "TowerMonthlyBrief.proto"; +// CmdId: 2449 +// EnetChannelId: 0 +// EnetIsReliable: true message TowerAllDataRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 2461; - } - - uint32 tower_schedule_id = 1; - repeated TowerFloorRecord tower_floor_record_list = 2; - uint32 daily_floor_id = 3; - uint32 daily_level_index = 4; - TowerCurLevelRecord cur_level_record = 5; - uint32 next_schedule_change_time = 6; - map floor_open_time_map = 7; - bool is_first_interact = 8; - TowerMonthlyBrief monthly_brief = 9; - uint32 skip_to_floor_index = 10; - uint32 commemorative_reward_id = 11; - map skip_floor_granted_reward_item_map = 12; - uint32 valid_tower_record_num = 13; - int32 retcode = 14; - bool is_finished_entrance_floor = 15; - uint32 schedule_start_time = 16; - TowerMonthlyBrief last_schedule_monthly_brief = 17; + uint32 tower_schedule_id = 13; + repeated TowerFloorRecord tower_floor_record_list = 12; + uint32 daily_floor_id = 9; + uint32 daily_level_index = 6; + TowerCurLevelRecord cur_level_record = 2; + uint32 next_schedule_change_time = 8; + map floor_open_time_map = 11; + bool is_first_interact = 14; + TowerMonthlyBrief monthly_brief = 1; + uint32 skip_to_floor_index = 3; + uint32 commemorative_reward_id = 15; + map skip_floor_granted_reward_item_map = 5; + uint32 valid_tower_record_num = 10; + int32 retcode = 4; + bool is_finished_entrance_floor = 7; + uint32 schedule_start_time = 490; + TowerMonthlyBrief last_schedule_monthly_brief = 395; } diff --git a/proto/TowerBuffSelectReq.proto b/proto/TowerBuffSelectReq.proto index 1641b350..3ecd6984 100644 --- a/proto/TowerBuffSelectReq.proto +++ b/proto/TowerBuffSelectReq.proto @@ -2,15 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 2407 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message TowerBuffSelectReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 2424; - } - - uint32 tower_buff_id = 1; + uint32 tower_buff_id = 2; } diff --git a/proto/TowerBuffSelectRsp.proto b/proto/TowerBuffSelectRsp.proto index 7a32a8e1..a2f6e4b7 100644 --- a/proto/TowerBuffSelectRsp.proto +++ b/proto/TowerBuffSelectRsp.proto @@ -2,15 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 2430 +// EnetChannelId: 0 +// EnetIsReliable: true message TowerBuffSelectRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 2491; - } - - int32 retcode = 1; - uint32 tower_buff_id = 2; + int32 retcode = 15; + uint32 tower_buff_id = 6; } diff --git a/proto/TowerCurLevelRecord.proto b/proto/TowerCurLevelRecord.proto index bfd4a84a..42b3701b 100644 --- a/proto/TowerCurLevelRecord.proto +++ b/proto/TowerCurLevelRecord.proto @@ -10,4 +10,5 @@ message TowerCurLevelRecord { repeated TowerTeam tower_team_list = 3; repeated uint32 buff_id_list = 4; bool is_empty = 5; + bool MPLIGMAKFAM = 6; } diff --git a/proto/TowerCurLevelRecordChangeNotify.proto b/proto/TowerCurLevelRecordChangeNotify.proto index fd9f94c9..997ec674 100644 --- a/proto/TowerCurLevelRecordChangeNotify.proto +++ b/proto/TowerCurLevelRecordChangeNotify.proto @@ -4,14 +4,9 @@ option java_package = "emu.grasscutter.net.proto"; import "TowerCurLevelRecord.proto"; +// CmdId: 2441 +// EnetChannelId: 0 +// EnetIsReliable: true message TowerCurLevelRecordChangeNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 2489; - } - - TowerCurLevelRecord cur_level_record = 1; + TowerCurLevelRecord cur_level_record = 10; } diff --git a/proto/TowerEnterLevelReq.proto b/proto/TowerEnterLevelReq.proto index 551f4772..8334a01e 100644 --- a/proto/TowerEnterLevelReq.proto +++ b/proto/TowerEnterLevelReq.proto @@ -2,15 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 2455 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message TowerEnterLevelReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 2412; - } - - uint32 enter_point_id = 1; + uint32 enter_point_id = 4; } diff --git a/proto/TowerEnterLevelRsp.proto b/proto/TowerEnterLevelRsp.proto index fbcc4067..255e2efe 100644 --- a/proto/TowerEnterLevelRsp.proto +++ b/proto/TowerEnterLevelRsp.proto @@ -2,17 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 2427 +// EnetChannelId: 0 +// EnetIsReliable: true message TowerEnterLevelRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 2426; - } - - int32 retcode = 1; - uint32 floor_id = 2; - uint32 level_index = 3; - repeated uint32 tower_buff_id_list = 4; + int32 retcode = 14; + uint32 floor_id = 6; + uint32 level_index = 8; + repeated uint32 tower_buff_id_list = 7; } diff --git a/proto/TowerFloorRecordChangeNotify.proto b/proto/TowerFloorRecordChangeNotify.proto index 74a7135e..9d8d600d 100644 --- a/proto/TowerFloorRecordChangeNotify.proto +++ b/proto/TowerFloorRecordChangeNotify.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "TowerFloorRecord.proto"; +// CmdId: 2431 +// EnetChannelId: 0 +// EnetIsReliable: true message TowerFloorRecordChangeNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 2418; - } - - repeated TowerFloorRecord tower_floor_record_list = 1; - bool is_finished_entrance_floor = 2; + repeated TowerFloorRecord tower_floor_record_list = 9; + bool is_finished_entrance_floor = 1; } diff --git a/proto/TowerLevelEndNotify.proto b/proto/TowerLevelEndNotify.proto index d9f2da54..36db9969 100644 --- a/proto/TowerLevelEndNotify.proto +++ b/proto/TowerLevelEndNotify.proto @@ -1,26 +1,22 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "ItemParam.proto"; +// CmdId: 2442 +// EnetChannelId: 0 +// EnetIsReliable: true message TowerLevelEndNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 2456; - } + bool is_success = 14; + repeated uint32 finished_star_cond_list = 1; + repeated ItemParam reward_item_list = 9; + uint32 continue_state = 2; + uint32 next_floor_id = 8; enum ContinueStateType { - CONTINUE_STATE_CAN_NOT_CONTINUE = 0; - CONTINUE_STATE_CAN_ENTER_NEXT_LEVEL = 1; - CONTINUE_STATE_CAN_ENTER_NEXT_FLOOR = 2; + CONTINUE_STATE_TYPE_CAN_NOT_CONTINUE = 0; + CONTINUE_STATE_TYPE_CAN_ENTER_NEXT_LEVEL = 1; + CONTINUE_STATE_TYPE_CAN_ENTER_NEXT_FLOOR = 2; } - - bool is_success = 1; - repeated uint32 finished_star_cond_list = 2; - repeated ItemParam reward_item_list = 3; - uint32 continue_state = 4; - uint32 next_floor_id = 5; } diff --git a/proto/TowerLevelRecord.proto b/proto/TowerLevelRecord.proto index 30dbed4b..9546f072 100644 --- a/proto/TowerLevelRecord.proto +++ b/proto/TowerLevelRecord.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message TowerLevelRecord { uint32 level_id = 1; repeated uint32 satisfied_cond_list = 2; diff --git a/proto/TowerLevelStarCondData.proto b/proto/TowerLevelStarCondData.proto index d4633442..d2fb51a8 100644 --- a/proto/TowerLevelStarCondData.proto +++ b/proto/TowerLevelStarCondData.proto @@ -6,4 +6,5 @@ message TowerLevelStarCondData { uint32 star_cond_index = 3; uint32 cond_value = 4; bool is_pause = 5; + bool OAFMGGMJPIL = 6; } diff --git a/proto/TowerLevelStarCondNotify.proto b/proto/TowerLevelStarCondNotify.proto index e605496f..a0b9b14c 100644 --- a/proto/TowerLevelStarCondNotify.proto +++ b/proto/TowerLevelStarCondNotify.proto @@ -4,16 +4,11 @@ option java_package = "emu.grasscutter.net.proto"; import "TowerLevelStarCondData.proto"; +// CmdId: 2401 +// EnetChannelId: 0 +// EnetIsReliable: true message TowerLevelStarCondNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 2492; - } - - uint32 floor_id = 1; - uint32 level_index = 2; - repeated TowerLevelStarCondData cond_data_list = 3; + uint32 floor_id = 3; + uint32 level_index = 6; + repeated TowerLevelStarCondData cond_data_list = 12; } diff --git a/proto/TowerMiddleLevelChangeTeamNotify.proto b/proto/TowerMiddleLevelChangeTeamNotify.proto index 35f2685e..21ff9f38 100644 --- a/proto/TowerMiddleLevelChangeTeamNotify.proto +++ b/proto/TowerMiddleLevelChangeTeamNotify.proto @@ -2,13 +2,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 2411 +// EnetChannelId: 0 +// EnetIsReliable: true message TowerMiddleLevelChangeTeamNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 2417; - } - } diff --git a/proto/TowerMonthlyBrief.proto b/proto/TowerMonthlyBrief.proto index fecf3aeb..bc3b48cc 100644 --- a/proto/TowerMonthlyBrief.proto +++ b/proto/TowerMonthlyBrief.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message TowerMonthlyBrief { uint32 tower_schedule_id = 1; uint32 best_floor_index = 2; diff --git a/proto/TowerTeam.proto b/proto/TowerTeam.proto index 374c5931..295b403b 100644 --- a/proto/TowerTeam.proto +++ b/proto/TowerTeam.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message TowerTeam { uint32 tower_team_id = 1; repeated uint64 avatar_guid_list = 2; diff --git a/proto/TowerTeamSelectReq.proto b/proto/TowerTeamSelectReq.proto index 90396806..1f9fd18e 100644 --- a/proto/TowerTeamSelectReq.proto +++ b/proto/TowerTeamSelectReq.proto @@ -4,16 +4,11 @@ option java_package = "emu.grasscutter.net.proto"; import "TowerTeam.proto"; +// CmdId: 2417 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message TowerTeamSelectReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 2401; - } - - uint32 floor_id = 1; + uint32 floor_id = 15; repeated TowerTeam tower_team_list = 2; } diff --git a/proto/TowerTeamSelectRsp.proto b/proto/TowerTeamSelectRsp.proto index b135e536..3bfab9df 100644 --- a/proto/TowerTeamSelectRsp.proto +++ b/proto/TowerTeamSelectRsp.proto @@ -2,14 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 2485 +// EnetChannelId: 0 +// EnetIsReliable: true message TowerTeamSelectRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 2494; - } - int32 retcode = 1; } diff --git a/proto/TrackingIOInfo.proto b/proto/TrackingIOInfo.proto index 976185e8..b5ddcd55 100644 --- a/proto/TrackingIOInfo.proto +++ b/proto/TrackingIOInfo.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message TrackingIOInfo { string appid = 1; string deviceid = 2; diff --git a/proto/TrialAvatarFirstPassDungeonNotify.proto b/proto/TrialAvatarFirstPassDungeonNotify.proto new file mode 100644 index 00000000..ba873752 --- /dev/null +++ b/proto/TrialAvatarFirstPassDungeonNotify.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 2137 +// EnetChannelId: 0 +// EnetIsReliable: true +message TrialAvatarFirstPassDungeonNotify { + uint32 trial_avatar_index_id = 2; +} diff --git a/proto/TrialAvatarGrantRecord.proto b/proto/TrialAvatarGrantRecord.proto index fbfe446c..dad252e1 100644 --- a/proto/TrialAvatarGrantRecord.proto +++ b/proto/TrialAvatarGrantRecord.proto @@ -2,17 +2,19 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message TrialAvatarGrantRecord { - enum GrantReason { - INVALID = 0; - GRANT_BY_QUEST = 1; - GRANT_BY_TRIAL_AVATAR_ACTIVITY = 2; - GRANT_BY_DUNGEON_ELEMENT_CHALLENGE = 3; - GRANT_BY_MIST_TRIAL_ACTIVITY = 4; - GRANT_BY_SUMO_ACTIVITY = 5; - } - uint32 grant_reason = 1; uint32 from_parent_quest_id = 2; + + enum GrantReason { + GRANT_REASON_INVALID = 0; + GRANT_REASON_BY_QUEST = 1; + GRANT_REASON_BY_TRIAL_AVATAR_ACTIVITY = 2; + GRANT_REASON_BY_DUNGEON_ELEMENT_CHALLENGE = 3; + GRANT_REASON_BY_MIST_TRIAL_ACTIVITY = 4; + GRANT_REASON_BY_SUMO_ACTIVITY = 5; + GRANT_REASON_ELPMDIEIOHP = 6; + GRANT_REASON_FALPDBLGHJB = 7; + GRANT_REASON_GAMADMGGMBC = 8; + } } diff --git a/proto/TrialAvatarInfo.proto b/proto/TrialAvatarInfo.proto index d72fec87..1c17e904 100644 --- a/proto/TrialAvatarInfo.proto +++ b/proto/TrialAvatarInfo.proto @@ -2,8 +2,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "TrialAvatarGrantRecord.proto"; import "Item.proto"; +import "TrialAvatarGrantRecord.proto"; message TrialAvatarInfo { uint32 trial_avatar_id = 1; diff --git a/proto/TryEnterHomeReq.proto b/proto/TryEnterHomeReq.proto index 22078789..d1563a13 100644 --- a/proto/TryEnterHomeReq.proto +++ b/proto/TryEnterHomeReq.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4553 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message TryEnterHomeReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4792; - } - - uint32 target_uid = 1; - uint32 target_point = 2; -} \ No newline at end of file + uint32 target_uid = 10; + uint32 target_point = 13; +} diff --git a/proto/TryEnterHomeRsp.proto b/proto/TryEnterHomeRsp.proto index a1e1f8c2..74da867c 100644 --- a/proto/TryEnterHomeRsp.proto +++ b/proto/TryEnterHomeRsp.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4610 +// EnetChannelId: 0 +// EnetIsReliable: true message TryEnterHomeRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4690; - } - - int32 retcode = 1; - uint32 target_uid = 2; - repeated uint32 param_list = 3; -} \ No newline at end of file + int32 retcode = 12; + uint32 target_uid = 2; + repeated uint32 param_list = 11; +} diff --git a/proto/UnionCmd.proto b/proto/UnionCmd.proto index 5483633b..7d7adea1 100644 --- a/proto/UnionCmd.proto +++ b/proto/UnionCmd.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message UnionCmd { uint32 message_id = 1; bytes body = 2; diff --git a/proto/UnionCmdNotify.proto b/proto/UnionCmdNotify.proto index 6dc0437b..0f10f1fc 100644 --- a/proto/UnionCmdNotify.proto +++ b/proto/UnionCmdNotify.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "UnionCmd.proto"; +// CmdId: 98 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message UnionCmdNotify { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 19; - } - - repeated UnionCmd cmd_list = 1; + repeated UnionCmd cmd_list = 13; } diff --git a/proto/UnlockAvatarTalentReq.proto b/proto/UnlockAvatarTalentReq.proto index b7dd1bed..8eb49c97 100644 --- a/proto/UnlockAvatarTalentReq.proto +++ b/proto/UnlockAvatarTalentReq.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1009 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message UnlockAvatarTalentReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 1049; - } - - uint64 avatar_guid = 1; - uint32 talent_id = 2; + uint64 avatar_guid = 13; + uint32 talent_id = 9; } diff --git a/proto/UnlockAvatarTalentRsp.proto b/proto/UnlockAvatarTalentRsp.proto index 5bbfe415..81cd6f02 100644 --- a/proto/UnlockAvatarTalentRsp.proto +++ b/proto/UnlockAvatarTalentRsp.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 1031 +// EnetChannelId: 0 +// EnetIsReliable: true message UnlockAvatarTalentRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 1018; - } - - int32 retcode = 1; - uint64 avatar_guid = 2; - uint32 talent_id = 3; + int32 retcode = 2; + uint64 avatar_guid = 14; + uint32 talent_id = 12; } diff --git a/proto/UnlockNameCardNotify.proto b/proto/UnlockNameCardNotify.proto index d423d6fa..e8475c0d 100644 --- a/proto/UnlockNameCardNotify.proto +++ b/proto/UnlockNameCardNotify.proto @@ -2,15 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4001 +// EnetChannelId: 0 +// EnetIsReliable: true message UnlockNameCardNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4092; - } - - uint32 name_card_id = 1; + uint32 name_card_id = 14; } diff --git a/proto/UnlockPersonalLineReq.proto b/proto/UnlockPersonalLineReq.proto new file mode 100644 index 00000000..582d5dc9 --- /dev/null +++ b/proto/UnlockPersonalLineReq.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 476 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true +message UnlockPersonalLineReq { + uint32 personal_line_id = 8; +} diff --git a/proto/UnlockPersonalLineRsp.proto b/proto/UnlockPersonalLineRsp.proto new file mode 100644 index 00000000..bddeb520 --- /dev/null +++ b/proto/UnlockPersonalLineRsp.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 472 +// EnetChannelId: 0 +// EnetIsReliable: true +message UnlockPersonalLineRsp { + int32 retcode = 7; + uint32 personal_line_id = 8; + oneof param { + uint32 level = 1; + uint32 chapter_id = 15; + } +} diff --git a/proto/UnlockedFurnitureFormulaDataNotify.proto b/proto/UnlockedFurnitureFormulaDataNotify.proto new file mode 100644 index 00000000..08236793 --- /dev/null +++ b/proto/UnlockedFurnitureFormulaDataNotify.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 4680 +// EnetChannelId: 0 +// EnetIsReliable: true +message UnlockedFurnitureFormulaDataNotify { + bool is_all = 14; + repeated uint32 furniture_id_list = 7; +} diff --git a/proto/UnlockedFurnitureSuiteDataNotify.proto b/proto/UnlockedFurnitureSuiteDataNotify.proto new file mode 100644 index 00000000..dc0667c0 --- /dev/null +++ b/proto/UnlockedFurnitureSuiteDataNotify.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +// CmdId: 4717 +// EnetChannelId: 0 +// EnetIsReliable: true +message UnlockedFurnitureSuiteDataNotify { + bool is_all = 10; + repeated uint32 furniture_suite_id_list = 15; +} diff --git a/proto/UpdatePlayerShowAvatarListReq.proto b/proto/UpdatePlayerShowAvatarListReq.proto index ec33c404..0f82b78e 100644 --- a/proto/UpdatePlayerShowAvatarListReq.proto +++ b/proto/UpdatePlayerShowAvatarListReq.proto @@ -2,16 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 4025 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message UpdatePlayerShowAvatarListReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4093; - } - - repeated uint32 show_avatar_id_list = 1; + repeated uint32 show_avatar_id_list = 13; bool is_show_avatar = 2; } diff --git a/proto/UpdatePlayerShowAvatarListRsp.proto b/proto/UpdatePlayerShowAvatarListRsp.proto index e9d60ff2..20d9f0f1 100644 --- a/proto/UpdatePlayerShowAvatarListRsp.proto +++ b/proto/UpdatePlayerShowAvatarListRsp.proto @@ -2,16 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 4083 +// EnetChannelId: 0 +// EnetIsReliable: true message UpdatePlayerShowAvatarListRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4053; - } - - int32 retcode = 1; - repeated uint32 show_avatar_id_list = 2; - bool is_show_avatar = 3; + int32 retcode = 2; + repeated uint32 show_avatar_id_list = 1; + bool is_show_avatar = 8; } diff --git a/proto/UseItemReq.proto b/proto/UseItemReq.proto index 27ab7483..52754385 100644 --- a/proto/UseItemReq.proto +++ b/proto/UseItemReq.proto @@ -2,20 +2,14 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 635 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message UseItemReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 642; - } - uint64 guid = 1; - uint32 count = 2; - uint64 target_guid = 3; - uint32 option_idx = 4; - bool is_enter_mp_dungeon_team = 5; + uint32 count = 12; + uint64 target_guid = 14; + uint32 option_idx = 10; + bool is_enter_mp_dungeon_team = 3; } diff --git a/proto/UseItemRsp.proto b/proto/UseItemRsp.proto index de693da2..9a9b34b6 100644 --- a/proto/UseItemRsp.proto +++ b/proto/UseItemRsp.proto @@ -2,19 +2,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 649 +// EnetChannelId: 0 +// EnetIsReliable: true message UseItemRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 661; - } - - int32 retcode = 1; - uint64 guid = 2; - uint32 item_id = 3; - uint64 target_guid = 4; - uint32 option_idx = 5; + int32 retcode = 15; + uint64 guid = 8; + uint32 item_id = 11; + uint64 target_guid = 12; + uint32 option_idx = 13; } diff --git a/proto/UseWidgetCreateGadgetReq.proto b/proto/UseWidgetCreateGadgetReq.proto index 4acc7696..a8a7732c 100644 --- a/proto/UseWidgetCreateGadgetReq.proto +++ b/proto/UseWidgetCreateGadgetReq.proto @@ -4,17 +4,12 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; +// CmdId: 4283 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message UseWidgetCreateGadgetReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4276; - } - uint32 material_id = 1; - Vector pos = 2; - Vector rot = 3; + Vector pos = 10; + Vector rot = 4; } diff --git a/proto/UseWidgetCreateGadgetRsp.proto b/proto/UseWidgetCreateGadgetRsp.proto index 74c86f42..50c66b51 100644 --- a/proto/UseWidgetCreateGadgetRsp.proto +++ b/proto/UseWidgetCreateGadgetRsp.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4279 +// EnetChannelId: 0 +// EnetIsReliable: true message UseWidgetCreateGadgetRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4270; - } - - int32 retcode = 1; + int32 retcode = 13; uint32 material_id = 2; } diff --git a/proto/UseWidgetRetractGadgetReq.proto b/proto/UseWidgetRetractGadgetReq.proto index e7144ee7..3bcc7cec 100644 --- a/proto/UseWidgetRetractGadgetReq.proto +++ b/proto/UseWidgetRetractGadgetReq.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4290 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message UseWidgetRetractGadgetReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4273; - } - - uint32 entity_id = 1; + uint32 entity_id = 7; } diff --git a/proto/UseWidgetRetractGadgetRsp.proto b/proto/UseWidgetRetractGadgetRsp.proto index 4bf69bbc..a64cf767 100644 --- a/proto/UseWidgetRetractGadgetRsp.proto +++ b/proto/UseWidgetRetractGadgetRsp.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4271 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message UseWidgetRetractGadgetRsp { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4266; - } - - int32 retcode = 1; - uint32 entity_id = 2; + int32 retcode = 9; + uint32 entity_id = 15; } diff --git a/proto/Vector.proto b/proto/Vector.proto index 0c055427..96766012 100644 --- a/proto/Vector.proto +++ b/proto/Vector.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message Vector { float X = 1; float Y = 2; diff --git a/proto/Vector3Int.proto b/proto/Vector3Int.proto new file mode 100644 index 00000000..1cd44230 --- /dev/null +++ b/proto/Vector3Int.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message Vector3Int { + int32 x = 1; + int32 y = 2; + int32 z = 3; +} diff --git a/proto/VehicleInteractReq.proto b/proto/VehicleInteractReq.proto index c94bfcf6..fdbb5b85 100644 --- a/proto/VehicleInteractReq.proto +++ b/proto/VehicleInteractReq.proto @@ -4,8 +4,12 @@ option java_package = "emu.grasscutter.net.proto"; import "VehicleInteractType.proto"; +// CmdId: 838 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message VehicleInteractReq { - uint32 entity_id = 1; - VehicleInteractType interact_type = 2; - uint32 pos = 3; + uint32 entity_id = 8; + VehicleInteractType interact_type = 3; + uint32 pos = 10; } diff --git a/proto/VehicleInteractRsp.proto b/proto/VehicleInteractRsp.proto index 62c3a040..a8107fbd 100644 --- a/proto/VehicleInteractRsp.proto +++ b/proto/VehicleInteractRsp.proto @@ -5,9 +5,12 @@ option java_package = "emu.grasscutter.net.proto"; import "VehicleInteractType.proto"; import "VehicleMember.proto"; +// CmdId: 806 +// EnetChannelId: 0 +// EnetIsReliable: true message VehicleInteractRsp { - int32 retcode = 1; - uint32 entity_id = 2; + int32 retcode = 15; + uint32 entity_id = 14; VehicleInteractType interact_type = 3; - VehicleMember member = 4; + VehicleMember member = 1; } diff --git a/proto/VehicleInteractType.proto b/proto/VehicleInteractType.proto index f7e10b6f..d2e1b310 100644 --- a/proto/VehicleInteractType.proto +++ b/proto/VehicleInteractType.proto @@ -3,7 +3,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum VehicleInteractType { - VEHICLE_INTERACT_NONE = 0; - VEHICLE_INTERACT_IN = 1; - VEHICLE_INTERACT_OUT = 2; + VEHICLE_INTERACT_TYPE_NONE = 0; + VEHICLE_INTERACT_TYPE_IN = 1; + VEHICLE_INTERACT_TYPE_OUT = 2; } diff --git a/proto/VehicleStaminaNotify.proto b/proto/VehicleStaminaNotify.proto index 390174f4..140efb80 100644 --- a/proto/VehicleStaminaNotify.proto +++ b/proto/VehicleStaminaNotify.proto @@ -2,7 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 811 +// EnetChannelId: 0 +// EnetIsReliable: true message VehicleStaminaNotify { - uint32 entity_id = 1; - float cur_stamina = 2; + uint32 entity_id = 8; + float cur_stamina = 4; } diff --git a/proto/VisionType.proto b/proto/VisionType.proto index 444584c1..fc2a6a39 100644 --- a/proto/VisionType.proto +++ b/proto/VisionType.proto @@ -3,23 +3,24 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum VisionType { - VISION_NONE = 0; - VISION_MEET = 1; - VISION_REBORN = 2; - VISION_REPLACE = 3; - VISION_WAYPOINT_REBORN = 4; - VISION_MISS = 5; - VISION_DIE = 6; - VISION_GATHER_ESCAPE = 7; - VISION_REFRESH = 8; - VISION_TRANSPORT = 9; - VISION_REPLACE_DIE = 10; - VISION_REPLACE_NO_NOTIFY = 11; - VISION_BORN = 12; - VISION_PICKUP = 13; - VISION_REMOVE = 14; - VISION_CHANGE_COSTUME = 15; - VISION_FISH_REFRESH = 16; - VISION_FISH_BIG_SHOCK = 17; - VISION_FISH_QTE_SUCC = 18; + VISION_TYPE_NONE = 0; + VISION_TYPE_MEET = 1; + VISION_TYPE_REBORN = 2; + VISION_TYPE_REPLACE = 3; + VISION_TYPE_WAYPOINT_REBORN = 4; + VISION_TYPE_MISS = 5; + VISION_TYPE_DIE = 6; + VISION_TYPE_GATHER_ESCAPE = 7; + VISION_TYPE_REFRESH = 8; + VISION_TYPE_TRANSPORT = 9; + VISION_TYPE_REPLACE_DIE = 10; + VISION_TYPE_REPLACE_NO_NOTIFY = 11; + VISION_TYPE_BORN = 12; + VISION_TYPE_PICKUP = 13; + VISION_TYPE_REMOVE = 14; + VISION_TYPE_CHANGE_COSTUME = 15; + VISION_TYPE_FISH_REFRESH = 16; + VISION_TYPE_FISH_BIG_SHOCK = 17; + VISION_TYPE_FISH_QTE_SUCC = 18; + VISION_TYPE_EPFKMOIPADB = 19; } diff --git a/proto/Weapon.proto b/proto/Weapon.proto index aedbbf87..a1bb2fe5 100644 --- a/proto/Weapon.proto +++ b/proto/Weapon.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message Weapon { uint32 level = 1; uint32 exp = 2; diff --git a/proto/WeaponAwakenReq.proto b/proto/WeaponAwakenReq.proto index 4a04f457..86e55c0b 100644 --- a/proto/WeaponAwakenReq.proto +++ b/proto/WeaponAwakenReq.proto @@ -2,18 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 642 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message WeaponAwakenReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 656; - } - - uint64 target_weapon_guid = 1; - uint64 item_guid = 2; - map affix_level_map = 3; + uint64 target_weapon_guid = 9; + uint64 item_guid = 3; + map affix_level_map = 2; } diff --git a/proto/WeaponAwakenRsp.proto b/proto/WeaponAwakenRsp.proto index c715044f..4184bd49 100644 --- a/proto/WeaponAwakenRsp.proto +++ b/proto/WeaponAwakenRsp.proto @@ -2,20 +2,14 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 601 +// EnetChannelId: 0 +// EnetIsReliable: true message WeaponAwakenRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 692; - } - - int32 retcode = 1; - uint64 target_weapon_guid = 2; - uint32 target_weapon_awaken_level = 3; - map old_affix_level_map = 4; - map cur_affix_level_map = 5; - uint64 avatar_guid = 6; + int32 retcode = 3; + uint64 target_weapon_guid = 1; + uint32 target_weapon_awaken_level = 13; + map old_affix_level_map = 7; + map cur_affix_level_map = 14; + uint64 avatar_guid = 10; } diff --git a/proto/WeaponPromoteReq.proto b/proto/WeaponPromoteReq.proto index e7cf1f17..dfdcad6e 100644 --- a/proto/WeaponPromoteReq.proto +++ b/proto/WeaponPromoteReq.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 624 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message WeaponPromoteReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 647; - } - - uint64 target_weapon_guid = 1; + uint64 target_weapon_guid = 6; } diff --git a/proto/WeaponPromoteRsp.proto b/proto/WeaponPromoteRsp.proto index 6df2aa71..b2f98339 100644 --- a/proto/WeaponPromoteRsp.proto +++ b/proto/WeaponPromoteRsp.proto @@ -2,18 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 638 +// EnetChannelId: 0 +// EnetIsReliable: true message WeaponPromoteRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 606; - } - - int32 retcode = 1; - uint64 target_weapon_guid = 2; - uint32 old_promote_level = 3; - uint32 cur_promote_level = 4; + int32 retcode = 11; + uint64 target_weapon_guid = 15; + uint32 old_promote_level = 5; + uint32 cur_promote_level = 2; } diff --git a/proto/WeaponUpgradeReq.proto b/proto/WeaponUpgradeReq.proto index 860f4398..c7f6a8a6 100644 --- a/proto/WeaponUpgradeReq.proto +++ b/proto/WeaponUpgradeReq.proto @@ -4,17 +4,12 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; +// CmdId: 686 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message WeaponUpgradeReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 670; - } - - uint64 target_weapon_guid = 1; - repeated uint64 food_weapon_guid_list = 2; - repeated ItemParam item_param_list = 3; + uint64 target_weapon_guid = 3; + repeated uint64 food_weapon_guid_list = 8; + repeated ItemParam item_param_list = 14; } diff --git a/proto/WeaponUpgradeRsp.proto b/proto/WeaponUpgradeRsp.proto index e15a82ec..c8564178 100644 --- a/proto/WeaponUpgradeRsp.proto +++ b/proto/WeaponUpgradeRsp.proto @@ -4,18 +4,13 @@ option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; +// CmdId: 663 +// EnetChannelId: 0 +// EnetIsReliable: true message WeaponUpgradeRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 632; - } - - int32 retcode = 1; - uint64 target_weapon_guid = 2; - uint32 old_level = 3; - uint32 cur_level = 4; - repeated ItemParam item_param_list = 5; + int32 retcode = 11; + uint64 target_weapon_guid = 8; + uint32 old_level = 4; + uint32 cur_level = 7; + repeated ItemParam item_param_list = 2; } diff --git a/proto/WearEquipReq.proto b/proto/WearEquipReq.proto index d12c5049..0f595487 100644 --- a/proto/WearEquipReq.proto +++ b/proto/WearEquipReq.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 630 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message WearEquipReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 691; - } - - uint64 avatar_guid = 1; + uint64 avatar_guid = 14; uint64 equip_guid = 2; } diff --git a/proto/WearEquipRsp.proto b/proto/WearEquipRsp.proto index 01760f9f..3f3c925c 100644 --- a/proto/WearEquipRsp.proto +++ b/proto/WearEquipRsp.proto @@ -2,17 +2,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 697 +// EnetChannelId: 0 +// EnetIsReliable: true message WearEquipRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 636; - } - - int32 retcode = 1; - uint64 avatar_guid = 2; - uint64 equip_guid = 3; + int32 retcode = 6; + uint64 avatar_guid = 10; + uint64 equip_guid = 5; } diff --git a/proto/WeeklyBossResinDiscountInfo.proto b/proto/WeeklyBossResinDiscountInfo.proto index 740fa4d2..97425694 100644 --- a/proto/WeeklyBossResinDiscountInfo.proto +++ b/proto/WeeklyBossResinDiscountInfo.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message WeeklyBossResinDiscountInfo { uint32 discount_num = 1; uint32 discount_num_limit = 2; diff --git a/proto/WidgetActiveChangeNotify.proto b/proto/WidgetActiveChangeNotify.proto index ee503343..e91e1f58 100644 --- a/proto/WidgetActiveChangeNotify.proto +++ b/proto/WidgetActiveChangeNotify.proto @@ -4,14 +4,9 @@ option java_package = "emu.grasscutter.net.proto"; import "WidgetSlotData.proto"; +// CmdId: 4295 +// EnetChannelId: 0 +// EnetIsReliable: true message WidgetActiveChangeNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4264; - } - - repeated WidgetSlotData widget_data_list = 1; + repeated WidgetSlotData widget_data_list = 4; } diff --git a/proto/WidgetCameraInfo.proto b/proto/WidgetCameraInfo.proto index 8f8d659a..0f8d4742 100644 --- a/proto/WidgetCameraInfo.proto +++ b/proto/WidgetCameraInfo.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message WidgetCameraInfo { uint32 target_entity_id = 1; } diff --git a/proto/WidgetCoolDownData.proto b/proto/WidgetCoolDownData.proto index 09b3d235..30b9f08a 100644 --- a/proto/WidgetCoolDownData.proto +++ b/proto/WidgetCoolDownData.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message WidgetCoolDownData { uint32 id = 1; uint64 cool_down_time = 2; diff --git a/proto/WidgetCoolDownNotify.proto b/proto/WidgetCoolDownNotify.proto index f034cc79..bba876fb 100644 --- a/proto/WidgetCoolDownNotify.proto +++ b/proto/WidgetCoolDownNotify.proto @@ -4,15 +4,10 @@ option java_package = "emu.grasscutter.net.proto"; import "WidgetCoolDownData.proto"; +// CmdId: 4263 +// EnetChannelId: 0 +// EnetIsReliable: true message WidgetCoolDownNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4298; - } - - repeated WidgetCoolDownData group_cool_down_data_list = 1; - repeated WidgetCoolDownData normal_cool_down_data_list = 2; + repeated WidgetCoolDownData group_cool_down_data_list = 4; + repeated WidgetCoolDownData normal_cool_down_data_list = 8; } diff --git a/proto/WidgetCreatorInfo.proto b/proto/WidgetCreatorInfo.proto index 1b277630..cbc5a90a 100644 --- a/proto/WidgetCreatorInfo.proto +++ b/proto/WidgetCreatorInfo.proto @@ -2,8 +2,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "WidgetCreatorOpType.proto"; import "WidgetCreateLocationInfo.proto"; +import "WidgetCreatorOpType.proto"; message WidgetCreatorInfo { WidgetCreatorOpType op_type = 1; diff --git a/proto/WidgetCreatorOpType.proto b/proto/WidgetCreatorOpType.proto index b2eaab3e..3ea428de 100644 --- a/proto/WidgetCreatorOpType.proto +++ b/proto/WidgetCreatorOpType.proto @@ -3,7 +3,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum WidgetCreatorOpType { - WIDGET_CREATOR_TYPE_NONE = 0; - WIDGET_CREATOR_TYPE_RETRACT = 1; - WIDGET_CREATOR_TYPE_RETRACT_AND_CREATE = 2; + WIDGET_CREATOR_OP_TYPE_NONE = 0; + WIDGET_CREATOR_OP_TYPE_RETRACT = 1; + WIDGET_CREATOR_OP_TYPE_RETRACT_AND_CREATE = 2; } diff --git a/proto/WidgetDoBagReq.proto b/proto/WidgetDoBagReq.proto index bc4a3403..188a12e1 100644 --- a/proto/WidgetDoBagReq.proto +++ b/proto/WidgetDoBagReq.proto @@ -5,19 +5,14 @@ option java_package = "emu.grasscutter.net.proto"; import "WidgetCreateLocationInfo.proto"; import "WidgetCreatorInfo.proto"; +// CmdId: 4284 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message WidgetDoBagReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4269; + uint32 material_id = 15; + oneof op_info { + WidgetCreateLocationInfo location_info = 351; + WidgetCreatorInfo widget_creator_info = 46; } - - oneof OpInfo { - WidgetCreateLocationInfo location_info = 20; - WidgetCreatorInfo widget_creator_info = 21; - } - uint32 material_id = 1; } diff --git a/proto/WidgetDoBagRsp.proto b/proto/WidgetDoBagRsp.proto index e587c62e..07d4ea3a 100644 --- a/proto/WidgetDoBagRsp.proto +++ b/proto/WidgetDoBagRsp.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4286 +// EnetChannelId: 0 +// EnetIsReliable: true message WidgetDoBagRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4270; - } - - int32 retcode = 1; - uint32 material_id = 2; + int32 retcode = 12; + uint32 material_id = 9; } diff --git a/proto/WidgetGadgetAllDataNotify.proto b/proto/WidgetGadgetAllDataNotify.proto index ea9034f3..5662c6b2 100644 --- a/proto/WidgetGadgetAllDataNotify.proto +++ b/proto/WidgetGadgetAllDataNotify.proto @@ -4,14 +4,9 @@ option java_package = "emu.grasscutter.net.proto"; import "WidgetGadgetData.proto"; +// CmdId: 4285 +// EnetChannelId: 0 +// EnetIsReliable: true message WidgetGadgetAllDataNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4262; - } - - repeated WidgetGadgetData widget_gadget_data = 1; + repeated WidgetGadgetData widget_gadget_data = 8; } diff --git a/proto/WidgetGadgetData.proto b/proto/WidgetGadgetData.proto index 1c2756d2..8bd1cf36 100644 --- a/proto/WidgetGadgetData.proto +++ b/proto/WidgetGadgetData.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message WidgetGadgetData { uint32 gadget_id = 1; repeated uint32 gadget_entity_id_list = 3; diff --git a/proto/WidgetGadgetDataNotify.proto b/proto/WidgetGadgetDataNotify.proto index b056941c..c80b1bc8 100644 --- a/proto/WidgetGadgetDataNotify.proto +++ b/proto/WidgetGadgetDataNotify.proto @@ -4,14 +4,9 @@ option java_package = "emu.grasscutter.net.proto"; import "WidgetGadgetData.proto"; +// CmdId: 4292 +// EnetChannelId: 0 +// EnetIsReliable: true message WidgetGadgetDataNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4256; - } - - WidgetGadgetData widget_gadget_data = 1; + WidgetGadgetData widget_gadget_data = 13; } diff --git a/proto/WidgetGadgetDestroyNotify.proto b/proto/WidgetGadgetDestroyNotify.proto index 3d6287fc..2b0a8cd2 100644 --- a/proto/WidgetGadgetDestroyNotify.proto +++ b/proto/WidgetGadgetDestroyNotify.proto @@ -2,15 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4275 +// EnetChannelId: 0 +// EnetIsReliable: true message WidgetGadgetDestroyNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4268; - } - - uint32 entity_id = 1; + uint32 entity_id = 7; } diff --git a/proto/WidgetReportReq.proto b/proto/WidgetReportReq.proto index 21eed4df..6a70c80c 100644 --- a/proto/WidgetReportReq.proto +++ b/proto/WidgetReportReq.proto @@ -2,18 +2,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4287 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message WidgetReportReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 4294; - } - - uint32 material_id = 1; - bool is_clear_hint = 2; - bool is_client_collect = 3; + uint32 material_id = 7; + bool is_clear_hint = 13; + bool is_client_collect = 9; + bool BHCBOJNGOIK = 1; } diff --git a/proto/WidgetReportRsp.proto b/proto/WidgetReportRsp.proto index 3142df9b..11770115 100644 --- a/proto/WidgetReportRsp.proto +++ b/proto/WidgetReportRsp.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4282 +// EnetChannelId: 0 +// EnetIsReliable: true message WidgetReportRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4259; - } - - int32 retcode = 1; - uint32 material_id = 2; + int32 retcode = 12; + uint32 material_id = 7; } diff --git a/proto/WidgetSlotChangeNotify.proto b/proto/WidgetSlotChangeNotify.proto index 3ef12560..8a1f7401 100644 --- a/proto/WidgetSlotChangeNotify.proto +++ b/proto/WidgetSlotChangeNotify.proto @@ -2,18 +2,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "WidgetSlotOp.proto"; import "WidgetSlotData.proto"; +import "WidgetSlotOp.proto"; +// CmdId: 4274 +// EnetChannelId: 0 +// EnetIsReliable: true message WidgetSlotChangeNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4289; - } - - WidgetSlotOp op = 1; - WidgetSlotData slot = 2; + WidgetSlotOp op = 6; + WidgetSlotData slot = 8; } diff --git a/proto/WidgetSlotOp.proto b/proto/WidgetSlotOp.proto index d4fa2753..4f809f84 100644 --- a/proto/WidgetSlotOp.proto +++ b/proto/WidgetSlotOp.proto @@ -3,6 +3,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum WidgetSlotOp { - ATTACH = 0; - DETACH = 1; + WIDGET_SLOT_OP_ATTACH = 0; + WIDGET_SLOT_OP_DETACH = 1; } diff --git a/proto/WidgetSlotTag.proto b/proto/WidgetSlotTag.proto index edfd6c06..53029663 100644 --- a/proto/WidgetSlotTag.proto +++ b/proto/WidgetSlotTag.proto @@ -3,6 +3,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; enum WidgetSlotTag { - WIDGET_SLOT_QUICK_USE = 0; - WIDGET_SLOT_ATTACH_AVATAR = 1; + WIDGET_SLOT_TAG_QUICK_USE = 0; + WIDGET_SLOT_TAG_ATTACH_AVATAR = 1; } diff --git a/proto/WidgetThunderBirdFeatherInfo.proto b/proto/WidgetThunderBirdFeatherInfo.proto index cad88c47..5533c83b 100644 --- a/proto/WidgetThunderBirdFeatherInfo.proto +++ b/proto/WidgetThunderBirdFeatherInfo.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message WidgetThunderBirdFeatherInfo { repeated uint32 entity_id_list = 1; } diff --git a/proto/WidgetUseAttachAbilityGroupChangeNotify.proto b/proto/WidgetUseAttachAbilityGroupChangeNotify.proto index 85fa8434..3af9d79b 100644 --- a/proto/WidgetUseAttachAbilityGroupChangeNotify.proto +++ b/proto/WidgetUseAttachAbilityGroupChangeNotify.proto @@ -2,16 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 4299 +// EnetChannelId: 0 +// EnetIsReliable: true message WidgetUseAttachAbilityGroupChangeNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 4292; - } - - uint32 material_id = 1; - bool is_attach = 2; + uint32 material_id = 4; + bool is_attach = 11; } diff --git a/proto/WindSeedClientNotify.proto b/proto/WindSeedClientNotify.proto new file mode 100644 index 00000000..8e01675e --- /dev/null +++ b/proto/WindSeedClientNotify.proto @@ -0,0 +1,35 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "Vector.proto"; + +message WindSeedClientNotify { + enum CmdId { + option allow_alias = true; + NONE = 0; + ENET_CHANNEL_ID = 0; + ENET_IS_RELIABLE = 1; + CMD_ID = 1182; + } + + message RefreshNotify { + uint32 refresh_num = 14; + } + message AddWindBulletNotify { + uint32 seed_entity_id = 15; + Vector seed_pos = 13; + uint32 catch_player_uid = 14; + } + message AreaNotify { + uint32 area_id = 1; + bytes area_code = 4; + uint32 area_type = 8; + } + + oneof Notify { + AddWindBulletNotify add_wind_bullet_notify = 1; + } + RefreshNotify refresh_notify = 9; + AreaNotify area_notify = 15; +} \ No newline at end of file diff --git a/proto/WorktopOptionNotify.proto b/proto/WorktopOptionNotify.proto index 5dfdc94a..e9dfeb20 100644 --- a/proto/WorktopOptionNotify.proto +++ b/proto/WorktopOptionNotify.proto @@ -2,7 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 837 +// EnetChannelId: 0 +// EnetIsReliable: true message WorktopOptionNotify { - uint32 gadget_entity_id = 1; - repeated uint32 option_list = 2; + uint32 gadget_entity_id = 12; + repeated uint32 option_list = 5; } diff --git a/proto/WorldDataNotify.proto b/proto/WorldDataNotify.proto index 345c279e..7885be8f 100644 --- a/proto/WorldDataNotify.proto +++ b/proto/WorldDataNotify.proto @@ -4,21 +4,16 @@ option java_package = "emu.grasscutter.net.proto"; import "PropValue.proto"; +// CmdId: 3131 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message WorldDataNotify { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 3219; - } + map world_prop_map = 3; enum DataType { - DATA_NONE = 0; - WORLD_LEVEL = 1; - IS_IN_MP_MODE = 2; + DATA_TYPE_NONE = 0; + DATA_TYPE_WORLD_LEVEL = 1; + DATA_TYPE_IS_IN_MP_MODE = 2; } - - map world_prop_map = 1; } diff --git a/proto/WorldPlayerDieNotify.proto b/proto/WorldPlayerDieNotify.proto index e1e27b10..5af48297 100644 --- a/proto/WorldPlayerDieNotify.proto +++ b/proto/WorldPlayerDieNotify.proto @@ -4,19 +4,14 @@ option java_package = "emu.grasscutter.net.proto"; import "PlayerDieType.proto"; +// CmdId: 296 +// EnetChannelId: 0 +// EnetIsReliable: true message WorldPlayerDieNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 254; + PlayerDieType die_type = 9; + uint32 murderer_entity_id = 14; + oneof entity { + uint32 monster_id = 10; + uint32 gadget_id = 11; } - - oneof Entity { - uint32 monster_id = 3; - uint32 gadget_id = 4; - } - PlayerDieType die_type = 1; - uint32 murderer_entity_id = 2; } diff --git a/proto/WorldPlayerInfoNotify.proto b/proto/WorldPlayerInfoNotify.proto index 276940d5..e6bd93c4 100644 --- a/proto/WorldPlayerInfoNotify.proto +++ b/proto/WorldPlayerInfoNotify.proto @@ -4,16 +4,11 @@ option java_package = "emu.grasscutter.net.proto"; import "OnlinePlayerInfo.proto"; +// CmdId: 3304 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message WorldPlayerInfoNotify { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 3109; - } - - repeated OnlinePlayerInfo player_info_list = 1; - repeated uint32 player_uid_list = 2; + repeated OnlinePlayerInfo player_info_list = 6; + repeated uint32 player_uid_list = 5; } diff --git a/proto/WorldPlayerLocationNotify.proto b/proto/WorldPlayerLocationNotify.proto index 1b8e9d71..6c8f5b2a 100644 --- a/proto/WorldPlayerLocationNotify.proto +++ b/proto/WorldPlayerLocationNotify.proto @@ -5,15 +5,10 @@ option java_package = "emu.grasscutter.net.proto"; import "PlayerLocationInfo.proto"; import "PlayerWorldLocationInfo.proto"; +// CmdId: 283 +// EnetChannelId: 0 +// EnetIsReliable: true message WorldPlayerLocationNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 253; - } - - repeated PlayerLocationInfo player_loc_list = 1; - repeated PlayerWorldLocationInfo player_world_loc_list = 2; + repeated PlayerLocationInfo player_loc_list = 6; + repeated PlayerWorldLocationInfo player_world_loc_list = 15; } diff --git a/proto/WorldPlayerRTTNotify.proto b/proto/WorldPlayerRTTNotify.proto index a927198a..46c02f1c 100644 --- a/proto/WorldPlayerRTTNotify.proto +++ b/proto/WorldPlayerRTTNotify.proto @@ -4,14 +4,9 @@ option java_package = "emu.grasscutter.net.proto"; import "PlayerRTTInfo.proto"; +// CmdId: 24 +// EnetChannelId: 0 +// EnetIsReliable: true message WorldPlayerRTTNotify { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 47; - } - - repeated PlayerRTTInfo player_rtt_list = 1; + repeated PlayerRTTInfo player_rtt_list = 14; } diff --git a/proto/WorldPlayerReviveReq.proto b/proto/WorldPlayerReviveReq.proto index f1e139b6..e4315701 100644 --- a/proto/WorldPlayerReviveReq.proto +++ b/proto/WorldPlayerReviveReq.proto @@ -2,14 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// CmdId: 247 +// EnetChannelId: 0 +// EnetIsReliable: true +// IsAllowClient: true message WorldPlayerReviveReq { - enum CmdId { - option allow_alias = true; - ENET_CHANNEL_ID = 0; - NONE = 0; - ENET_IS_RELIABLE = 1; - IS_ALLOW_CLIENT = 1; - CMD_ID = 288; - } - } diff --git a/proto/WorldPlayerReviveRsp.proto b/proto/WorldPlayerReviveRsp.proto index d08ce1e2..bbac891f 100644 --- a/proto/WorldPlayerReviveRsp.proto +++ b/proto/WorldPlayerReviveRsp.proto @@ -2,15 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// CmdId: 280 +// EnetChannelId: 0 +// EnetIsReliable: true message WorldPlayerReviveRsp { - enum CmdId { - option allow_alias = true; - NONE = 0; - ENET_CHANNEL_ID = 0; - ENET_IS_RELIABLE = 1; - CMD_ID = 227; - } - - int32 retcode = 1; + int32 retcode = 8; }