From 6ff0b73c6304026e650e5d60f7e5e3f9a6b83c25 Mon Sep 17 00:00:00 2001 From: Akbar Yahya Date: Sun, 29 Jan 2023 18:42:51 +0800 Subject: [PATCH] * Remove bytes.proto * Remove duplicate files * Update gc need --- gc_needed2.json | 13 ++++- proto/Avatar.proto | 35 ------------ proto/BattlePassMissionDelNotify.proto | 18 ------- proto/BlockInfo.proto | 5 -- proto/BossChest.proto | 15 ------ proto/ClientGadget.proto | 12 ----- proto/CombatInvocationsNotify.proto | 16 +++--- proto/CombatInvokeEntry.proto | 3 -- proto/FishInfo.proto | 6 --- proto/GadgetInfo.proto | 74 -------------------------- proto/GatherGadget.proto | 6 --- proto/GetPlayerTokenRsp.proto | 3 -- proto/HomeBlockDotPattern.proto | 5 -- proto/Monster.proto | 39 -------------- proto/PingReq.proto | 3 -- proto/PlayerLoginReq.proto | 3 -- proto/PlayerLoginRsp.proto | 4 +- proto/RobotPushPlayerDataNotify.proto | 3 -- proto/Rotation.proto | 7 --- proto/UnionCmd.proto | 3 -- proto/WindSeedClientNotify.proto | 20 ++++--- proto/Worktop.proto | 6 --- proto/bytes.proto | 4 -- 23 files changed, 29 insertions(+), 274 deletions(-) delete mode 100644 proto/Avatar.proto delete mode 100644 proto/BattlePassMissionDelNotify.proto delete mode 100644 proto/BossChest.proto delete mode 100644 proto/ClientGadget.proto delete mode 100644 proto/FishInfo.proto delete mode 100644 proto/GadgetInfo.proto delete mode 100644 proto/GatherGadget.proto delete mode 100644 proto/Monster.proto delete mode 100644 proto/Rotation.proto delete mode 100644 proto/Worktop.proto delete mode 100644 proto/bytes.proto diff --git a/gc_needed2.json b/gc_needed2.json index 1ad89f46..cce1046b 100644 --- a/gc_needed2.json +++ b/gc_needed2.json @@ -9,7 +9,7 @@ "name": "RoutePoint" }, { - "name": "BattlePassMission" + "name": "MissionStatus" }, { "name": "AbilityInvokeEntryHead" @@ -368,6 +368,9 @@ { "name": "MarkMapReq" }, + { + "name": "Operation" + }, { "name": "EntityMoveInfo" }, @@ -405,7 +408,7 @@ "name": "Birthday" }, { - "name": "ServerBuffChangeNotify" + "name": "ServerBuffChangeType" }, { "name": "ServerBuff" @@ -1604,6 +1607,9 @@ { "name": "QueryPathRsp" }, + { + "name": "PathStatusType" + }, { "name": "QuestCreateEntityRsp" }, @@ -1700,6 +1706,9 @@ { "name": "ServerAnnounceRevokeNotify" }, + { + "name": "ServerBuffChangeNotify" + }, { "name": "ServerCondMeetQuestListUpdateNotify" }, diff --git a/proto/Avatar.proto b/proto/Avatar.proto deleted file mode 100644 index d3729182..00000000 --- a/proto/Avatar.proto +++ /dev/null @@ -1,35 +0,0 @@ -syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; - - - -import "SceneWeaponInfo.proto"; -import "CurVehicleInfo.proto"; -import "AvatarExcelInfo.proto"; -import "SceneReliquaryInfo.proto"; -import "ServerBuff.proto"; - - -message Avatar { - uint32 uid = 1; - uint32 avatarId = 2; - uint64 guid = 3; - uint32 peerId = 4; - repeated uint32 equipIdList = 5; - uint32 skillDepotId = 6; - repeated uint32 talentIdList = 7; - SceneWeaponInfo weapon = 8; - repeated SceneReliquaryInfo reliquaryList = 9; - uint32 coreProudSkillLevel = 11; - repeated uint32 inherentProudSkillList = 12; - map skillLevelMap = 13; - map proudSkillExtraLevelMap = 14; - repeated ServerBuff serverBuffList = 15; - repeated uint32 teamResonanceList = 16; - uint32 wearingFlycloakId = 17; - uint32 bornTime = 18; - uint32 costumeId = 19; - CurVehicleInfo curVehicleInfo = 20; - AvatarExcelInfo excelInfo = 21; - uint32 animHash = 22; -} diff --git a/proto/BattlePassMissionDelNotify.proto b/proto/BattlePassMissionDelNotify.proto deleted file mode 100644 index 15047329..00000000 --- a/proto/BattlePassMissionDelNotify.proto +++ /dev/null @@ -1,18 +0,0 @@ -syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; - - - - - -message BattlePassMissionDelNotify { - enum INMLJEGLKNJ { - option allow_alias = true; - NONE = 0; - PEPPOHPHJOJ = 2646; - DCDNILFDFLB = 0; - NNBKOLMPOEA = 1; - } - - repeated uint32 delMissionIdList = 11; -} diff --git a/proto/BlockInfo.proto b/proto/BlockInfo.proto index d14ee7f4..7add3398 100644 --- a/proto/BlockInfo.proto +++ b/proto/BlockInfo.proto @@ -1,11 +1,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - - -import "bytes.proto"; - - message BlockInfo { uint32 blockId = 1; uint32 dataVersion = 2; diff --git a/proto/BossChest.proto b/proto/BossChest.proto deleted file mode 100644 index dc569f40..00000000 --- a/proto/BossChest.proto +++ /dev/null @@ -1,15 +0,0 @@ -syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; - - - -import "WeeklyBossResinDiscountInfo.proto"; - - -message BossChest { - uint32 monsterConfigId = 1; - uint32 resin = 2; - repeated uint32 remainUidList = 3; - repeated uint32 qualifyUidList = 4; - map uidDiscountMap = 5; -} diff --git a/proto/ClientGadget.proto b/proto/ClientGadget.proto deleted file mode 100644 index d2e5aaef..00000000 --- a/proto/ClientGadget.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -message ClientGadget { - uint32 campId = 1; - uint32 campType = 2; - uint64 guid = 3; - uint32 ownerEntityId = 4; - uint32 targetEntityId = 5; - bool glmdcefdgeg = 6; - bool isPeerIdFromPlayer = 7; - repeated uint32 targetEntityIdList = 8; -} diff --git a/proto/CombatInvocationsNotify.proto b/proto/CombatInvocationsNotify.proto index 47579e71..2e749449 100644 --- a/proto/CombatInvocationsNotify.proto +++ b/proto/CombatInvocationsNotify.proto @@ -5,14 +5,14 @@ option java_package = "emu.grasscutter.net.proto"; import "CombatInvokeEntry.proto"; message CombatInvocationsNotify { - enum ENECMIELGCN { - option allow_alias = true; - NONE = 0; - PEPPOHPHJOJ = 323; - DCDNILFDFLB = 0; - NNBKOLMPOEA = 1; - EAJIABGAOCI = 1; - } + //enum ENECMIELGCN { + // option allow_alias = true; + // NONE = 0; + // PEPPOHPHJOJ = 323; + // DCDNILFDFLB = 0; + // NNBKOLMPOEA = 1; + // EAJIABGAOCI = 1; + //} repeated CombatInvokeEntry invokeList = 11; } diff --git a/proto/CombatInvokeEntry.proto b/proto/CombatInvokeEntry.proto index 42975eb5..00c4fe1c 100644 --- a/proto/CombatInvokeEntry.proto +++ b/proto/CombatInvokeEntry.proto @@ -1,9 +1,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - - -import "bytes.proto"; import "CombatTypeArgument.proto"; import "ForwardType.proto"; message CombatInvokeEntry { diff --git a/proto/FishInfo.proto b/proto/FishInfo.proto deleted file mode 100644 index 005de1ad..00000000 --- a/proto/FishInfo.proto +++ /dev/null @@ -1,6 +0,0 @@ -syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -message FishInfo { - uint32 pjkdcbfhaoo = 4; - uint32 defebhbifge = 6; -} diff --git a/proto/GadgetInfo.proto b/proto/GadgetInfo.proto deleted file mode 100644 index 68f43611..00000000 --- a/proto/GadgetInfo.proto +++ /dev/null @@ -1,74 +0,0 @@ -syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; - - - -import "GadgetBornType.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 "GeneralRewardInfo.proto"; -import "OfferingInfo.proto"; -import "FoundationInfo.proto"; -import "VehicleInfo.proto"; -import "ShellInfo.proto"; -import "ScreenInfo.proto"; -import "FishPoolInfo.proto"; -import "CustomGadgetTreeInfo.proto"; -import "RoguelikeGadgetInfo.proto"; -import "NightCrowGadgetInfo.proto"; -import "DeshretObeliskGadgetInfo.proto"; -import "CoinCollectOperatorInfo.proto"; -import "PlatformInfo.proto"; -import "GadgetPlayInfo.proto"; -message GadgetInfo { - uint32 gadgetId = 1; - uint32 groupId = 2; - uint32 configId = 3; - uint32 ownerEntityId = 4; - GadgetBornType bornType = 5; - uint32 gadgetState = 6; - uint32 gadgetType = 7; - bool isShowCutscene = 8; - uint32 authorityPeerId = 9; - bool isEnableInteract = 10; - uint32 interactId = 11; - oneof content { - Item item = 12; - GatherGadgetInfo gather_gadget = 13; - WorktopInfo worktop = 14; - ClientGadgetInfo client_gadget = 15; - WeatherInfo weather = 17; - AbilityGadgetInfo ability_gadget = 18; - StatueGadgetInfo statue_gadget = 19; - BossChestInfo boss_chest = 20; - BlossomChestInfo blossom_chest = 41; - MpPlayRewardInfo mp_play_reward = 42; - GeneralRewardInfo general_reward = 43; - OfferingInfo offering_info = 44; - FoundationInfo foundation_info = 45; - VehicleInfo vehicle_info = 46; - ShellInfo shell_info = 47; - ScreenInfo screen_info = 48; - FishPoolInfo fish_pool_info = 59; - CustomGadgetTreeInfo custom_gadget_tree_info = 60; - RoguelikeGadgetInfo roguelike_gadget_info = 61; - NightCrowGadgetInfo night_crow_gadget_info = 62; - DeshretObeliskGadgetInfo deshret_obelisk_gadget_info = 63; - CoinCollectOperatorInfo coin_collect_operator_info = 64; - } - uint32 markFlag = 21; - uint32 propOwnerEntityId = 22; - PlatformInfo platform = 23; - repeated uint32 interactUidList = 24; - uint32 draftId = 25; - uint32 gadgetTalkState = 26; - GadgetPlayInfo playInfo = 100; -} diff --git a/proto/GatherGadget.proto b/proto/GatherGadget.proto deleted file mode 100644 index ea95daa1..00000000 --- a/proto/GatherGadget.proto +++ /dev/null @@ -1,6 +0,0 @@ -syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -message GatherGadget { - uint32 itemId = 1; - bool baplahgkmbl = 2; -} diff --git a/proto/GetPlayerTokenRsp.proto b/proto/GetPlayerTokenRsp.proto index 4ffe15c8..7bd89a7e 100644 --- a/proto/GetPlayerTokenRsp.proto +++ b/proto/GetPlayerTokenRsp.proto @@ -1,9 +1,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - - -import "bytes.proto"; import "StopServer.proto"; message GetPlayerTokenRsp { enum NLINKJJLDME { diff --git a/proto/HomeBlockDotPattern.proto b/proto/HomeBlockDotPattern.proto index 27465c11..acb61afb 100644 --- a/proto/HomeBlockDotPattern.proto +++ b/proto/HomeBlockDotPattern.proto @@ -1,11 +1,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - - -import "bytes.proto"; - - message HomeBlockDotPattern { uint32 width = 3; bytes data = 14; diff --git a/proto/Monster.proto b/proto/Monster.proto deleted file mode 100644 index f6acf3e4..00000000 --- a/proto/Monster.proto +++ /dev/null @@ -1,39 +0,0 @@ -syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; - - - -import "MonsterBornType.proto"; -import "MonsterRoute.proto"; -import "FishInfo.proto"; -import "FishtankFishInfo.proto"; -import "SceneWeaponInfo.proto"; -message Monster { - uint32 monsterId = 1; - uint32 groupId = 2; - uint32 configId = 3; - repeated SceneWeaponInfo weaponList = 4; - uint32 authorityPeerId = 5; - repeated uint32 affixList = 6; - bool isElite = 7; - uint32 ownerEntityId = 8; - uint32 summonedTag = 9; - map summonTagMap = 10; - uint32 poseId = 11; - MonsterBornType bornType = 12; - uint32 blockId = 13; - uint32 markFlag = 14; - uint32 titleId = 15; - uint32 specialNameId = 16; - uint32 attackTargetId = 17; - MonsterRoute monsterRoute = 18; - uint32 aiConfigId = 19; - uint32 levelRouteId = 20; - uint32 initPoseId = 21; - bool isLight = 22; - uint32 killNum = 23; - oneof LOBCEJBFAAB { - FishInfo fish_info = 50; - FishtankFishInfo fishtank_fish_info = 51; - } -} diff --git a/proto/PingReq.proto b/proto/PingReq.proto index 8d008b56..df2445d5 100644 --- a/proto/PingReq.proto +++ b/proto/PingReq.proto @@ -1,9 +1,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - - -import "bytes.proto"; message PingReq { enum HCOPEMHOJKP { option allow_alias = true; diff --git a/proto/PlayerLoginReq.proto b/proto/PlayerLoginReq.proto index f745929e..51eb9538 100644 --- a/proto/PlayerLoginReq.proto +++ b/proto/PlayerLoginReq.proto @@ -1,9 +1,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - - -import "bytes.proto"; import "TrackingIOInfo.proto"; import "AdjustTrackingInfo.proto"; message PlayerLoginReq { diff --git a/proto/PlayerLoginRsp.proto b/proto/PlayerLoginRsp.proto index 8d27ae78..68ee7c48 100644 --- a/proto/PlayerLoginRsp.proto +++ b/proto/PlayerLoginRsp.proto @@ -1,13 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - - -import "bytes.proto"; import "ResVersionConfig.proto"; import "FeatureBlockInfo.proto"; import "BlockInfo.proto"; import "ShortAbilityHashPair.proto"; + message PlayerLoginRsp { enum BGKOKMCEJHK { option allow_alias = true; diff --git a/proto/RobotPushPlayerDataNotify.proto b/proto/RobotPushPlayerDataNotify.proto index 91dc9305..0d738045 100644 --- a/proto/RobotPushPlayerDataNotify.proto +++ b/proto/RobotPushPlayerDataNotify.proto @@ -1,9 +1,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - - -import "bytes.proto"; message RobotPushPlayerDataNotify { enum DELIFMCIALG { option allow_alias = true; diff --git a/proto/Rotation.proto b/proto/Rotation.proto deleted file mode 100644 index e77c60f8..00000000 --- a/proto/Rotation.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -message Rotation { - float x = 1; - float y = 2; - float z = 3; -} diff --git a/proto/UnionCmd.proto b/proto/UnionCmd.proto index 58840eaf..4154bcbf 100644 --- a/proto/UnionCmd.proto +++ b/proto/UnionCmd.proto @@ -1,9 +1,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - - -import "bytes.proto"; message UnionCmd { uint32 messageId = 3; bytes body = 5; diff --git a/proto/WindSeedClientNotify.proto b/proto/WindSeedClientNotify.proto index f2f38b02..62b79b4f 100644 --- a/proto/WindSeedClientNotify.proto +++ b/proto/WindSeedClientNotify.proto @@ -1,24 +1,22 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - - import "Vector.proto"; -import "bytes.proto"; + message WindSeedClientNotify { - enum NFLDBGMKHKK { - option allow_alias = true; - NONE = 0; - PEPPOHPHJOJ = 1114; - DCDNILFDFLB = 0; - NNBKOLMPOEA = 1; - } + //enum NFLDBGMKHKK { + // option allow_alias = true; + // NONE = 0; + // PEPPOHPHJOJ = 1114; + // DCDNILFDFLB = 0; + // NNBKOLMPOEA = 1; + //} message RefreshNotify { uint32 refreshNum = 13; } message AddWindBulletNotify { - uint32 Unk3300_CKIKKCAFJBC = 1; + uint32 add_wind_bullet_notify = 8; Vector seedPos = 10; uint32 Unk3300_MPDFAPBDJAH = 13; } diff --git a/proto/Worktop.proto b/proto/Worktop.proto deleted file mode 100644 index aec6b150..00000000 --- a/proto/Worktop.proto +++ /dev/null @@ -1,6 +0,0 @@ -syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -message Worktop { - repeated uint32 optionList = 1; - bool isGuestCanOperate = 2; -} diff --git a/proto/bytes.proto b/proto/bytes.proto deleted file mode 100644 index 1bf9b9e1..00000000 --- a/proto/bytes.proto +++ /dev/null @@ -1,4 +0,0 @@ -syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; -message bytes { -}