diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..fbab9b375 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "Grasscutter-Protos"] + path = Grasscutter-Protos + url = https://github.com/Melledy/Grasscutter-Protos diff --git a/Grasscutter-Protos b/Grasscutter-Protos new file mode 160000 index 000000000..0537e9cc4 --- /dev/null +++ b/Grasscutter-Protos @@ -0,0 +1 @@ +Subproject commit 0537e9cc4c7856a7c6f88bbbaa908a80c4ee677e diff --git a/data/Banners.json b/data/Banners.json index 163319f5e..959a8b436 100644 --- a/data/Banners.json +++ b/data/Banners.json @@ -17,39 +17,24 @@ "gachaType": 301, "scheduleId": 903, "bannerType": "EVENT", - "prefabPath": "GachaShowPanel_A076", - "previewPrefabPath": "UI_Tab_GachaShowPanel_A076", - "titlePath": "UI_GACHA_SHOW_PANEL_A076_TITLE", + "prefabPath": "GachaShowPanel_A079", + "previewPrefabPath": "UI_Tab_GachaShowPanel_A079", + "titlePath": "UI_GACHA_SHOW_PANEL_A079_TITLE", "costItem": 223, "beginTime": 0, "endTime": 1924992000, "sortId": 9998, "maxItemType": 1, - "rateUpItems1": [1066], - "rateUpItems2": [1023, 1043, 1064] - }, - { - "gachaType": 400, - "scheduleId": 913, - "bannerType": "EVENT", - "prefabPath": "GachaShowPanel_A077", - "previewPrefabPath": "UI_Tab_GachaShowPanel_A077", - "titlePath": "UI_Tab_GachaShowPanel_A077", - "costItem": 223, - "beginTime": 0, - "endTime": 1924992000, - "sortId": 9998, - "maxItemType": 1, - "rateUpItems1": [1022], - "rateUpItems2": [1023, 1043, 1064] + "rateUpItems1": [1002], + "rateUpItems2": [1053, 1020, 1045] }, { "gachaType": 302, - "scheduleId": 923, + "scheduleId": 913, "bannerType": "WEAPON", - "prefabPath": "GachaShowPanel_A078", - "previewPrefabPath": "UI_Tab_GachaShowPanel_A078", - "titlePath": "UI_GACHA_SHOW_PANEL_A078_TITLE", + "prefabPath": "GachaShowPanel_A080", + "previewPrefabPath": "UI_Tab_GachaShowPanel_A080", + "titlePath": "UI_GACHA_SHOW_PANEL_A080_TITLE", "costItem": 223, "beginTime": 0, "endTime": 1924992000, @@ -58,7 +43,7 @@ "eventChance": 75, "softPity": 80, "hardPity": 80, - "rateUpItems1": [11510, 15503], - "rateUpItems2": [11402, 12403, 13401, 14402, 15405] + "rateUpItems1": [11509, 12504], + "rateUpItems2": [11401, 12402, 13407, 14401, 15401] } -] \ No newline at end of file +] diff --git a/proto/AbilityAppliedAbility.proto b/proto/AbilityAppliedAbility.proto deleted file mode 100644 index f9fd845da..000000000 --- a/proto/AbilityAppliedAbility.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AbilityScalarValueEntry.proto"; -import "AbilityString.proto"; - -message AbilityAppliedAbility { - AbilityString abilityName = 1; - AbilityString abilityOverride = 2; - repeated AbilityScalarValueEntry overrideMap = 3; - uint32 instancedAbilityId = 4; -} diff --git a/proto/AbilityAppliedModifier.proto b/proto/AbilityAppliedModifier.proto deleted file mode 100644 index 857fd8cf2..000000000 --- a/proto/AbilityAppliedModifier.proto +++ /dev/null @@ -1,23 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AbilityAttachedModifier.proto"; -import "AbilityString.proto"; -import "ModifierDurability.proto"; - -message AbilityAppliedModifier { - int32 modifierLocalId = 1; - uint32 parentAbilityEntityId = 2; - AbilityString parentAbilityName = 3; - AbilityString parentAbilityOverride = 4; - uint32 instancedAbilityId = 5; - uint32 instancedModifierId = 6; - float existDuration = 7; - AbilityAttachedModifier attachedInstancedModifier = 8; - uint32 applyEntityId = 9; - bool isAttachedParentAbility = 10; - ModifierDurability modifierDurability = 11; - uint32 sbuffUid = 12; - bool isServerbuffModifier = 13; -} diff --git a/proto/AbilityAttachedModifier.proto b/proto/AbilityAttachedModifier.proto deleted file mode 100644 index c99cb84f5..000000000 --- a/proto/AbilityAttachedModifier.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AbilityAttachedModifier { - bool isInvalid = 1; - uint32 ownerEntityId = 2; - uint32 instancedModifierId = 3; - bool isServerbuffModifier = 4; - int32 attachNameHash = 5; -} diff --git a/proto/AbilityChangeNotify.proto b/proto/AbilityChangeNotify.proto deleted file mode 100644 index 4a3a63e22..000000000 --- a/proto/AbilityChangeNotify.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AbilityControlBlock.proto"; - -message AbilityChangeNotify { - uint32 entityId = 1; - AbilityControlBlock abilityControlBlock = 2; -} diff --git a/proto/AbilityControlBlock.proto b/proto/AbilityControlBlock.proto deleted file mode 100644 index d47c3c9d8..000000000 --- a/proto/AbilityControlBlock.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AbilityEmbryo.proto"; - -message AbilityControlBlock { - repeated AbilityEmbryo abilityEmbryoList = 1; -} diff --git a/proto/AbilityEmbryo.proto b/proto/AbilityEmbryo.proto deleted file mode 100644 index edbb26b44..000000000 --- a/proto/AbilityEmbryo.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AbilityEmbryo { - uint32 abilityId = 1; - fixed32 abilityNameHash = 2; - fixed32 abilityOverrideNameHash = 3; -} diff --git a/proto/AbilityIdentifier.proto b/proto/AbilityIdentifier.proto deleted file mode 100644 index f1ddecd09..000000000 --- a/proto/AbilityIdentifier.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AbilityIdentifier { - uint32 instancedAbilityId = 1; - uint32 abilityCasterId = 2; - int32 localId = 3; - uint32 instancedModifierId = 4; - uint32 modifierOwnerId = 5; - bool isServerbuffModifier = 6; -} diff --git a/proto/AbilityInvocationsNotify.proto b/proto/AbilityInvocationsNotify.proto deleted file mode 100644 index a38535403..000000000 --- a/proto/AbilityInvocationsNotify.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AbilityInvokeEntry.proto"; - -message AbilityInvocationsNotify { - repeated AbilityInvokeEntry invokes = 1; -} diff --git a/proto/AbilityInvokeArgument.proto b/proto/AbilityInvokeArgument.proto deleted file mode 100644 index a5698323a..000000000 --- a/proto/AbilityInvokeArgument.proto +++ /dev/null @@ -1,48 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum AbilityInvokeArgument { - AbilityNone = 0; - AbilityMetaModifierChange = 1; - AbilityMetaCommandModifierChangeRequest = 2; - AbilityMetaSpecialFloatArgument = 3; - AbilityMetaOverrideParam = 4; - AbilityMetaClearOverrideParam = 5; - AbilityMetaReinitOverridemap = 6; - AbilityMetaGlobalFloatValue = 7; - AbilityMetaClearGlobalFloatValue = 8; - AbilityMetaAbilityElementStrength = 9; - AbilityMetaAddOrGetAbilityAndTrigger = 10; - AbilityMetaSetKilledSetate = 11; - AbilityMetaSetAbilityTrigger = 12; - AbilityMetaAddNewAbility = 13; - AbilityMetaRemoveAbility = 14; - AbilityMetaSetModifierApplyEntity = 15; - AbilityMetaModifierDurabilityChange = 16; - AbilityMetaElementReactionVisual = 17; - AbilityMetaSetPoseParameter = 18; - AbilityMetaUpdateBaseReactionDamage = 19; - AbilityActionTriggerAbility = 50; - AbilityActionSetCrashDamage = 51; - AbilityActionEffect = 52; - AbilityActionSummon = 53; - AbilityActionBlink = 54; - AbilityActionCreateGadget = 55; - AbilityActionApplyLevelModifier = 56; - AbilityActionGenerateElemBall = 57; - AbilityActionSetRandomOverrideMapValue = 58; - AbilityActionServerMonsterLog = 59; - AbilityMixinAvatarSteerByCamera = 100; - AbilityMixinMonsterDefend = 101; - AbilityMixinWindZone = 102; - AbilityMixinCostStamina = 103; - AbilityMixinEliteShield = 104; - AbilityMixinElementShield = 105; - AbilityMixinGlobalShield = 106; - AbilityMixinShieldBar = 107; - AbilityMixinWindSeedSpawner = 108; - AbilityMixinDoActionByElementReaction = 109; - AbilityMixinFieldEntityCountChange = 110; - AbilityMixinScenePropSync = 111; -} diff --git a/proto/AbilityInvokeEntry.proto b/proto/AbilityInvokeEntry.proto deleted file mode 100644 index 9a3104312..000000000 --- a/proto/AbilityInvokeEntry.proto +++ /dev/null @@ -1,17 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AbilityInvokeArgument.proto"; -import "AbilityInvokeEntryHead.proto"; -import "ForwardType.proto"; - -message AbilityInvokeEntry { - AbilityInvokeEntryHead head = 1; - AbilityInvokeArgument argumentType = 2; - bytes abilityData = 3; - uint32 entityId = 4; - ForwardType forwardType = 5; - uint32 forwardPeer = 6; - uint32 eventId = 7; -} diff --git a/proto/AbilityInvokeEntryHead.proto b/proto/AbilityInvokeEntryHead.proto deleted file mode 100644 index de7196cd1..000000000 --- a/proto/AbilityInvokeEntryHead.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AbilityInvokeEntryHead { - uint32 instancedAbilityId = 1; - uint32 instancedModifierId = 2; - int32 localId = 3; - int32 modifierConfigLocalId = 4; - uint32 targetId = 5; - bool isServerbuffModifier = 6; - uint32 serverBuffUid = 7; -} diff --git a/proto/AbilityMixinRecoverInfo.proto b/proto/AbilityMixinRecoverInfo.proto deleted file mode 100644 index a23f0d401..000000000 --- a/proto/AbilityMixinRecoverInfo.proto +++ /dev/null @@ -1,16 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "MassivePropSyncInfo.proto"; - -message AbilityMixinRecoverInfo { - oneof source { - uint32 instancedAbilityId = 1; - uint32 instancedModifierId = 2; - } - uint32 localId = 3; - repeated uint32 dataList = 4; - bool isServerbuffModifier = 5; - repeated MassivePropSyncInfo massivePropList = 6; -} diff --git a/proto/AbilityScalarType.proto b/proto/AbilityScalarType.proto deleted file mode 100644 index 9f5ce167f..000000000 --- a/proto/AbilityScalarType.proto +++ /dev/null @@ -1,13 +0,0 @@ -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; -} diff --git a/proto/AbilityScalarValueEntry.proto b/proto/AbilityScalarValueEntry.proto deleted file mode 100644 index 7455d9901..000000000 --- a/proto/AbilityScalarValueEntry.proto +++ /dev/null @@ -1,17 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AbilityScalarType.proto"; -import "AbilityString.proto"; - -message AbilityScalarValueEntry { - AbilityString key = 1; - AbilityScalarType valueType = 2; - oneof value { - float floatValue = 3; - string stringValue = 4; - int32 intValue = 5; - uint32 uintValue = 6; - } -} diff --git a/proto/AbilityString.proto b/proto/AbilityString.proto deleted file mode 100644 index 1e8254aa8..000000000 --- a/proto/AbilityString.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AbilityString { - oneof type { - string str = 1; - uint32 hash = 2; - } -} diff --git a/proto/AbilitySyncStateInfo.proto b/proto/AbilitySyncStateInfo.proto deleted file mode 100644 index ec103e22e..000000000 --- a/proto/AbilitySyncStateInfo.proto +++ /dev/null @@ -1,16 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AbilityAppliedAbility.proto"; -import "AbilityAppliedModifier.proto"; -import "AbilityMixinRecoverInfo.proto"; -import "AbilityScalarValueEntry.proto"; - -message AbilitySyncStateInfo { - bool isInited = 1; - repeated AbilityScalarValueEntry dynamicValueMap = 2; - repeated AbilityAppliedAbility appliedAbilities = 3; - repeated AbilityAppliedModifier appliedModifiers = 4; - repeated AbilityMixinRecoverInfo mixinRecoverInfos = 5; -} diff --git a/proto/ActionReasonType.proto b/proto/ActionReasonType.proto deleted file mode 100644 index 29f2639e4..000000000 --- a/proto/ActionReasonType.proto +++ /dev/null @@ -1,179 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum ActionReasonType { - ActionReasonNone = 0; - ActionReasonQuestItem = 1; - ActionReasonQuestReward = 2; - ActionReasonTrifle = 3; - ActionReasonShop = 4; - ActionReasonPlayerUpgradeReward = 5; - ActionReasonAddAvatar = 6; - ActionReasonGadgetEnvAnimal = 7; - ActionReasonMonsterEnvAnimal = 8; - ActionReasonCompound = 9; - ActionReasonCook = 10; - ActionReasonGather = 11; - ActionReasonMailAttachment = 12; - ActionReasonCityLevelupReturn = 15; - ActionReasonCityLevelupReward = 17; - ActionReasonAreaExploreReward = 18; - ActionReasonUnlockPointReward = 19; - ActionReasonDungeonFirstPass = 20; - ActionReasonDungeonPass = 21; - ActionReasonChangeElemType = 23; - ActionReasonFetterOpen = 25; - ActionReasonDailyTaskScore = 26; - ActionReasonDailyTaskHost = 27; - ActionReasonRandTaskHost = 28; - ActionReasonExpedition = 29; - ActionReasonGacha = 30; - ActionReasonCombine = 31; - ActionReasonRandTaskGuest = 32; - ActionReasonDailyTaskGuest = 33; - ActionReasonForgeOutput = 34; - ActionReasonForgeReturn = 35; - ActionReasonInitAvatar = 36; - ActionReasonMonsterDie = 37; - ActionReasonGm = 38; - ActionReasonOpenChest = 39; - ActionReasonGadgetDie = 40; - ActionReasonMonsterChangeHp = 41; - ActionReasonSubfieldDrop = 42; - ActionReasonPushTipsReward = 43; - ActionReasonActivityMonsterDrop = 44; - ActionReasonActivityGather = 45; - ActionReasonActivitySubfieldDrop = 46; - ActionReasonTowerScheduleReward = 47; - ActionReasonTowerFloorStarReward = 48; - ActionReasonTowerFirstPassReward = 49; - ActionReasonTowerDailyReward = 50; - ActionReasonHitClientTrivialEntity = 51; - ActionReasonOpenWorldBossChest = 52; - ActionReasonMaterialDeleteReturn = 53; - ActionReasonSignInReward = 54; - ActionReasonOpenBlossomChest = 55; - ActionReasonRecharge = 56; - ActionReasonBonusActivityReward = 57; - ActionReasonTowerCommemorativeReward = 58; - ActionReasonTowerSkipFloorReward = 59; - ActionReasonRechargeBonus = 60; - ActionReasonRechargeCard = 61; - ActionReasonRechargeCardDaily = 62; - ActionReasonRechargeCardReplace = 63; - ActionReasonRechargeCardReplaceFree = 64; - ActionReasonRechargePlayReplace = 65; - ActionReasonMpPlayTakeReward = 66; - ActionReasonActivityWatcher = 67; - ActionReasonSalesmanDeliverItem = 68; - ActionReasonSalesmanReward = 69; - ActionReasonRebate = 70; - ActionReasonMcoinExchangeHcoin = 71; - ActionReasonDailyTaskExchangeLegendaryKey = 72; - ActionReasonUnlockPersonLine = 73; - ActionReasonFetterLevelReward = 74; - ActionReasonBuyResin = 75; - ActionReasonRechargePackage = 76; - ActionReasonDeliveryDailyReward = 77; - ActionReasonCityReputationLevel = 78; - ActionReasonCityReputationQuest = 79; - ActionReasonCityReputationRequest = 80; - ActionReasonCityReputationExplore = 81; - ActionReasonOffergingLevel = 82; - ActionReasonRoutineHost = 83; - ActionReasonRoutineGuest = 84; - ActionReasonTreasureMapSpotToken = 89; - ActionReasonTreasureMapBonusLevelReward = 90; - ActionReasonTreasureMapMpReward = 91; - ActionReasonConvert = 92; - ActionReasonOverflowTransform = 93; - ActionReasonActivityAvatarSelectionReward = 96; - ActionReasonActivityWatcherBatch = 97; - ActionReasonHitTreeDrop = 98; - ActionReasonGetHomeLevelupReward = 99; - ActionReasonHomeDefaultFurniture = 100; - ActionReasonActivityCond = 101; - ActionReasonBattlePassNotify = 102; - ActionReasonPlayerUseItem = 1001; - ActionReasonDropItem = 1002; - ActionReasonWeaponUpgrade = 1011; - ActionReasonWeaponPromote = 1012; - ActionReasonWeaponAwaken = 1013; - ActionReasonRelicUpgrade = 1014; - ActionReasonAbility = 1015; - ActionReasonDungeonStatueDrop = 1016; - ActionReasonOfflineMsg = 1017; - ActionReasonAvatarUpgrade = 1018; - ActionReasonAvatarPromote = 1019; - ActionReasonQuestAction = 1021; - ActionReasonCityLevelup = 1022; - ActionReasonUpgradeSkill = 1024; - ActionReasonUnlockTalent = 1025; - ActionReasonUpgradeProudSkill = 1026; - ActionReasonPlayerLevelLimitUp = 1027; - ActionReasonDungeonDaily = 1028; - ActionReasonItemGiving = 1030; - ActionReasonForgeCost = 1031; - ActionReasonInvestigationReward = 1032; - ActionReasonInvestigationTargetReward = 1033; - ActionReasonGadgetInteract = 1034; - ActionReasonSeaLampCiMaterial = 1036; - ActionReasonSeaLampContributionReward = 1037; - ActionReasonSeaLampPhaseReward = 1038; - ActionReasonSeaLampFlyLamp = 1039; - ActionReasonAutoRecover = 1040; - ActionReasonActivityExpireItem = 1041; - ActionReasonSubCoinNegative = 1042; - ActionReasonBargainDeduct = 1043; - ActionReasonBattlePassPaidReward = 1044; - ActionReasonBattlePassLevelReward = 1045; - ActionReasonTrialAvatarActivityFirstPassReward = 1046; - ActionReasonBuyBattlePassLevel = 1047; - ActionReasonGrantBirthdayBenefit = 1048; - ActionReasonAchievementReward = 1049; - ActionReasonAchievementGoalReward = 1050; - ActionReasonFirstShareToSocialNetwork = 1051; - ActionReasonDestroyMaterial = 1052; - ActionReasonCodexLevelupReward = 1053; - ActionReasonHuntingOfferReward = 1054; - ActionReasonUseWidgetAnchorPoint = 1055; - ActionReasonUseWidgetBonfire = 1056; - ActionReasonUngradeWeaponReturnMaterial = 1057; - ActionReasonUseWidgetOneoffGatherPointDetector = 1058; - ActionReasonUseWidgetClientCollector = 1059; - ActionReasonUseWidgetClientDetector = 1060; - ActionReasonTakeGeneralReward = 1061; - ActionReasonAsterTakeSpecialReward = 1062; - ActionReasonRemoveCodexBook = 1063; - ActionReasonOfferingItem = 1064; - ActionReasonUseWidgetGadgetBuilder = 1065; - ActionReasonEffigyFirstPassReward = 1066; - ActionReasonEffigyReward = 1067; - ActionReasonReunionFirstGiftReward = 1068; - ActionReasonReunionSignInReward = 1069; - ActionReasonReunionWatcherReward = 1070; - ActionReasonSalesmanMpReward = 1071; - ActionReasionAvatarPromoteReward = 1072; - ActionReasonBlessingRedeemReward = 1073; - ActionMiracleRingReward = 1074; - ActionReasonExpeditionReward = 1075; - ActionReasonTreasureMapRemoveDetector = 1076; - ActionReasonMechanicusDungeonTicket = 1077; - ActionReasonMechanicusLevelupGear = 1078; - ActionReasonMechanicusBattleSettle = 1079; - ActionReasonRegionSearchReward = 1080; - ActionReasonUnlockCoopChapter = 1081; - ActionReasonTakeCoopReward = 1082; - ActionReasonFleurFairDungeonReward = 1083; - ActionReasonActivityScore = 1084; - ActionReasonChannellerSlabOneoffDungeonReward = 1085; - ActionReasonFurnitureMakeStart = 1086; - ActionReasonFurnitureMakeTake = 1087; - ActionReasonFurnitureMakeCancel = 1088; - ActionReasonFurnitureMakeFastFinish = 1089; - ActionReasonChannellerSlabLoopDungeonFirstPassReward = 1090; - ActionReasonChannellerSlabLoopDungeonScoreReward = 1091; - ActionReasonHomeLimitedShopBuy = 1092; - ActionReasonHomeCoinCollect = 1093; -} diff --git a/proto/ActivityInfo.proto b/proto/ActivityInfo.proto deleted file mode 100644 index 836f7d126..000000000 --- a/proto/ActivityInfo.proto +++ /dev/null @@ -1,47 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "ActivityNullDetailInfo.proto"; -import "ActivityWatcherInfo.proto"; - -message ActivityInfo { - uint32 activityId = 1; - uint32 scheduleId = 2; - uint32 beginTime = 3; - uint32 endTime = 4; - uint32 activityType = 5; - bool isPlayOpenAnim = 6; - bool isFinished = 7; - bool isStarting = 8; - repeated ActivityWatcherInfo watcherInfoList = 9; - repeated uint32 meetCondList = 10; - repeated uint32 expireCondList = 15; - uint32 selectedAvatarRewardId = 17; - map activityCoinMap = 18; - uint32 scoreLimit = 19; - uint32 curScore = 20; - repeated uint32 takenRewardList = 24; - oneof detail { - ActivityNullDetailInfo samLampInfo = 11; - ActivityNullDetailInfo crucibleInfo = 12; - ActivityNullDetailInfo salesmanInfo = 13; - ActivityNullDetailInfo trialAvatarInfo = 14; - ActivityNullDetailInfo deliveryInfo = 16; - ActivityNullDetailInfo asterInfo = 21; - ActivityNullDetailInfo flightInfo = 25; - ActivityNullDetailInfo dragonSpineInfo = 31; - ActivityNullDetailInfo effigyInfo = 32; - ActivityNullDetailInfo treasureMapInfo = 35; - ActivityNullDetailInfo blessingInfo = 41; - ActivityNullDetailInfo seaLampInfo = 42; - ActivityNullDetailInfo expeditionInfo = 43; - ActivityNullDetailInfo arenaChallengeInfo = 44; - ActivityNullDetailInfo fleurFairInfo = 51; - ActivityNullDetailInfo waterSpiritInfo = 52; - ActivityNullDetailInfo challnelerSlabInfo = 61; - ActivityNullDetailInfo mistTrialActivityInfo = 62; - ActivityNullDetailInfo hideAndSeekInfo = 63; - ActivityNullDetailInfo findHilichurlInfo = 64; - } -} diff --git a/proto/ActivityNullDetailInfo.proto b/proto/ActivityNullDetailInfo.proto deleted file mode 100644 index 90ee7844e..000000000 --- a/proto/ActivityNullDetailInfo.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ActivityNullDetailInfo { - -} diff --git a/proto/ActivityWatcherInfo.proto b/proto/ActivityWatcherInfo.proto deleted file mode 100644 index eb4e0058f..000000000 --- a/proto/ActivityWatcherInfo.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ActivityWatcherInfo { - uint32 watcherId = 1; - uint32 curProgress = 2; - uint32 totalProgress = 3; - bool isTakenReward = 4; -} diff --git a/proto/AiSkillCdInfo.proto b/proto/AiSkillCdInfo.proto deleted file mode 100644 index ad5f072df..000000000 --- a/proto/AiSkillCdInfo.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AiSkillCdInfo { - map skillCdMap = 1; - map skillGroupCdMap = 2; -} diff --git a/proto/AiSyncInfo.proto b/proto/AiSyncInfo.proto deleted file mode 100644 index 1dc25b8fd..000000000 --- a/proto/AiSyncInfo.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AiSyncInfo { - uint32 entityId = 1; - bool hasPathToTarget = 2; -} diff --git a/proto/AiThreatInfo.proto b/proto/AiThreatInfo.proto deleted file mode 100644 index eb4ceeb46..000000000 --- a/proto/AiThreatInfo.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AiThreatInfo { - map aiThreatMap = 1; -} diff --git a/proto/AnimatorParameterValueInfo.proto b/proto/AnimatorParameterValueInfo.proto deleted file mode 100644 index 0735f5154..000000000 --- a/proto/AnimatorParameterValueInfo.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AnimatorParameterValueInfo { - uint32 paraType = 1; - int32 intVal = 2; - float floatVal = 3; - bool boolVal = 4; -} diff --git a/proto/AnimatorParameterValueInfoPair.proto b/proto/AnimatorParameterValueInfoPair.proto deleted file mode 100644 index 1ead0b9a7..000000000 --- a/proto/AnimatorParameterValueInfoPair.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AnimatorParameterValueInfo.proto"; - -message AnimatorParameterValueInfoPair { - int32 name = 1; - AnimatorParameterValueInfo animatorPara = 2; -} diff --git a/proto/AskAddFriendNotify.proto b/proto/AskAddFriendNotify.proto deleted file mode 100644 index ab5f6ef26..000000000 --- a/proto/AskAddFriendNotify.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "FriendBrief.proto"; - -message AskAddFriendNotify { - uint32 targetUid = 1; - FriendBrief targetFriendBrief = 2; -} diff --git a/proto/AskAddFriendReq.proto b/proto/AskAddFriendReq.proto deleted file mode 100644 index ac8a9083e..000000000 --- a/proto/AskAddFriendReq.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AskAddFriendReq { - uint32 targetUid = 1; -} diff --git a/proto/AskAddFriendRsp.proto b/proto/AskAddFriendRsp.proto deleted file mode 100644 index 4893ea28a..000000000 --- a/proto/AskAddFriendRsp.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AskAddFriendRsp { - int32 retcode = 1; - uint32 targetUid = 2; - uint32 param = 3; -} diff --git a/proto/AttackHitEffectResult.proto b/proto/AttackHitEffectResult.proto deleted file mode 100644 index d997b7ab3..000000000 --- a/proto/AttackHitEffectResult.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AttackHitEffectResult { - uint32 hitEffLevel = 1; - float retreatStrength = 2; - float airStrength = 3; - float hitHaltTime = 4; - float hitHaltTimeScale = 5; - uint32 originalHitEffLevel = 6; -} diff --git a/proto/AttackResult.proto b/proto/AttackResult.proto deleted file mode 100644 index 9b1498718..000000000 --- a/proto/AttackResult.proto +++ /dev/null @@ -1,40 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AbilityIdentifier.proto"; -import "AttackHitEffectResult.proto"; -import "HitCollision.proto"; -import "Vector.proto"; - -message AttackResult { - uint32 attackerId = 1; - uint32 defenseId = 2; - string animEventId = 3; - AbilityIdentifier abilityIdentifier = 4; - float damage = 6; - bool isCrit = 7; - HitCollision hitCollision = 8; - uint32 hitPosType = 9; - uint32 endureBreak = 10; - Vector resolvedDir = 11; - int32 hitRetreatAngleCompat = 12; - AttackHitEffectResult hitEffResult = 13; - uint32 elementType = 14; - bool useGadgetDamageAction = 19; - uint32 gadgetDamageActionIdx = 20; - bool isResistText = 22; - uint32 criticalRand = 23; - float elementAmplifyRate = 24; - float damageShield = 26; - bool muteElementHurt = 27; - uint32 amplifyReactionType = 30; - uint32 addhurtReactionType = 31; - uint32 bulletFlyTimeMs = 32; - uint32 attackCount = 33; - uint32 hashedAnimEventId = 34; - uint32 attackTimestampMs = 36; - float endureDelta = 37; - uint32 targetType = 38; - float elementDurabilityAttenuation = 39; -} diff --git a/proto/AvatarAddNotify.proto b/proto/AvatarAddNotify.proto deleted file mode 100644 index 1bbd17d19..000000000 --- a/proto/AvatarAddNotify.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AvatarInfo.proto"; - -message AvatarAddNotify { - AvatarInfo avatar = 1; - bool isInTeam = 2; -} diff --git a/proto/AvatarChangeCostumeNotify.proto b/proto/AvatarChangeCostumeNotify.proto deleted file mode 100644 index 86a64ad1e..000000000 --- a/proto/AvatarChangeCostumeNotify.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "SceneEntityInfo.proto"; - -message AvatarChangeCostumeNotify { - SceneEntityInfo entity = 1; -} diff --git a/proto/AvatarChangeCostumeReq.proto b/proto/AvatarChangeCostumeReq.proto deleted file mode 100644 index 6a83f9497..000000000 --- a/proto/AvatarChangeCostumeReq.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AvatarChangeCostumeReq { - uint64 avatarGuid = 1; - uint32 costumeId = 2; -} diff --git a/proto/AvatarChangeCostumeRsp.proto b/proto/AvatarChangeCostumeRsp.proto deleted file mode 100644 index a5a3490c1..000000000 --- a/proto/AvatarChangeCostumeRsp.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AvatarChangeCostumeRsp { - uint32 retcode = 1; - uint64 avatarGuid = 2; - uint32 costumeId = 3; -} diff --git a/proto/AvatarDataNotify.proto b/proto/AvatarDataNotify.proto deleted file mode 100644 index 356d972bc..000000000 --- a/proto/AvatarDataNotify.proto +++ /dev/null @@ -1,16 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AvatarInfo.proto"; -import "AvatarTeam.proto"; - -message AvatarDataNotify { - repeated AvatarInfo avatarList = 1; - map avatarTeamMap = 2; - uint32 curAvatarTeamId = 3; - fixed64 chooseAvatarGuid = 4; - repeated uint64 tempAvatarGuidList = 5; - repeated uint32 ownedFlycloakList = 6; - repeated uint32 ownedCostumeList = 7; -} diff --git a/proto/AvatarDieAnimationEndReq.proto b/proto/AvatarDieAnimationEndReq.proto deleted file mode 100644 index 06bb7b3a8..000000000 --- a/proto/AvatarDieAnimationEndReq.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "Vector.proto"; - -message AvatarDieAnimationEndReq { - uint64 dieGuid = 1; - uint32 skillId = 2; - Vector rebornPos = 3; -} diff --git a/proto/AvatarDieAnimationEndRsp.proto b/proto/AvatarDieAnimationEndRsp.proto deleted file mode 100644 index ac0f1eabb..000000000 --- a/proto/AvatarDieAnimationEndRsp.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AvatarDieAnimationEndRsp { - int32 retcode = 1; - uint64 dieGuid = 2; - uint32 skillId = 3; -} diff --git a/proto/AvatarEnterSceneInfo.proto b/proto/AvatarEnterSceneInfo.proto deleted file mode 100644 index c4f15d55b..000000000 --- a/proto/AvatarEnterSceneInfo.proto +++ /dev/null @@ -1,17 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AbilitySyncStateInfo.proto"; -import "ServerBuff.proto"; - -message AvatarEnterSceneInfo { - uint64 avatarGuid = 1; - uint32 avatarEntityId = 2; - AbilitySyncStateInfo avatarAbilityInfo = 3; - repeated uint32 buffIdList = 4; - uint64 weaponGuid = 5; - uint32 weaponEntityId = 6; - AbilitySyncStateInfo weaponAbilityInfo = 7; - repeated ServerBuff serverBuffList = 8; -} diff --git a/proto/AvatarEquipAffixInfo.proto b/proto/AvatarEquipAffixInfo.proto deleted file mode 100644 index 7e05f57b2..000000000 --- a/proto/AvatarEquipAffixInfo.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AvatarEquipAffixInfo { - uint32 equipAffixId = 1; - uint32 leftCdTime = 2; -} diff --git a/proto/AvatarEquipChangeNotify.proto b/proto/AvatarEquipChangeNotify.proto deleted file mode 100644 index bc6532fdb..000000000 --- a/proto/AvatarEquipChangeNotify.proto +++ /dev/null @@ -1,15 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "SceneReliquaryInfo.proto"; -import "SceneWeaponInfo.proto"; - -message AvatarEquipChangeNotify { - uint64 avatarGuid = 1; - uint32 equipType = 2; - uint32 itemId = 3; - uint64 equipGuid = 4; - SceneWeaponInfo weapon = 5; - SceneReliquaryInfo reliquary = 6; -} diff --git a/proto/AvatarExpeditionState.proto b/proto/AvatarExpeditionState.proto deleted file mode 100644 index 0753dd618..000000000 --- a/proto/AvatarExpeditionState.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum AvatarExpeditionState { - AvatarExpeditionNone = 0; - AvatarExpeditionDoing = 1; - AvatarExpeditionFinishWaitReward = 2; - AvatarExpeditionCallbackWaitReward = 3; -} diff --git a/proto/AvatarFetterInfo.proto b/proto/AvatarFetterInfo.proto deleted file mode 100644 index 408e7acc4..000000000 --- a/proto/AvatarFetterInfo.proto +++ /dev/null @@ -1,14 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "FetterData.proto"; - -message AvatarFetterInfo { - uint32 expNumber = 1; - uint32 expLevel = 2; - repeated uint32 openIdList = 3; - repeated uint32 finishIdList = 4; - repeated uint32 rewardedFetterLevelList = 5; - repeated FetterData fetterList = 6; -} diff --git a/proto/AvatarFightPropNotify.proto b/proto/AvatarFightPropNotify.proto deleted file mode 100644 index 8d24011b8..000000000 --- a/proto/AvatarFightPropNotify.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AvatarFightPropNotify { - uint64 avatarGuid = 1; - map fightPropMap = 2; -} diff --git a/proto/AvatarFightPropUpdateNotify.proto b/proto/AvatarFightPropUpdateNotify.proto deleted file mode 100644 index 040c7d0c8..000000000 --- a/proto/AvatarFightPropUpdateNotify.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AvatarFightPropUpdateNotify { - uint64 avatarGuid = 1; - map fightPropMap = 2; -} diff --git a/proto/AvatarFlycloakChangeNotify.proto b/proto/AvatarFlycloakChangeNotify.proto deleted file mode 100644 index 4d7d35347..000000000 --- a/proto/AvatarFlycloakChangeNotify.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AvatarFlycloakChangeNotify { - uint64 avatarGuid = 1; - uint32 flycloakId = 2; -} diff --git a/proto/AvatarGainCostumeNotify.proto b/proto/AvatarGainCostumeNotify.proto deleted file mode 100644 index 54ef728ee..000000000 --- a/proto/AvatarGainCostumeNotify.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AvatarGainCostumeNotify { - uint32 costumeId = 1; -} diff --git a/proto/AvatarGainFlycloakNotify.proto b/proto/AvatarGainFlycloakNotify.proto deleted file mode 100644 index d21a9cbe3..000000000 --- a/proto/AvatarGainFlycloakNotify.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AvatarGainFlycloakNotify { - uint32 flycloakId = 1; -} diff --git a/proto/AvatarInfo.proto b/proto/AvatarInfo.proto deleted file mode 100644 index f3ab4ccc1..000000000 --- a/proto/AvatarInfo.proto +++ /dev/null @@ -1,37 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AvatarEquipAffixInfo.proto"; -import "AvatarExpeditionState.proto"; -import "AvatarFetterInfo.proto"; -import "AvatarSkillInfo.proto"; -import "PropValue.proto"; -import "TrialAvatarInfo.proto"; - -message AvatarInfo { - uint32 avatarId = 1; - uint64 guid = 2; - map propMap = 3; - uint32 lifeState = 4; - repeated uint64 equipGuidList = 5; - repeated uint32 talentIdList = 6; - map fightPropMap = 7; - TrialAvatarInfo trialAvatarInfoField = 9; - map skillMap = 10; - uint32 skillDepotId = 11; - AvatarFetterInfo fetterInfo = 12; - uint32 coreProudSkillLevel = 13; - repeated uint32 inherentProudSkillList = 14; - map skillLevelMap = 15; - AvatarExpeditionState expeditionState = 16; - map proudSkillExtraLevel = 17; - bool isFocusFieldNumber = 18; - uint32 avatarType = 19; - repeated uint32 teamResonanceList = 20; - uint32 wearingFlycloakId = 21; - repeated AvatarEquipAffixInfo equipAffixList = 22; - uint32 bornTime = 23; - repeated uint32 pendingPromoteRewardListFieldNumber = 24; - uint32 costumeId = 25; -} diff --git a/proto/AvatarLifeStateChangeNotify.proto b/proto/AvatarLifeStateChangeNotify.proto deleted file mode 100644 index 0bf816006..000000000 --- a/proto/AvatarLifeStateChangeNotify.proto +++ /dev/null @@ -1,14 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "PlayerDieType.proto"; - -message AvatarLifeStateChangeNotify { - uint64 avatarGuid = 1; - uint32 lifeState = 2; - uint32 sourceEntityId = 3; - string attackTag = 4; - PlayerDieType dieType = 5; - uint32 moveReliableSeq = 6; -} diff --git a/proto/AvatarPromoteReq.proto b/proto/AvatarPromoteReq.proto deleted file mode 100644 index 863ab835c..000000000 --- a/proto/AvatarPromoteReq.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AvatarPromoteReq { - uint64 guid = 1; -} diff --git a/proto/AvatarPromoteRsp.proto b/proto/AvatarPromoteRsp.proto deleted file mode 100644 index e64b9c9bc..000000000 --- a/proto/AvatarPromoteRsp.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AvatarPromoteRsp { - int32 retcode = 1; - uint64 guid = 2; -} diff --git a/proto/AvatarPropNotify.proto b/proto/AvatarPropNotify.proto deleted file mode 100644 index 231008dd6..000000000 --- a/proto/AvatarPropNotify.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AvatarPropNotify { - uint64 avatarGuid = 1; - map propMap = 2; -} diff --git a/proto/AvatarSkillChangeNotify.proto b/proto/AvatarSkillChangeNotify.proto deleted file mode 100644 index 066412687..000000000 --- a/proto/AvatarSkillChangeNotify.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AvatarSkillChangeNotify { - uint64 avatarGuid = 1; - uint32 entityId = 2; - uint32 skillDepotId = 3; - uint32 avatarSkillId = 4; - uint32 oldLevel = 5; - uint32 curLevel = 6; -} diff --git a/proto/AvatarSkillInfo.proto b/proto/AvatarSkillInfo.proto deleted file mode 100644 index 27417caf4..000000000 --- a/proto/AvatarSkillInfo.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AvatarSkillInfo { - uint32 passCdTime = 1; - repeated uint32 fullCdTimeList = 2; - uint32 maxChargeCount = 3; -} diff --git a/proto/AvatarSkillUpgradeReq.proto b/proto/AvatarSkillUpgradeReq.proto deleted file mode 100644 index 01e78e2b2..000000000 --- a/proto/AvatarSkillUpgradeReq.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AvatarSkillUpgradeReq { - uint64 avatarGuid = 1; - uint32 avatarSkillId = 2; - uint32 oldLevel = 3; -} diff --git a/proto/AvatarSkillUpgradeRsp.proto b/proto/AvatarSkillUpgradeRsp.proto deleted file mode 100644 index a7942f5dd..000000000 --- a/proto/AvatarSkillUpgradeRsp.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AvatarSkillUpgradeRsp { - int32 retcode = 1; - uint64 avatarGuid = 2; - uint32 avatarSkillId = 3; - uint32 oldLevel = 4; - uint32 curLevel = 5; -} diff --git a/proto/AvatarTeam.proto b/proto/AvatarTeam.proto deleted file mode 100644 index 0ca666f00..000000000 --- a/proto/AvatarTeam.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AvatarTeam { - repeated uint64 avatarGuidList = 1; - string teamName = 2; -} diff --git a/proto/AvatarTeamResonanceInfo.proto b/proto/AvatarTeamResonanceInfo.proto deleted file mode 100644 index beae1d212..000000000 --- a/proto/AvatarTeamResonanceInfo.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AvatarTeamResonanceInfo { - uint32 entityId = 1; - uint64 avatarGuid = 2; - repeated uint32 addTeamResonanceIdList = 3; - repeated uint32 delTeamResonanceIdList = 4; -} diff --git a/proto/AvatarTeamUpdateNotify.proto b/proto/AvatarTeamUpdateNotify.proto deleted file mode 100644 index b68f7ce78..000000000 --- a/proto/AvatarTeamUpdateNotify.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AvatarTeam.proto"; - -message AvatarTeamUpdateNotify { - map avatarTeamMap = 1; - repeated uint64 tempAvatarGuidList = 2; -} diff --git a/proto/AvatarUnlockTalentNotify.proto b/proto/AvatarUnlockTalentNotify.proto deleted file mode 100644 index 91500c3fe..000000000 --- a/proto/AvatarUnlockTalentNotify.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AvatarUnlockTalentNotify { - uint64 avatarGuid = 1; - uint32 entityId = 2; - uint32 talentId = 3; - uint32 skillDepotId = 4; -} diff --git a/proto/AvatarUpgradeReq.proto b/proto/AvatarUpgradeReq.proto deleted file mode 100644 index 7ad936c07..000000000 --- a/proto/AvatarUpgradeReq.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AvatarUpgradeReq { - uint32 itemId = 1; - uint32 count = 2; - uint64 avatarGuid = 3; -} diff --git a/proto/AvatarUpgradeRsp.proto b/proto/AvatarUpgradeRsp.proto deleted file mode 100644 index 0d50cfab0..000000000 --- a/proto/AvatarUpgradeRsp.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AvatarUpgradeRsp { - int32 retcode = 1; - uint64 avatarGuid = 2; - uint32 oldLevel = 3; - uint32 curLevel = 4; - map oldFightPropMap = 5; - map curFightPropMap = 6; -} diff --git a/proto/AvatarWearFlycloakReq.proto b/proto/AvatarWearFlycloakReq.proto deleted file mode 100644 index 92b067f98..000000000 --- a/proto/AvatarWearFlycloakReq.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AvatarWearFlycloakReq { - uint64 avatarGuid = 1; - uint32 flycloakId = 2; -} diff --git a/proto/AvatarWearFlycloakRsp.proto b/proto/AvatarWearFlycloakRsp.proto deleted file mode 100644 index 78d179fa6..000000000 --- a/proto/AvatarWearFlycloakRsp.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message AvatarWearFlycloakRsp { - int32 retcode = 1; - uint64 avatarGuid = 2; - uint32 flycloakId = 3; -} diff --git a/proto/Birthday.proto b/proto/Birthday.proto deleted file mode 100644 index b360bcfd2..000000000 --- a/proto/Birthday.proto +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 5905e3573..000000000 --- a/proto/BlockInfo.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message BlockInfo { - uint32 blockId = 1; - uint32 dataVersion = 2; - bytes binData = 3; - bool isDirty = 4; -} diff --git a/proto/CalcWeaponUpgradeReturnItemsReq.proto b/proto/CalcWeaponUpgradeReturnItemsReq.proto deleted file mode 100644 index be6bcd98b..000000000 --- a/proto/CalcWeaponUpgradeReturnItemsReq.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "ItemParam.proto"; - -message CalcWeaponUpgradeReturnItemsReq { - uint64 targetWeaponGuid = 1; - repeated uint64 foodWeaponGuidList = 2; - repeated ItemParam itemParamList = 3; -} diff --git a/proto/CalcWeaponUpgradeReturnItemsRsp.proto b/proto/CalcWeaponUpgradeReturnItemsRsp.proto deleted file mode 100644 index 5b0733d36..000000000 --- a/proto/CalcWeaponUpgradeReturnItemsRsp.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "ItemParam.proto"; - -message CalcWeaponUpgradeReturnItemsRsp { - int32 retcode = 1; - uint64 targetWeaponGuid = 2; - repeated ItemParam itemParamList = 3; -} diff --git a/proto/ChangeAvatarReq.proto b/proto/ChangeAvatarReq.proto deleted file mode 100644 index 8ef593ea7..000000000 --- a/proto/ChangeAvatarReq.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "Vector.proto"; - -message ChangeAvatarReq { - uint64 guid = 1; - uint32 skillId = 2; - bool isMove = 3; - Vector movePos = 4; -} diff --git a/proto/ChangeAvatarRsp.proto b/proto/ChangeAvatarRsp.proto deleted file mode 100644 index 08281c41a..000000000 --- a/proto/ChangeAvatarRsp.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ChangeAvatarRsp { - uint32 retcode = 1; - uint64 currGuid = 2; - uint32 skillId = 3; -} diff --git a/proto/ChangeGameTimeReq.proto b/proto/ChangeGameTimeReq.proto deleted file mode 100644 index 474c964de..000000000 --- a/proto/ChangeGameTimeReq.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ChangeGameTimeReq { - uint32 gameTime = 1; - bool isForceSet = 2; -} diff --git a/proto/ChangeGameTimeRsp.proto b/proto/ChangeGameTimeRsp.proto deleted file mode 100644 index 75c94a366..000000000 --- a/proto/ChangeGameTimeRsp.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ChangeGameTimeRsp { - int32 retcode = 1; - uint32 curGameTime = 2; -} diff --git a/proto/ChangeHpReason.proto b/proto/ChangeHpReason.proto deleted file mode 100644 index e56d9acc3..000000000 --- a/proto/ChangeHpReason.proto +++ /dev/null @@ -1,31 +0,0 @@ -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; -} diff --git a/proto/ChangeMpTeamAvatarReq.proto b/proto/ChangeMpTeamAvatarReq.proto deleted file mode 100644 index 8a90c871a..000000000 --- a/proto/ChangeMpTeamAvatarReq.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ChangeMpTeamAvatarReq { - repeated uint64 avatarGuidList = 1; - uint64 curAvatarGuid = 2; -} diff --git a/proto/ChangeMpTeamAvatarRsp.proto b/proto/ChangeMpTeamAvatarRsp.proto deleted file mode 100644 index ae0b49952..000000000 --- a/proto/ChangeMpTeamAvatarRsp.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ChangeMpTeamAvatarRsp { - int32 retcode = 1; - repeated uint64 avatarGuidList = 2; - uint64 curAvatarGuid = 3; -} diff --git a/proto/ChangeTeamNameReq.proto b/proto/ChangeTeamNameReq.proto deleted file mode 100644 index 87423b3dc..000000000 --- a/proto/ChangeTeamNameReq.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ChangeTeamNameReq { - int32 teamId = 1; - string teamName = 2; -} diff --git a/proto/ChangeTeamNameRsp.proto b/proto/ChangeTeamNameRsp.proto deleted file mode 100644 index 51607c66a..000000000 --- a/proto/ChangeTeamNameRsp.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ChangeTeamNameRsp { - int32 teamId = 1; - string teamName = 2; - int32 retcode = 3; -} diff --git a/proto/ChatInfo.proto b/proto/ChatInfo.proto deleted file mode 100644 index 7b47d7f28..000000000 --- a/proto/ChatInfo.proto +++ /dev/null @@ -1,18 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "SystemHint.proto"; - -message ChatInfo { - uint32 time = 1; - uint32 uid = 2; - uint32 sequence = 3; - uint32 toUid = 4; - bool isRead = 5; - oneof content { - string text = 100; - uint32 icon = 101; - SystemHint systemHint = 102; - } -} diff --git a/proto/ChooseCurAvatarTeamReq.proto b/proto/ChooseCurAvatarTeamReq.proto deleted file mode 100644 index bc9bd84c8..000000000 --- a/proto/ChooseCurAvatarTeamReq.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ChooseCurAvatarTeamReq { - uint32 teamId = 1; -} diff --git a/proto/ChooseCurAvatarTeamRsp.proto b/proto/ChooseCurAvatarTeamRsp.proto deleted file mode 100644 index 2a168a763..000000000 --- a/proto/ChooseCurAvatarTeamRsp.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ChooseCurAvatarTeamRsp { - int32 retcode = 1; - uint32 curTeamId = 2; -} diff --git a/proto/CityInfo.proto b/proto/CityInfo.proto deleted file mode 100644 index 8d6f31bf0..000000000 --- a/proto/CityInfo.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message CityInfo { - uint32 cityId = 1; - uint32 level = 2; - uint32 crystalNum = 3; -} diff --git a/proto/ClientAbilityChangeNotify.proto b/proto/ClientAbilityChangeNotify.proto deleted file mode 100644 index 19f1fd57b..000000000 --- a/proto/ClientAbilityChangeNotify.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AbilityInvokeEntry.proto"; - -message ClientAbilityChangeNotify { - uint32 entityId = 1; - repeated AbilityInvokeEntry invokes = 2; -} diff --git a/proto/ClientAbilityInitBeginNotify.proto b/proto/ClientAbilityInitBeginNotify.proto deleted file mode 100644 index 03bc7a630..000000000 --- a/proto/ClientAbilityInitBeginNotify.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ClientAbilityInitBeginNotify { - uint32 entityId = 1; -} diff --git a/proto/ClientAbilityInitFinishNotify.proto b/proto/ClientAbilityInitFinishNotify.proto deleted file mode 100644 index 1078434be..000000000 --- a/proto/ClientAbilityInitFinishNotify.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AbilityInvokeEntry.proto"; - -message ClientAbilityInitFinishNotify { - uint32 entityId = 1; - repeated AbilityInvokeEntry invokes = 2; -} diff --git a/proto/CombatInvocationsNotify.proto b/proto/CombatInvocationsNotify.proto deleted file mode 100644 index 8669d1a9a..000000000 --- a/proto/CombatInvocationsNotify.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "CombatInvokeEntry.proto"; - -message CombatInvocationsNotify { - repeated CombatInvokeEntry invokeList = 1; -} diff --git a/proto/CombatInvokeEntry.proto b/proto/CombatInvokeEntry.proto deleted file mode 100644 index 43e2eedaa..000000000 --- a/proto/CombatInvokeEntry.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "CombatTypeArgument.proto"; -import "ForwardType.proto"; - -message CombatInvokeEntry { - CombatTypeArgument argumentType = 1; - ForwardType forwardType = 2; - bytes combatData = 3; -} diff --git a/proto/CombatTypeArgument.proto b/proto/CombatTypeArgument.proto deleted file mode 100644 index ab5eef088..000000000 --- a/proto/CombatTypeArgument.proto +++ /dev/null @@ -1,21 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum CombatTypeArgument { - CombatNone = 0; - CombatEvtBeingHit = 1; - CombatAnimatorStateChanged = 2; - CombatFaceToDir = 3; - CombatSetAttackTarget = 4; - CombatRushMove = 5; - CombatAnimatorParameterChanged = 6; - EntityMove = 7; - SyncEntityPosition = 8; - CombatSteerMotionInfo = 9; - CombatForceSetPosInfo = 10; - CombatCompensatePosDiff = 11; - CombatMonsterDoBlink = 12; - CombatFixedRushMove = 13; - CombatSyncTransform = 14; -} diff --git a/proto/CoopCg.proto b/proto/CoopCg.proto deleted file mode 100644 index 5702ac651..000000000 --- a/proto/CoopCg.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message CoopCg { - uint32 id = 1; - bool isUnlock = 2; -} diff --git a/proto/CoopChapter.proto b/proto/CoopChapter.proto deleted file mode 100644 index 817f23533..000000000 --- a/proto/CoopChapter.proto +++ /dev/null @@ -1,21 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "CoopCg.proto"; -import "CoopChapterState.proto"; -import "CoopPoint.proto"; -import "CoopReward.proto"; - -message CoopChapter { - uint32 id = 1; - CoopChapterState state = 2; - repeated uint32 lockReasonList = 3; - repeated CoopPoint coopPointList = 4; - repeated CoopReward coopRewardList = 5; - repeated CoopCg coopCgList = 6; - uint32 totalEndCount = 7; - uint32 finishedEndCount = 8; - map seenEndingMap = 9; - repeated uint32 finishDialogList = 10; -} diff --git a/proto/CoopChapterState.proto b/proto/CoopChapterState.proto deleted file mode 100644 index 40ae5f2bd..000000000 --- a/proto/CoopChapterState.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum CoopChapterState { - Close = 0; - CondNotMeet = 1; - CondMeet = 2; - Accept = 3; -} diff --git a/proto/CoopDataNotify.proto b/proto/CoopDataNotify.proto deleted file mode 100644 index ea1ee81e7..000000000 --- a/proto/CoopDataNotify.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "CoopChapter.proto"; - -message CoopDataNotify { - repeated CoopChapter chapterList = 1; - bool isHaveProgress = 2; - uint32 curCoopPoint = 3; - repeated uint32 viewedChapterList = 4; -} diff --git a/proto/CoopPoint.proto b/proto/CoopPoint.proto deleted file mode 100644 index f5391440d..000000000 --- a/proto/CoopPoint.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "CoopPointState.proto"; - -message CoopPoint { - uint32 id = 1; - CoopPointState state = 2; - uint32 selfConfidence = 3; -} diff --git a/proto/CoopPointState.proto b/proto/CoopPointState.proto deleted file mode 100644 index 34288e2b5..000000000 --- a/proto/CoopPointState.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum CoopPointState { - Unstarted = 0; - Started = 1; - Finished = 2; -} diff --git a/proto/CoopReward.proto b/proto/CoopReward.proto deleted file mode 100644 index 47086cc76..000000000 --- a/proto/CoopReward.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "CoopRewardState.proto"; - -message CoopReward { - uint32 id = 1; - CoopRewardState state = 2; -} diff --git a/proto/CoopRewardState.proto b/proto/CoopRewardState.proto deleted file mode 100644 index 60b60d7a7..000000000 --- a/proto/CoopRewardState.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum CoopRewardState { - Unlock = 0; - Lock = 1; - Taken = 2; -} diff --git a/proto/CountDownDelete.proto b/proto/CountDownDelete.proto deleted file mode 100644 index fd394c44d..000000000 --- a/proto/CountDownDelete.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message CountDownDelete { - -} diff --git a/proto/DateTimeDelete.proto b/proto/DateTimeDelete.proto deleted file mode 100644 index 9af357326..000000000 --- a/proto/DateTimeDelete.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message DateTimeDelete { - -} diff --git a/proto/DealAddFriendReq.proto b/proto/DealAddFriendReq.proto deleted file mode 100644 index 5a0fa0878..000000000 --- a/proto/DealAddFriendReq.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "DealAddFriendResultType.proto"; - -message DealAddFriendReq { - uint32 targetUid = 1; - DealAddFriendResultType dealAddFriendResult = 2; -} diff --git a/proto/DealAddFriendResultType.proto b/proto/DealAddFriendResultType.proto deleted file mode 100644 index d9516f5cc..000000000 --- a/proto/DealAddFriendResultType.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum DealAddFriendResultType { - DealAddFriendReject = 0; - DealAddFriendAccept = 1; -} diff --git a/proto/DealAddFriendRsp.proto b/proto/DealAddFriendRsp.proto deleted file mode 100644 index 330c3b3ed..000000000 --- a/proto/DealAddFriendRsp.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "DealAddFriendResultType.proto"; - -message DealAddFriendRsp { - int32 retcode = 1; - uint32 targetUid = 2; - DealAddFriendResultType dealAddFriendResult = 3; -} diff --git a/proto/DelTeamEntityNotify.proto b/proto/DelTeamEntityNotify.proto deleted file mode 100644 index a5fbda5c1..000000000 --- a/proto/DelTeamEntityNotify.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message DelTeamEntityNotify { - uint32 sceneId = 1; - repeated uint32 delEntityIdList = 2; -} diff --git a/proto/DelayWeekCountDownDelete.proto b/proto/DelayWeekCountDownDelete.proto deleted file mode 100644 index 52c2c007e..000000000 --- a/proto/DelayWeekCountDownDelete.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message DelayWeekCountDownDelete { - -} diff --git a/proto/DeleteFriendNotify.proto b/proto/DeleteFriendNotify.proto deleted file mode 100644 index 224e411f4..000000000 --- a/proto/DeleteFriendNotify.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message DeleteFriendNotify { - uint32 targetUid = 1; -} diff --git a/proto/DeleteFriendReq.proto b/proto/DeleteFriendReq.proto deleted file mode 100644 index fa4b371a1..000000000 --- a/proto/DeleteFriendReq.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message DeleteFriendReq { - uint32 targetUid = 1; -} diff --git a/proto/DeleteFriendRsp.proto b/proto/DeleteFriendRsp.proto deleted file mode 100644 index 666e670d1..000000000 --- a/proto/DeleteFriendRsp.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message DeleteFriendRsp { - int32 retcode = 1; - uint32 targetUid = 2; -} diff --git a/proto/DestroyMaterialReq.proto b/proto/DestroyMaterialReq.proto deleted file mode 100644 index 6dad136b3..000000000 --- a/proto/DestroyMaterialReq.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "MaterialInfo.proto"; - -message DestroyMaterialReq { - repeated MaterialInfo materialList = 1; -} diff --git a/proto/DestroyMaterialRsp.proto b/proto/DestroyMaterialRsp.proto deleted file mode 100644 index edbad052f..000000000 --- a/proto/DestroyMaterialRsp.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message DestroyMaterialRsp { - int32 retcode = 1; - repeated uint32 itemIdList = 2; - repeated uint32 itemCountList = 3; -} diff --git a/proto/DoGachaReq.proto b/proto/DoGachaReq.proto deleted file mode 100644 index b841b5358..000000000 --- a/proto/DoGachaReq.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message DoGachaReq { - uint32 gachaType = 1; - uint32 gachaTimes = 2; - uint32 gachaRandom = 3; - uint32 gachaScheduleId = 4; - string gachaTag = 5; -} diff --git a/proto/DoGachaRsp.proto b/proto/DoGachaRsp.proto deleted file mode 100644 index 3aebde56c..000000000 --- a/proto/DoGachaRsp.proto +++ /dev/null @@ -1,20 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "GachaItem.proto"; - -message DoGachaRsp { - int32 retcode = 1; - uint32 gachaType = 2; - uint32 gachaTimes = 3; - uint32 gachaScheduleId = 4; - repeated GachaItem gachaItemList = 5; - uint32 newGachaRandom = 6; - uint32 costItemId = 7; - uint32 costItemNum = 8; - uint32 tenCostItemId = 9; - uint32 tenCostItemNum = 10; - uint32 leftGachaTimes = 11; - uint32 gachaTimesLimit = 12; -} diff --git a/proto/DropHintNotify.proto b/proto/DropHintNotify.proto deleted file mode 100644 index e0d7cf515..000000000 --- a/proto/DropHintNotify.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "Vector.proto"; - -message DropHintNotify { - repeated uint32 itemIdList = 1; - Vector position = 2; -} diff --git a/proto/DungeonEntryInfo.proto b/proto/DungeonEntryInfo.proto deleted file mode 100644 index 0af679a1e..000000000 --- a/proto/DungeonEntryInfo.proto +++ /dev/null @@ -1,17 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "WeeklyBossResinDiscountInfo.proto"; - -message DungeonEntryInfo { - uint32 dungeonId = 1; - bool isPassed = 2; - uint32 leftTimes = 3; - uint32 startTime = 4; - uint32 endTime = 5; - uint32 maxBossChestNum = 6; - uint32 bossChestNum = 7; - uint32 nextRefreshTime = 8; - WeeklyBossResinDiscountInfo weeklyBossResinDiscountInfo = 9; -} diff --git a/proto/DungeonEntryInfoReq.proto b/proto/DungeonEntryInfoReq.proto deleted file mode 100644 index 12557f4de..000000000 --- a/proto/DungeonEntryInfoReq.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message DungeonEntryInfoReq { - uint32 pointId = 1; -} diff --git a/proto/DungeonEntryInfoRsp.proto b/proto/DungeonEntryInfoRsp.proto deleted file mode 100644 index d83bcefe3..000000000 --- a/proto/DungeonEntryInfoRsp.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "DungeonEntryInfo.proto"; - -message DungeonEntryInfoRsp { - int32 retcode = 1; - uint32 pointId = 2; - repeated DungeonEntryInfo dungeonEntryList = 3; - uint32 recommendDungeonId = 4; -} diff --git a/proto/EnterSceneDoneRsp.proto b/proto/EnterSceneDoneRsp.proto deleted file mode 100644 index df1556787..000000000 --- a/proto/EnterSceneDoneRsp.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message EnterSceneDoneRsp { - int32 retcode = 1; - uint32 enterSceneToken = 2; -} diff --git a/proto/EnterScenePeerNotify.proto b/proto/EnterScenePeerNotify.proto deleted file mode 100644 index 17d5302e4..000000000 --- a/proto/EnterScenePeerNotify.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message EnterScenePeerNotify { - uint32 destSceneId = 1; - uint32 peerId = 2; - uint32 hostPeerId = 3; - uint32 EnterSceneToken = 4; -} diff --git a/proto/EnterSceneReadyRsp.proto b/proto/EnterSceneReadyRsp.proto deleted file mode 100644 index 6cde8d190..000000000 --- a/proto/EnterSceneReadyRsp.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message EnterSceneReadyRsp { - int32 retcode = 1; - uint32 enterSceneToken = 2; -} diff --git a/proto/EnterType.proto b/proto/EnterType.proto deleted file mode 100644 index 6794046b2..000000000 --- a/proto/EnterType.proto +++ /dev/null @@ -1,17 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum EnterType { - EnterNone = 0; - EnterSelf = 1; - EnterGoto = 2; - EnterJump = 3; - EnterOther = 4; - EnterBack = 5; - EnterDungeon = 6; - EnterDungeonReplay = 7; - EnterGotoByPortal = 8; - EnterSelfHome = 9; - EnterOtherHome = 10; -} diff --git a/proto/EnterWorldAreaReq.proto b/proto/EnterWorldAreaReq.proto deleted file mode 100644 index d367117a2..000000000 --- a/proto/EnterWorldAreaReq.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message EnterWorldAreaReq { - uint32 areaType = 1; - uint32 areaId = 2; -} diff --git a/proto/EnterWorldAreaRsp.proto b/proto/EnterWorldAreaRsp.proto deleted file mode 100644 index e2cf96709..000000000 --- a/proto/EnterWorldAreaRsp.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message EnterWorldAreaRsp { - uint32 areaType = 2; - uint32 areaId = 3; -} diff --git a/proto/EntityAiSyncNotify.proto b/proto/EntityAiSyncNotify.proto deleted file mode 100644 index 3e2040d8a..000000000 --- a/proto/EntityAiSyncNotify.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AiSyncInfo.proto"; - -message EntityAiSyncNotify { - repeated AiSyncInfo infoList = 1; - repeated uint32 localAvatarAlertedMonsterList = 2; -} diff --git a/proto/EntityAuthorityInfo.proto b/proto/EntityAuthorityInfo.proto deleted file mode 100644 index aba660f04..000000000 --- a/proto/EntityAuthorityInfo.proto +++ /dev/null @@ -1,17 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AbilitySyncStateInfo.proto"; -import "AnimatorParameterValueInfoPair.proto"; -import "EntityRendererChangedInfo.proto"; -import "SceneEntityAiInfo.proto"; -import "Vector.proto"; - -message EntityAuthorityInfo { - AbilitySyncStateInfo abilityInfo = 1; - EntityRendererChangedInfo rendererChangedInfo = 2; - SceneEntityAiInfo aiInfo = 3; - Vector bornPos = 4; - repeated AnimatorParameterValueInfoPair poseParaList = 5; -} diff --git a/proto/EntityClientData.proto b/proto/EntityClientData.proto deleted file mode 100644 index df639c9d9..000000000 --- a/proto/EntityClientData.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message EntityClientData { - uint32 windChangeSceneTime = 1; - float windmillSyncAngle = 2; - int32 windChangeTargetLevel = 3; -} diff --git a/proto/EntityEnvironmentInfo.proto b/proto/EntityEnvironmentInfo.proto deleted file mode 100644 index 37ba46781..000000000 --- a/proto/EntityEnvironmentInfo.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message EntityEnvironmentInfo { - uint32 jsonClimateType = 1; - uint32 climateAreaId = 2; -} diff --git a/proto/EntityFightPropChangeReasonNotify.proto b/proto/EntityFightPropChangeReasonNotify.proto deleted file mode 100644 index 2bbda0603..000000000 --- a/proto/EntityFightPropChangeReasonNotify.proto +++ /dev/null @@ -1,15 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "ChangeHpReason.proto"; -import "PropChangeReason.proto"; - -message EntityFightPropChangeReasonNotify { - uint32 entityId = 1; - uint32 propType = 2; - float propDelta = 3; - PropChangeReason reason = 4; - repeated uint32 paramList = 5; - ChangeHpReason changeHpReason = 6; -} diff --git a/proto/EntityFightPropUpdateNotify.proto b/proto/EntityFightPropUpdateNotify.proto deleted file mode 100644 index d438a269a..000000000 --- a/proto/EntityFightPropUpdateNotify.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message EntityFightPropUpdateNotify { - uint32 entityId = 1; - map fightPropMap = 2; -} diff --git a/proto/EntityMoveInfo.proto b/proto/EntityMoveInfo.proto deleted file mode 100644 index 008533456..000000000 --- a/proto/EntityMoveInfo.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "MotionInfo.proto"; - -message EntityMoveInfo { - uint32 entityId = 1; - MotionInfo motionInfo = 2; - uint32 sceneTime = 3; - uint32 reliableSeq = 4; - bool isReliable = 5; -} diff --git a/proto/EntityPropNotify.proto b/proto/EntityPropNotify.proto deleted file mode 100644 index b2175f3b4..000000000 --- a/proto/EntityPropNotify.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "PropValue.proto"; - -message EntityPropNotify { - uint32 entityId = 1; - map propMap = 2; -} diff --git a/proto/EntityRendererChangedInfo.proto b/proto/EntityRendererChangedInfo.proto deleted file mode 100644 index 97141d9c2..000000000 --- a/proto/EntityRendererChangedInfo.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message EntityRendererChangedInfo { - map changedRenderers = 1; - uint32 visibilityCount = 2; - bool isCached = 3; -} diff --git a/proto/Equip.proto b/proto/Equip.proto deleted file mode 100644 index 2c57f6d2c..000000000 --- a/proto/Equip.proto +++ /dev/null @@ -1,14 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "Reliquary.proto"; -import "Weapon.proto"; - -message Equip { - oneof detail { - Reliquary reliquary = 1; - Weapon weapon = 2; - } - bool isLocked = 3; -} diff --git a/proto/EvtAiSyncCombatThreatInfoNotify.proto b/proto/EvtAiSyncCombatThreatInfoNotify.proto deleted file mode 100644 index 1ae707900..000000000 --- a/proto/EvtAiSyncCombatThreatInfoNotify.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AiThreatInfo.proto"; - -message EvtAiSyncCombatThreatInfoNotify { - map combatThreatInfoMap = 1; -} diff --git a/proto/EvtAiSyncSkillCdNotify.proto b/proto/EvtAiSyncSkillCdNotify.proto deleted file mode 100644 index 2e33a7c1e..000000000 --- a/proto/EvtAiSyncSkillCdNotify.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AiSkillCdInfo.proto"; - -message EvtAiSyncSkillCdNotify { - map aiCdMap = 1; -} diff --git a/proto/EvtBeingHitInfo.proto b/proto/EvtBeingHitInfo.proto deleted file mode 100644 index cbfbf78f1..000000000 --- a/proto/EvtBeingHitInfo.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AttackResult.proto"; - -message EvtBeingHitInfo { - uint32 peerId = 1; - AttackResult attackResult = 2; -} diff --git a/proto/EvtBeingHitNotify.proto b/proto/EvtBeingHitNotify.proto deleted file mode 100644 index 5e27f02be..000000000 --- a/proto/EvtBeingHitNotify.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "EvtBeingHitInfo.proto"; -import "ForwardType.proto"; - -message EvtBeingHitNotify { - ForwardType forwardType = 1; - EvtBeingHitInfo beingHitInfo = 2; -} diff --git a/proto/EvtBeingHitsCombineNotify.proto b/proto/EvtBeingHitsCombineNotify.proto deleted file mode 100644 index 40ee6738a..000000000 --- a/proto/EvtBeingHitsCombineNotify.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "EvtBeingHitInfo.proto"; -import "ForwardType.proto"; - -message EvtBeingHitsCombineNotify { - ForwardType forwardType = 1; - repeated EvtBeingHitInfo evtBeingHitInfoList = 2; -} diff --git a/proto/EvtCreateGadgetNotify.proto b/proto/EvtCreateGadgetNotify.proto deleted file mode 100644 index ab6eeea0f..000000000 --- a/proto/EvtCreateGadgetNotify.proto +++ /dev/null @@ -1,24 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "ForwardType.proto"; -import "Vector.proto"; - -message EvtCreateGadgetNotify { - ForwardType forwardType = 1; - uint32 entityId = 2; - uint32 configId = 3; - uint32 campId = 4; - uint32 campType = 5; - Vector initPos = 6; - Vector initEulerAngles = 7; - uint64 guid = 8; - uint32 ownerEntityId = 9; - uint32 targetEntityId = 10; - bool isAsyncLoad = 11; - uint32 targetLockPointIndex = 12; - uint32 roomId = 13; - uint32 propOwnerEntityId = 14; - bool sightGroupWithOwner = 15; -} diff --git a/proto/EvtDestroyGadgetNotify.proto b/proto/EvtDestroyGadgetNotify.proto deleted file mode 100644 index c1708617d..000000000 --- a/proto/EvtDestroyGadgetNotify.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "ForwardType.proto"; - -message EvtDestroyGadgetNotify { - ForwardType forwardType = 1; - uint32 entityId = 2; -} diff --git a/proto/EvtHittingOtherInfo.proto b/proto/EvtHittingOtherInfo.proto deleted file mode 100644 index f2dce261e..000000000 --- a/proto/EvtHittingOtherInfo.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AttackResult.proto"; - -message EvtHittingOtherInfo { - uint32 peerId = 1; - AttackResult attackResult = 2; -} diff --git a/proto/FeatureBlockInfo.proto b/proto/FeatureBlockInfo.proto deleted file mode 100644 index 8feafc83d..000000000 --- a/proto/FeatureBlockInfo.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message FeatureBlockInfo { - uint32 featureType = 1; - uint32 endTime = 2; -} diff --git a/proto/FetterData.proto b/proto/FetterData.proto deleted file mode 100644 index 92ea23266..000000000 --- a/proto/FetterData.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message FetterData { - uint32 fetterId = 1; - uint32 fetterState = 2; - repeated uint32 condIndexList = 3; -} diff --git a/proto/FightPropPair.proto b/proto/FightPropPair.proto deleted file mode 100644 index fb6f0e3eb..000000000 --- a/proto/FightPropPair.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message FightPropPair { - uint32 type = 1; - float propValue = 2; -} diff --git a/proto/ForwardType.proto b/proto/ForwardType.proto deleted file mode 100644 index 329e2ef6f..000000000 --- a/proto/ForwardType.proto +++ /dev/null @@ -1,15 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum ForwardType { - ForwardLocal = 0; - ForwardToAll = 1; - ForwardToAllExceptCur = 2; - ForwardToHost = 3; - ForwardToAllGuest = 4; - ForwardToPeer = 5; - ForwardToPeers = 6; - ForwardOnlyServer = 7; - ForwardToAllExistExceptCur = 8; -} diff --git a/proto/FriendBrief.proto b/proto/FriendBrief.proto deleted file mode 100644 index 9b1819222..000000000 --- a/proto/FriendBrief.proto +++ /dev/null @@ -1,31 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "FriendEnterHomeOption.proto"; -import "FriendOnlineState.proto"; -import "HeadImage.proto"; -import "SocialShowAvatarInfo.proto"; - -message FriendBrief { - uint32 uid = 1; - string nickname = 2; - uint32 level = 3; - uint32 worldLevel = 5; - string signature = 6; - FriendOnlineState onlineState = 7; - uint32 param = 8; - bool isMpModeAvailable = 10; - string onlineId = 11; - uint32 lastActiveTime = 12; - uint32 nameCardId = 13; - uint32 mpPlayerNum = 14; - bool isChatNoDisturb = 15; - uint32 chatSequence = 16; - string remarkName = 17; - repeated SocialShowAvatarInfo showAvatarInfoList = 22; - FriendEnterHomeOption friendEnterHomeOption = 23; - HeadImage avatar = 24; - uint32 unk1 = 25; - uint32 unk2 = 27; -} diff --git a/proto/FriendEnterHomeOption.proto b/proto/FriendEnterHomeOption.proto deleted file mode 100644 index 2e3e6af25..000000000 --- a/proto/FriendEnterHomeOption.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum FriendEnterHomeOption { - NeedConfirm = 0; - Refuse = 1; - Direct = 2; -} diff --git a/proto/FriendOnlineState.proto b/proto/FriendOnlineState.proto deleted file mode 100644 index ea1f2ba86..000000000 --- a/proto/FriendOnlineState.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum FriendOnlineState { - FRIEND_DISCONNECT = 0; - FRIEND_ONLINE = 1; -} diff --git a/proto/Furniture.proto b/proto/Furniture.proto deleted file mode 100644 index dc4a2a383..000000000 --- a/proto/Furniture.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message Furniture { - uint32 count = 1; -} diff --git a/proto/GachaInfo.proto b/proto/GachaInfo.proto deleted file mode 100644 index 5399ab709..000000000 --- a/proto/GachaInfo.proto +++ /dev/null @@ -1,29 +0,0 @@ -syntax = "proto3"; - -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; -} diff --git a/proto/GachaItem.proto b/proto/GachaItem.proto deleted file mode 100644 index 7b39a9905..000000000 --- a/proto/GachaItem.proto +++ /dev/null @@ -1,14 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "GachaTransferItem.proto"; -import "ItemParam.proto"; - -message GachaItem { - ItemParam gachaItem = 1; - repeated GachaTransferItem transferItems = 2; - bool isFlashCard = 3; - bool isGachaItemNew = 4; - repeated ItemParam tokenItemList = 5; -} diff --git a/proto/GachaTransferItem.proto b/proto/GachaTransferItem.proto deleted file mode 100644 index 715339da6..000000000 --- a/proto/GachaTransferItem.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "ItemParam.proto"; - -message GachaTransferItem { - ItemParam item = 1; - bool isTransferItemNew = 2; -} diff --git a/proto/GachaUpInfo.proto b/proto/GachaUpInfo.proto deleted file mode 100644 index df195cf56..000000000 --- a/proto/GachaUpInfo.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message GachaUpInfo { - uint32 itemParentType = 1; - repeated uint32 itemIdList = 2; -} diff --git a/proto/GadgetBornType.proto b/proto/GadgetBornType.proto deleted file mode 100644 index beddb854a..000000000 --- a/proto/GadgetBornType.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum GadgetBornType { - GadgetBornNone = 0; - GadgetBornInAir = 1; - GadgetBornPlayer = 2; - GadgetBornMonsterHit = 3; - GadgetBornMonsterDie = 4; - GadgetBornGadget = 5; - GadgetBornGround = 6; -} diff --git a/proto/GadgetClientParam.proto b/proto/GadgetClientParam.proto deleted file mode 100644 index 546ef56c6..000000000 --- a/proto/GadgetClientParam.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message GadgetClientParam { - uint32 campId = 1; - uint32 campType = 2; - uint64 guid = 3; - uint32 ownerEntityId = 4; - uint32 targetEntityId = 5; - bool asyncLoad = 6; -} diff --git a/proto/GadgetCrucibleInfo.proto b/proto/GadgetCrucibleInfo.proto deleted file mode 100644 index 766e4556e..000000000 --- a/proto/GadgetCrucibleInfo.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message GadgetCrucibleInfo { - -} diff --git a/proto/GadgetInteractReq.proto b/proto/GadgetInteractReq.proto deleted file mode 100644 index fb3df4283..000000000 --- a/proto/GadgetInteractReq.proto +++ /dev/null @@ -1,14 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "InterOpType.proto"; -import "ResinCostType.proto"; - -message GadgetInteractReq { - uint32 gadgetEntityId = 1; - InterOpType opType = 2; - uint32 gadgetId = 3; - bool isUseCondenseResin = 4; - ResinCostType resinCostType = 5; -} diff --git a/proto/GadgetInteractRsp.proto b/proto/GadgetInteractRsp.proto deleted file mode 100644 index c08161b72..000000000 --- a/proto/GadgetInteractRsp.proto +++ /dev/null @@ -1,14 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "InterOpType.proto"; -import "InteractType.proto"; - -message GadgetInteractRsp { - int32 retcode = 1; - uint32 gadgetEntityId = 2; - InteractType interactType = 3; - InterOpType opType = 4; - uint32 gadgetId = 5; -} diff --git a/proto/GadgetPlayInfo.proto b/proto/GadgetPlayInfo.proto deleted file mode 100644 index 28fe9a79a..000000000 --- a/proto/GadgetPlayInfo.proto +++ /dev/null @@ -1,17 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "GadgetCrucibleInfo.proto"; - -message GadgetPlayInfo { - uint32 playType = 1; - uint32 duration = 2; - repeated uint32 progressStageList = 3; - uint32 startCd = 4; - uint32 startTime = 5; - uint32 progress = 6; - oneof playInfo { - GadgetCrucibleInfo crucibleInfo = 21; - } -} diff --git a/proto/GetActivityInfoRsp.proto b/proto/GetActivityInfoRsp.proto deleted file mode 100644 index e44903a4f..000000000 --- a/proto/GetActivityInfoRsp.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "ActivityInfo.proto"; - -message GetActivityInfoRsp { - int32 retcode = 1; - repeated ActivityInfo activityInfoList = 2; - repeated uint32 activatedSaleIdList = 3; -} diff --git a/proto/GetAllUnlockNameCardRsp.proto b/proto/GetAllUnlockNameCardRsp.proto deleted file mode 100644 index 1a9335085..000000000 --- a/proto/GetAllUnlockNameCardRsp.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message GetAllUnlockNameCardRsp { - int32 retcode = 1; - repeated uint32 nameCardList = 2; -} diff --git a/proto/GetAuthkeyReq.proto b/proto/GetAuthkeyReq.proto deleted file mode 100644 index f4c212c23..000000000 --- a/proto/GetAuthkeyReq.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message GetAuthkeyReq { - string authAppid = 1; - uint32 signType = 2; - uint32 authkeyVer = 3; -} diff --git a/proto/GetAuthkeyRsp.proto b/proto/GetAuthkeyRsp.proto deleted file mode 100644 index 584251a11..000000000 --- a/proto/GetAuthkeyRsp.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message GetAuthkeyRsp { - int32 retcode = 1; - string authkey = 2; - string authAppid = 3; - uint32 signType = 4; - uint32 authkeyVer = 5; - string gameBiz = 6; -} diff --git a/proto/GetGachaInfoRsp.proto b/proto/GetGachaInfoRsp.proto deleted file mode 100644 index c275f5666..000000000 --- a/proto/GetGachaInfoRsp.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "GachaInfo.proto"; - -message GetGachaInfoRsp { - int32 retcode = 1; - repeated GachaInfo gachaInfoList = 2; - uint32 gachaRandom = 3; -} diff --git a/proto/GetPlayerAskFriendListRsp.proto b/proto/GetPlayerAskFriendListRsp.proto deleted file mode 100644 index c783f380f..000000000 --- a/proto/GetPlayerAskFriendListRsp.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "FriendBrief.proto"; - -message GetPlayerAskFriendListRsp { - int32 retcode = 1; - repeated FriendBrief askFriendList = 2; -} diff --git a/proto/GetPlayerBlacklistRsp.proto b/proto/GetPlayerBlacklistRsp.proto deleted file mode 100644 index 979e983fb..000000000 --- a/proto/GetPlayerBlacklistRsp.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "FriendBrief.proto"; - -message GetPlayerBlacklistRsp { - int32 retcode = 1; - repeated FriendBrief blacklist = 2; -} diff --git a/proto/GetPlayerFriendListRsp.proto b/proto/GetPlayerFriendListRsp.proto deleted file mode 100644 index 95f8c5e87..000000000 --- a/proto/GetPlayerFriendListRsp.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "FriendBrief.proto"; - -message GetPlayerFriendListRsp { - int32 retcode = 1; - repeated FriendBrief friendList = 2; - repeated FriendBrief askFriendList = 3; -} diff --git a/proto/GetPlayerSocialDetailReq.proto b/proto/GetPlayerSocialDetailReq.proto deleted file mode 100644 index 490542654..000000000 --- a/proto/GetPlayerSocialDetailReq.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message GetPlayerSocialDetailReq { - uint32 uid = 1; -} diff --git a/proto/GetPlayerSocialDetailRsp.proto b/proto/GetPlayerSocialDetailRsp.proto deleted file mode 100644 index 95d9e893e..000000000 --- a/proto/GetPlayerSocialDetailRsp.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "SocialDetail.proto"; - -message GetPlayerSocialDetailRsp { - int32 retcode = 1; - SocialDetail detailData = 2; -} diff --git a/proto/GetPlayerTokenReq.proto b/proto/GetPlayerTokenReq.proto deleted file mode 100644 index 083a0300b..000000000 --- a/proto/GetPlayerTokenReq.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message GetPlayerTokenReq { - uint32 accountType = 1; - string accountUid = 2; - string accountToken = 3; - uint64 platformType = 7; - uint64 schannelId = 11; -} diff --git a/proto/GetPlayerTokenRsp.proto b/proto/GetPlayerTokenRsp.proto deleted file mode 100644 index 011e50041..000000000 --- a/proto/GetPlayerTokenRsp.proto +++ /dev/null @@ -1,19 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message GetPlayerTokenRsp { - uint32 playerUid = 3; - string accountToken = 4; - int32 accountType = 6; - bool isProficientPlayer = 8; - uint32 gmUid = 10; - uint64 secretKey = 11; - bytes secretKeyBuffer = 12; - uint64 platformType = 13; - uint32 channelId = 16; - string countryCode = 19; - string unk1 = 22; - uint32 unk3 = 23; - string clientIp = 24; -} diff --git a/proto/GetSceneAreaReq.proto b/proto/GetSceneAreaReq.proto deleted file mode 100644 index c66483678..000000000 --- a/proto/GetSceneAreaReq.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message GetSceneAreaReq { - uint32 sceneId = 1; - uint32 belongUid = 2; -} diff --git a/proto/GetSceneAreaRsp.proto b/proto/GetSceneAreaRsp.proto deleted file mode 100644 index b25ae29f3..000000000 --- a/proto/GetSceneAreaRsp.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "CityInfo.proto"; - -message GetSceneAreaRsp { - int32 retcode = 1; - uint32 sceneId = 2; - repeated uint32 areaIdList = 3; - repeated CityInfo cityInfoList = 4; -} diff --git a/proto/GetScenePointReq.proto b/proto/GetScenePointReq.proto deleted file mode 100644 index 42538a417..000000000 --- a/proto/GetScenePointReq.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message GetScenePointReq { - uint32 sceneId = 1; - uint32 belongUid = 2; -} diff --git a/proto/GetScenePointRsp.proto b/proto/GetScenePointRsp.proto deleted file mode 100644 index 7973829c5..000000000 --- a/proto/GetScenePointRsp.proto +++ /dev/null @@ -1,16 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message GetScenePointRsp { - int32 retcode = 1; - uint32 sceneId = 2; - repeated uint32 unlockedPointList = 3; - uint32 belongUid = 4; - repeated uint32 unlockAreaList = 5; - repeated uint32 lockedPointList = 6; - repeated uint32 toBeExploreDungeonEntryList = 7; - repeated uint32 notExploredDungeonEntryList = 8; - repeated uint32 groupUnlimitPointList = 9; - repeated uint32 notInteractDungeonEntryList = 10; -} diff --git a/proto/GetShopReq.proto b/proto/GetShopReq.proto deleted file mode 100644 index 298e6c065..000000000 --- a/proto/GetShopReq.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message GetShopReq { - uint32 shopType = 1; -} diff --git a/proto/GetShopRsp.proto b/proto/GetShopRsp.proto deleted file mode 100644 index e7295dcdb..000000000 --- a/proto/GetShopRsp.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "Shop.proto"; - -message GetShopRsp { - int32 retcode = 1; - Shop shop = 2; -} diff --git a/proto/GetShopmallDataRsp.proto b/proto/GetShopmallDataRsp.proto deleted file mode 100644 index 6db6d68d4..000000000 --- a/proto/GetShopmallDataRsp.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message GetShopmallDataRsp { - int32 retcode = 1; - repeated uint32 shopTypeList = 2; -} diff --git a/proto/GetWorldMpInfoRsp.proto b/proto/GetWorldMpInfoRsp.proto deleted file mode 100644 index c4bebe725..000000000 --- a/proto/GetWorldMpInfoRsp.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message GetWorldMpInfoRsp { - int32 retcode = 1; - bool isInMpMode = 2; - uint32 quitMpValidTime = 3; -} diff --git a/proto/H5ActivityIdsNotify.proto b/proto/H5ActivityIdsNotify.proto deleted file mode 100644 index 59521ed66..000000000 --- a/proto/H5ActivityIdsNotify.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message H5ActivityIdsNotify { - map h5ActivityMap = 1; -} diff --git a/proto/HeadImage.proto b/proto/HeadImage.proto deleted file mode 100644 index 0aa6d697b..000000000 --- a/proto/HeadImage.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message HeadImage { - uint32 avatarId = 1; -} diff --git a/proto/HitColliderType.proto b/proto/HitColliderType.proto deleted file mode 100644 index e06448729..000000000 --- a/proto/HitColliderType.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum HitColliderType { - HitColliderInvalid = 0; - HitColliderHitBox = 1; - HitColliderWetHitBox = 2; - HitColliderHeadBox = 3; -} diff --git a/proto/HitCollision.proto b/proto/HitCollision.proto deleted file mode 100644 index b3766b047..000000000 --- a/proto/HitCollision.proto +++ /dev/null @@ -1,15 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "HitColliderType.proto"; -import "Vector.proto"; - -message HitCollision { - HitColliderType hitColliderType = 1; - int32 hitBoxIndex = 2; - Vector hitPoint = 3; - Vector hitDir = 4; - float attackeeHitForceAngle = 5; - float attackeeHitEntityAngle = 6; -} diff --git a/proto/HostPlayerNotify.proto b/proto/HostPlayerNotify.proto deleted file mode 100644 index 2659edc40..000000000 --- a/proto/HostPlayerNotify.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message HostPlayerNotify { - uint32 hostUid = 1; - uint32 hostPeerId = 2; -} diff --git a/proto/InterOpType.proto b/proto/InterOpType.proto deleted file mode 100644 index 9ccecdb6f..000000000 --- a/proto/InterOpType.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum InterOpType { - InterOpFinish = 0; - InterOpStart = 1; -} diff --git a/proto/InteractType.proto b/proto/InteractType.proto deleted file mode 100644 index 6883ad361..000000000 --- a/proto/InteractType.proto +++ /dev/null @@ -1,17 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum InteractType { - InteractNone = 0; - InteractPickItem = 1; - InteractGather = 2; - InteractOpenChest = 3; - InteractOpenStatue = 4; - InteractConsum = 5; - InteractMpPlayReward = 6; - InteractView = 7; - InteractGeneralReward = 8; - InteractMiracleRing = 9; - InteractFoundation = 10; -} diff --git a/proto/Item.proto b/proto/Item.proto deleted file mode 100644 index f0857bebd..000000000 --- a/proto/Item.proto +++ /dev/null @@ -1,17 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "Equip.proto"; -import "Furniture.proto"; -import "Material.proto"; - -message Item { - uint32 itemId = 1; - uint64 guid = 2; - oneof detail { - Material material = 5; - Equip equip = 6; - Furniture furniture = 7; - } -} diff --git a/proto/ItemAddHintNotify.proto b/proto/ItemAddHintNotify.proto deleted file mode 100644 index ea4db2f14..000000000 --- a/proto/ItemAddHintNotify.proto +++ /dev/null @@ -1,16 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "ItemHint.proto"; -import "Vector.proto"; - -message ItemAddHintNotify { - repeated ItemHint itemList = 1; - Vector position = 2; - bool isPositionValid = 3; - uint32 reason = 4; - uint32 questId = 5; - bool isTransferedFromAvatarCard = 6; - repeated ItemHint overflowTransformedItemList = 7; -} diff --git a/proto/ItemExceedLimitNotify.proto b/proto/ItemExceedLimitNotify.proto deleted file mode 100644 index d294ba8b9..000000000 --- a/proto/ItemExceedLimitNotify.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ItemExceedLimitNotify { - bool isMaterialExceedLimit = 1; - bool isWeaponExceedLimit = 2; - bool isReliquaryExceedLimit = 3; - repeated uint32 itemIdList = 4; -} diff --git a/proto/ItemGivingReq.proto b/proto/ItemGivingReq.proto deleted file mode 100644 index f09b8c965..000000000 --- a/proto/ItemGivingReq.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "ItemParam.proto"; - -message ItemGivingReq { - uint32 givingId = 1; - repeated ItemParam itemParamList = 2; - map itemGuidCountMap = 3; -} diff --git a/proto/ItemGivingRsp.proto b/proto/ItemGivingRsp.proto deleted file mode 100644 index ea3694b78..000000000 --- a/proto/ItemGivingRsp.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ItemGivingRsp { - int32 retcode = 1; - uint32 givingId = 2; -} diff --git a/proto/ItemHint.proto b/proto/ItemHint.proto deleted file mode 100644 index 2d036175e..000000000 --- a/proto/ItemHint.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ItemHint { - uint32 itemId = 1; - uint32 count = 2; - bool isNew = 3; -} diff --git a/proto/ItemParam.proto b/proto/ItemParam.proto deleted file mode 100644 index 2e48028b3..000000000 --- a/proto/ItemParam.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ItemParam { - uint32 itemId = 1; - uint32 count = 2; -} diff --git a/proto/LifeStateChangeNotify.proto b/proto/LifeStateChangeNotify.proto deleted file mode 100644 index 4f16e936c..000000000 --- a/proto/LifeStateChangeNotify.proto +++ /dev/null @@ -1,14 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "PlayerDieType.proto"; - -message LifeStateChangeNotify { - uint32 entityId = 1; - uint32 lifeState = 2; - uint32 sourceEntityId = 3; - string attackTag = 4; - PlayerDieType dieType = 5; - uint32 moveReliableSeq = 6; -} diff --git a/proto/MPLevelEntityInfo.proto b/proto/MPLevelEntityInfo.proto deleted file mode 100644 index 810e1d372..000000000 --- a/proto/MPLevelEntityInfo.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AbilitySyncStateInfo.proto"; - -message MPLevelEntityInfo { - uint32 entityId = 1; - uint32 authorityPeerId = 2; - AbilitySyncStateInfo abilityInfo = 3; -} diff --git a/proto/MapMarkFromType.proto b/proto/MapMarkFromType.proto deleted file mode 100644 index 5d31e1af5..000000000 --- a/proto/MapMarkFromType.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum MapMarkFromType { - None = 0; - MonsterType = 1; - QuestType = 2; -} diff --git a/proto/MapMarkPoint.proto b/proto/MapMarkPoint.proto deleted file mode 100644 index fb244db4e..000000000 --- a/proto/MapMarkPoint.proto +++ /dev/null @@ -1,17 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "MapMarkFromType.proto"; -import "MapMarkPointType.proto"; -import "Vector.proto"; - -message MapMarkPoint { - uint32 sceneId = 1; - string name = 2; - Vector pos = 3; - MapMarkPointType pointType = 4; - uint32 monsterId = 5; - MapMarkFromType fromType = 6; - uint32 questId = 7; -} diff --git a/proto/MapMarkPointType.proto b/proto/MapMarkPointType.proto deleted file mode 100644 index 986d30876..000000000 --- a/proto/MapMarkPointType.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum MapMarkPointType { - Npc = 0; - Quest = 1; - Special = 2; - Mine = 3; - Collection = 4; - Monster = 5; -} diff --git a/proto/MarkMapReq.proto b/proto/MarkMapReq.proto deleted file mode 100644 index 2e57ebb55..000000000 --- a/proto/MarkMapReq.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "MapMarkPoint.proto"; -import "Operation.proto"; - -message MarkMapReq { - Operation op = 1; - MapMarkPoint old = 2; - MapMarkPoint mark = 3; -} diff --git a/proto/MassivePropParam.proto b/proto/MassivePropParam.proto deleted file mode 100644 index bd30d4597..000000000 --- a/proto/MassivePropParam.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message MassivePropParam { - int32 elementReactionType = 1; - uint32 casterId = 2; - repeated float paramList = 3; - uint32 syncFlag = 4; -} diff --git a/proto/MassivePropSyncInfo.proto b/proto/MassivePropSyncInfo.proto deleted file mode 100644 index 276f7a380..000000000 --- a/proto/MassivePropSyncInfo.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "MassivePropParam.proto"; - -message MassivePropSyncInfo { - int64 id = 1; - map propMap = 2; -} diff --git a/proto/Material.proto b/proto/Material.proto deleted file mode 100644 index 4fd76bc51..000000000 --- a/proto/Material.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "MaterialDeleteInfo.proto"; - -message Material { - uint32 count = 1; - MaterialDeleteInfo deleteInfo = 2; -} diff --git a/proto/MaterialDeleteInfo.proto b/proto/MaterialDeleteInfo.proto deleted file mode 100644 index 9e5a310c0..000000000 --- a/proto/MaterialDeleteInfo.proto +++ /dev/null @@ -1,16 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "CountDownDelete.proto"; -import "DateTimeDelete.proto"; -import "DelayWeekCountDownDelete.proto"; - -message MaterialDeleteInfo { - bool hasDeleteConfig = 1; - oneof deleteInfo { - CountDownDelete countDownDelete = 2; - DateTimeDelete dateDelete = 3; - DelayWeekCountDownDelete delayWeekCountDownDelete = 4; - } -} diff --git a/proto/MaterialInfo.proto b/proto/MaterialInfo.proto deleted file mode 100644 index ea8701dca..000000000 --- a/proto/MaterialInfo.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message MaterialInfo { - uint64 guid = 1; - uint32 count = 2; -} diff --git a/proto/MathQuaternion.proto b/proto/MathQuaternion.proto deleted file mode 100644 index a3689667a..000000000 --- a/proto/MathQuaternion.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message MathQuaternion { - float x = 1; - float y = 2; - float z = 3; - float w = 4; -} diff --git a/proto/ModifierDurability.proto b/proto/ModifierDurability.proto deleted file mode 100644 index ed8d9e76a..000000000 --- a/proto/ModifierDurability.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ModifierDurability { - float reduceRatio = 1; - float remainingDurability = 2; -} diff --git a/proto/MonsterBornType.proto b/proto/MonsterBornType.proto deleted file mode 100644 index 31aade84c..000000000 --- a/proto/MonsterBornType.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum MonsterBornType { - MonsterBornNone = 0; - MonsterBornDefault = 1; - MonsterBornRandom = 2; -} diff --git a/proto/MonsterRoute.proto b/proto/MonsterRoute.proto deleted file mode 100644 index ac98be7ce..000000000 --- a/proto/MonsterRoute.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "RoutePoint.proto"; - -message MonsterRoute { - RoutePoint routePoints = 1; - uint32 speedLevel = 2; - uint32 routeType = 3; - float arriveRange = 4; -} diff --git a/proto/MotionInfo.proto b/proto/MotionInfo.proto deleted file mode 100644 index faddc14dc..000000000 --- a/proto/MotionInfo.proto +++ /dev/null @@ -1,18 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "MotionState.proto"; -import "Vector.proto"; - -message MotionInfo { - Vector pos = 1; - Vector rot = 2; - Vector speed = 3; - MotionState state = 4; - repeated Vector params = 5; - Vector refPos = 6; - uint32 refId = 7; - uint32 sceneTime = 8; - uint32 intervalVelocity = 9; -} diff --git a/proto/MotionState.proto b/proto/MotionState.proto deleted file mode 100644 index 91102eedf..000000000 --- a/proto/MotionState.proto +++ /dev/null @@ -1,53 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum MotionState { - MotionNone = 0; - MotionReset = 1; - MotionStandby = 2; - MotionStandbyMove = 3; - MotionWalk = 4; - MotionRun = 5; - MotionDash = 6; - MotionClimb = 7; - MotionClimbJump = 8; - MotionStandbyToClimb = 9; - MotionFight = 10; - MotionJump = 11; - MotionDrop = 12; - MotionFly = 13; - MotionSwimMove = 14; - MotionSwimIdle = 15; - MotionSwimDash = 16; - MotionSwimJump = 17; - MotionSlip = 18; - MotionGoUpstairs = 19; - MotionFallOnGround = 20; - MotionJumpUpWallForStandby = 21; - MotionJumpOffWall = 22; - MotionPoweredFly = 23; - MotionLadderIdle = 24; - MotionLadderMove = 25; - MotionLadderSlip = 26; - MotionStandbyToLadder = 27; - MotionLadderToStandby = 28; - MotionDangerStandby = 29; - MotionDangerStandbyMove = 30; - MotionDangerWalk = 31; - MotionDangerRun = 32; - MotionDangerDash = 33; - MotionCrouchIdle = 34; - MotionCrouchMove = 35; - MotionCrouchRoll = 36; - MotionNotify = 37; - MotionLandSpeed = 38; - MotionMoveFailAck = 39; - MotionWaterfall = 40; - MotionDashBeforeShake = 41; - MotionSitIdle = 42; - MotionForceSetPos = 43; - MotionQuestForceDrag = 44; - MotionFollowRoute = 45; - MotionNum = 46; -} diff --git a/proto/MovingPlatformType.proto b/proto/MovingPlatformType.proto deleted file mode 100644 index f3861d117..000000000 --- a/proto/MovingPlatformType.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message MovingPlatformType { - -} diff --git a/proto/MpSettingType.proto b/proto/MpSettingType.proto deleted file mode 100644 index f24083b21..000000000 --- a/proto/MpSettingType.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum MpSettingType { - MpSettingNoEnter = 0; - MpSettingEnterFreely = 1; - MpSettingEnterAfterApply = 2; -} diff --git a/proto/OnlinePlayerInfo.proto b/proto/OnlinePlayerInfo.proto deleted file mode 100644 index 76ed24a06..000000000 --- a/proto/OnlinePlayerInfo.proto +++ /dev/null @@ -1,20 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "HeadImage.proto"; -import "MpSettingType.proto"; - -message OnlinePlayerInfo { - uint32 uid = 1; - string nickname = 2; - uint32 playerLevel = 3; - MpSettingType mpSettingType = 5; - uint32 curPlayerNumInWorld = 6; - uint32 worldLevel = 7; - string onlineId = 8; - uint32 nameCardId = 9; - repeated uint32 blacklistUidList = 10; - string signature = 11; - HeadImage avatar = 12; -} diff --git a/proto/OpenStateUpdateNotify.proto b/proto/OpenStateUpdateNotify.proto deleted file mode 100644 index 91d1d2f11..000000000 --- a/proto/OpenStateUpdateNotify.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message OpenStateUpdateNotify { - map openStateMap = 1; -} diff --git a/proto/Operation.proto b/proto/Operation.proto deleted file mode 100644 index c48819bd5..000000000 --- a/proto/Operation.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum Operation { - Add = 0; - Mod = 1; - Del = 2; - Get = 3; -} diff --git a/proto/PacketHead.proto b/proto/PacketHead.proto deleted file mode 100644 index a9e4e5201..000000000 --- a/proto/PacketHead.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message PacketHead { - uint32 clientSequenceId = 3; - uint64 timestamp = 6; -} diff --git a/proto/PingReq.proto b/proto/PingReq.proto deleted file mode 100644 index 231ece4b1..000000000 --- a/proto/PingReq.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message PingReq { - int32 seq = 1; - int32 clientTime = 2; -} diff --git a/proto/PingRsp.proto b/proto/PingRsp.proto deleted file mode 100644 index 3efd49701..000000000 --- a/proto/PingRsp.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message PingRsp { - int32 retcode = 1; - uint32 seq = 2; - uint32 clientTime = 3; -} diff --git a/proto/PlatformInfo.proto b/proto/PlatformInfo.proto deleted file mode 100644 index c78b36bfe..000000000 --- a/proto/PlatformInfo.proto +++ /dev/null @@ -1,25 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "MathQuaternion.proto"; -import "MovingPlatformType.proto"; -import "Route.proto"; -import "Vector.proto"; - -message PlatformInfo { - uint32 routeId = 1; - int32 startIndex = 2; - uint32 startRouteTime = 3; - uint32 startSceneTime = 4; - Vector startPos = 7; - bool isStarted = 8; - MathQuaternion startRot = 9; - uint32 stopSceneTime = 10; - Vector posOffset = 11; - MathQuaternion rotOffset = 12; - MovingPlatformType movingPlatformType = 13; - bool isActive = 14; - Route route = 15; - uint32 pointId = 16; -} diff --git a/proto/PlayerApplyEnterMpNotify.proto b/proto/PlayerApplyEnterMpNotify.proto deleted file mode 100644 index c5b3cc1e9..000000000 --- a/proto/PlayerApplyEnterMpNotify.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "OnlinePlayerInfo.proto"; - -message PlayerApplyEnterMpNotify { - OnlinePlayerInfo srcPlayerInfo = 1; - uint32 srcAppId = 2; -} diff --git a/proto/PlayerApplyEnterMpReason.proto b/proto/PlayerApplyEnterMpReason.proto deleted file mode 100644 index e305e435f..000000000 --- a/proto/PlayerApplyEnterMpReason.proto +++ /dev/null @@ -1,19 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum PlayerApplyEnterMpReason { - PlayerJudge = 0; - SceneCannotEnter = 1; - PlayerCannotEnterMp = 2; - SystemJudge = 3; - AllowEnterPlayerFull = 4; - WorldLevelLowerThanHost = 5; - HostInMatch = 6; - PlayerInBlacklist = 7; - PsPlayerNotAcceptOthers = 8; - HostIsBlocked = 9; - OtherDataVersionNotLatest = 10; - DataVersionNotLatest = 11; - PlayerNotInPlayerWorld = 12; -} diff --git a/proto/PlayerApplyEnterMpReq.proto b/proto/PlayerApplyEnterMpReq.proto deleted file mode 100644 index b4fc37221..000000000 --- a/proto/PlayerApplyEnterMpReq.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message PlayerApplyEnterMpReq { - uint32 targetUid = 1; -} diff --git a/proto/PlayerApplyEnterMpResultNotify.proto b/proto/PlayerApplyEnterMpResultNotify.proto deleted file mode 100644 index 2befeaf2e..000000000 --- a/proto/PlayerApplyEnterMpResultNotify.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "PlayerApplyEnterMpReason.proto"; - -message PlayerApplyEnterMpResultNotify { - uint32 targetUid = 1; - bool isAgreed = 2; - PlayerApplyEnterMpReason reason = 3; - string targetNickname = 4; -} diff --git a/proto/PlayerApplyEnterMpResultReq.proto b/proto/PlayerApplyEnterMpResultReq.proto deleted file mode 100644 index 6e151c968..000000000 --- a/proto/PlayerApplyEnterMpResultReq.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message PlayerApplyEnterMpResultReq { - uint32 applyUid = 1; - bool isAgreed = 2; -} diff --git a/proto/PlayerApplyEnterMpResultRsp.proto b/proto/PlayerApplyEnterMpResultRsp.proto deleted file mode 100644 index b38555633..000000000 --- a/proto/PlayerApplyEnterMpResultRsp.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message PlayerApplyEnterMpResultRsp { - int32 retcode = 1; - uint32 applyUid = 2; - bool isAgreed = 3; - uint32 param = 4; -} diff --git a/proto/PlayerApplyEnterMpRsp.proto b/proto/PlayerApplyEnterMpRsp.proto deleted file mode 100644 index 29148a025..000000000 --- a/proto/PlayerApplyEnterMpRsp.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message PlayerApplyEnterMpRsp { - int32 retcode = 1; - uint32 targetUid = 2; - uint32 param = 3; -} diff --git a/proto/PlayerChatNotify.proto b/proto/PlayerChatNotify.proto deleted file mode 100644 index e6844e8f4..000000000 --- a/proto/PlayerChatNotify.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "ChatInfo.proto"; - -message PlayerChatNotify { - uint32 channelId = 1; - ChatInfo chatInfo = 2; -} diff --git a/proto/PlayerChatReq.proto b/proto/PlayerChatReq.proto deleted file mode 100644 index 37e37a17d..000000000 --- a/proto/PlayerChatReq.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "ChatInfo.proto"; - -message PlayerChatReq { - uint32 channelId = 1; - ChatInfo chatInfo = 2; -} diff --git a/proto/PlayerChatRsp.proto b/proto/PlayerChatRsp.proto deleted file mode 100644 index 01d9b31c1..000000000 --- a/proto/PlayerChatRsp.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message PlayerChatRsp { - int32 retcode = 1; - uint32 chatForbiddenEndtime = 2; -} diff --git a/proto/PlayerDataNotify.proto b/proto/PlayerDataNotify.proto deleted file mode 100644 index 817cc4cb9..000000000 --- a/proto/PlayerDataNotify.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "PropValue.proto"; - -message PlayerDataNotify { - string nickName = 1; - uint64 clientTime = 2; - bool isFirstLoginToday = 3; - uint32 regionId = 4; - map propMap = 6; -} diff --git a/proto/PlayerDieType.proto b/proto/PlayerDieType.proto deleted file mode 100644 index d26a55575..000000000 --- a/proto/PlayerDieType.proto +++ /dev/null @@ -1,15 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum PlayerDieType { - PlayerDieNone = 0; - PlayerDieKillByMonster = 1; - PlayerDieKillByGear = 2; - PlayerDieFall = 3; - PlayerDieDrawn = 4; - PlayerDieAbyss = 5; - PlayerDieGm = 6; - PlayerDieClimateCold = 7; - PlayerDieStormLighting = 8; -} diff --git a/proto/PlayerEnterSceneInfoNotify.proto b/proto/PlayerEnterSceneInfoNotify.proto deleted file mode 100644 index 77e952eca..000000000 --- a/proto/PlayerEnterSceneInfoNotify.proto +++ /dev/null @@ -1,15 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AvatarEnterSceneInfo.proto"; -import "MPLevelEntityInfo.proto"; -import "TeamEnterSceneInfo.proto"; - -message PlayerEnterSceneInfoNotify { - uint32 curAvatarEntityId = 1; - repeated AvatarEnterSceneInfo avatarEnterInfo = 2; - TeamEnterSceneInfo teamEnterInfo = 3; - MPLevelEntityInfo mpLevelEntityInfo = 4; - uint32 enterSceneToken = 5; -} diff --git a/proto/PlayerEnterSceneNotify.proto b/proto/PlayerEnterSceneNotify.proto deleted file mode 100644 index 1302e05a9..000000000 --- a/proto/PlayerEnterSceneNotify.proto +++ /dev/null @@ -1,25 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "EnterType.proto"; -import "Vector.proto"; - -message PlayerEnterSceneNotify { - uint32 sceneId = 1; - Vector pos = 2; - uint64 sceneBeginTime = 3; - EnterType type = 4; - uint32 targetUid = 6; - uint32 prevSceneId = 9; - Vector prevPos = 10; - uint32 dungeonId = 11; - uint32 worldLevel = 12; - uint32 enterSceneToken = 13; - bool isFirstLoginEnterScene = 14; - repeated uint32 sceneTagIdList = 15; - bool isSkipUi = 16; - uint32 enterReason = 17; - uint32 unk1 = 18; - string unk2 = 19; -} diff --git a/proto/PlayerGameTimeNotify.proto b/proto/PlayerGameTimeNotify.proto deleted file mode 100644 index c8292aab0..000000000 --- a/proto/PlayerGameTimeNotify.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message PlayerGameTimeNotify { - uint32 gameTime = 1; - uint32 uid = 2; -} diff --git a/proto/PlayerGetForceQuitBanInfoRsp.proto b/proto/PlayerGetForceQuitBanInfoRsp.proto deleted file mode 100644 index 35de4f448..000000000 --- a/proto/PlayerGetForceQuitBanInfoRsp.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message PlayerGetForceQuitBanInfoRsp { - int32 retcode = 1; - uint32 matchId = 2; - uint32 expireTime = 3; -} diff --git a/proto/PlayerLocationInfo.proto b/proto/PlayerLocationInfo.proto deleted file mode 100644 index 9816560ee..000000000 --- a/proto/PlayerLocationInfo.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "Vector.proto"; - -message PlayerLocationInfo { - uint32 uid = 1; - Vector pos = 2; - Vector rot = 3; -} diff --git a/proto/PlayerLoginReq.proto b/proto/PlayerLoginReq.proto deleted file mode 100644 index 9d206ed5c..000000000 --- a/proto/PlayerLoginReq.proto +++ /dev/null @@ -1,41 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "TrackingIOInfo.proto"; - -message PlayerLoginReq { - string token = 1; - string clientVersion = 2; - string systemVersion = 3; - string deviceName = 4; - string deviceUuid = 5; - uint32 targetUid = 6; - uint64 loginRand = 7; - bool isEditor = 8; - uint32 languageType = 9; - uint32 accountType = 10; - string accountUid = 11; - string platform = 12; - string deviceInfo = 13; - uint32 platformType = 14; - bool isGuest = 15; - uint32 cloudClientIp = 16; - uint32 gmUid = 17; - string checksum = 18; - string onlineId = 19; - uint32 clientToken = 20; - bytes securityCmdReply = 21; - bytes extraBinData = 22; - string cps = 23; - uint32 channelId = 24; - uint32 subChannelId = 25; - string checksumClientVersion = 26; - uint32 tag = 27; - TrackingIOInfo trackingIoInfo = 28; - string countryCode = 29; - uint32 clientDataVersion = 30; - bytes environmentErrorCode = 31; - uint32 targetHomeOwnerUid = 32; - string psnId = 33; -} diff --git a/proto/PlayerLoginRsp.proto b/proto/PlayerLoginRsp.proto deleted file mode 100644 index d11fd44f0..000000000 --- a/proto/PlayerLoginRsp.proto +++ /dev/null @@ -1,41 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "BlockInfo.proto"; -import "FeatureBlockInfo.proto"; -import "ResVersionConfig.proto"; -import "ShortAbilityHashPair.proto"; - -message PlayerLoginRsp { - int32 retcode = 1; - bytes playerData = 2; - bool isNewPlayer = 3; - uint32 targetUid = 4; - uint64 loginRand = 5; - bool isUseAbilityHash = 6; - int32 abilityHashCode = 7; - map abilityHashMap = 8; - uint32 clientDataVersion = 9; - bool isRelogin = 11; - uint32 clientSilenceDataVersion = 13; - string gameBiz = 14; - uint32 playerDataVersion = 15; - string clientMd5 = 16; - string clientSilenceMd5 = 17; - ResVersionConfig resVersionConfig = 20; - map blockInfoMap = 21; - string clientVersionSuffix = 24; - string clientSilenceVersionSuffix = 25; - repeated ShortAbilityHashPair shortAbilityHashMap = 27; - bytes scInfo = 28; - bool isAudit = 29; - bool isScOpen = 30; - string registerCps = 31; - repeated FeatureBlockInfo featureBlockInfoList = 32; - bool isDataNeedRelogin = 33; - string countryCode = 34; - ResVersionConfig nextResVersionConfig = 35; - string nextResourceUrl = 36; - uint32 targetHomeOwnerUid = 37; -} diff --git a/proto/PlayerPropNotify.proto b/proto/PlayerPropNotify.proto deleted file mode 100644 index 7341b4df1..000000000 --- a/proto/PlayerPropNotify.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "PropValue.proto"; - -message PlayerPropNotify { - map propMap = 1; -} diff --git a/proto/PlayerRTTInfo.proto b/proto/PlayerRTTInfo.proto deleted file mode 100644 index 2ed543319..000000000 --- a/proto/PlayerRTTInfo.proto +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 984c2f863..000000000 --- a/proto/PlayerSetPauseReq.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message PlayerSetPauseReq { - bool isPaused = 1; -} diff --git a/proto/PlayerStoreNotify.proto b/proto/PlayerStoreNotify.proto deleted file mode 100644 index 0202dcd93..000000000 --- a/proto/PlayerStoreNotify.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "Item.proto"; -import "StoreType.proto"; - -message PlayerStoreNotify { - StoreType storeType = 1; - repeated Item itemList = 2; - uint32 weightLimit = 3; -} diff --git a/proto/PlayerTimeNotify.proto b/proto/PlayerTimeNotify.proto deleted file mode 100644 index 5085127e8..000000000 --- a/proto/PlayerTimeNotify.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message PlayerTimeNotify { - bool isPaused = 1; - uint64 playerTime = 2; - uint64 serverTime = 3; -} diff --git a/proto/PostEnterSceneRsp.proto b/proto/PostEnterSceneRsp.proto deleted file mode 100644 index ec362f0fa..000000000 --- a/proto/PostEnterSceneRsp.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message PostEnterSceneRsp { - int32 retcode = 1; - uint32 enterSceneToken = 2; -} diff --git a/proto/PrivateChatNotify.proto b/proto/PrivateChatNotify.proto deleted file mode 100644 index 84457efac..000000000 --- a/proto/PrivateChatNotify.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "ChatInfo.proto"; - -message PrivateChatNotify { - ChatInfo chatInfo = 1; -} diff --git a/proto/PrivateChatReq.proto b/proto/PrivateChatReq.proto deleted file mode 100644 index 356aee67e..000000000 --- a/proto/PrivateChatReq.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message PrivateChatReq { - uint32 targetUid = 1; - oneof content { - string text = 2; - uint32 icon = 3; - } -} diff --git a/proto/PrivateChatRsp.proto b/proto/PrivateChatRsp.proto deleted file mode 100644 index 09e427ae8..000000000 --- a/proto/PrivateChatRsp.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message PrivateChatRsp { - int32 retcode = 1; - uint32 chatForbiddenEndtime = 2; -} diff --git a/proto/PropChangeReason.proto b/proto/PropChangeReason.proto deleted file mode 100644 index 123b1d6a7..000000000 --- a/proto/PropChangeReason.proto +++ /dev/null @@ -1,20 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum PropChangeReason { - PropChangeNone = 0; - PropChangeStatueRecover = 1; - PropChangeEnergyBall = 2; - PropChangeAbility = 3; - PropChangeLevelup = 4; - PropChangeItem = 5; - PropChangeAvatarCard = 6; - PropChangeCityLevelup = 7; - PropChangeAvatarUpgrade = 8; - PropChangeAvatarPromote = 9; - PropChangePlayerAddExp = 10; - PropChangeFinishQuest = 11; - PropChangeGm = 12; - PropChangeManualAdjustWorldLevel = 13; -} diff --git a/proto/PropPair.proto b/proto/PropPair.proto deleted file mode 100644 index 4a5ac0ee7..000000000 --- a/proto/PropPair.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "PropValue.proto"; - -message PropPair { - uint32 type = 1; - PropValue propValue = 2; -} diff --git a/proto/PropValue.proto b/proto/PropValue.proto deleted file mode 100644 index 6d905517d..000000000 --- a/proto/PropValue.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message PropValue { - uint32 type = 1; - oneof value { - uint32 ival = 2; - float fval = 3; - } - uint32 val = 4; -} diff --git a/proto/ProtEntityType.proto b/proto/ProtEntityType.proto deleted file mode 100644 index 9512f7d35..000000000 --- a/proto/ProtEntityType.proto +++ /dev/null @@ -1,21 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum ProtEntityType { - ProtEntityNone = 0; - ProtEntityAvatar = 1; - ProtEntityMonster = 2; - ProtEntityNpc = 3; - ProtEntityGadget = 4; - ProtEntityRegion = 5; - ProtEntityWeapon = 6; - ProtEntityWeather = 7; - ProtEntityScene = 8; - ProtEntityTeam = 9; - ProtEntityMassiveEntity = 10; - ProtEntityMpLevel = 11; - ProtEntityPlayTeamEntity = 12; - ProtEntityEyePoint = 13; - ProtEntityMax = 14; -} diff --git a/proto/ProudSkillChangeNotify.proto b/proto/ProudSkillChangeNotify.proto deleted file mode 100644 index fa5ca0bf5..000000000 --- a/proto/ProudSkillChangeNotify.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ProudSkillChangeNotify { - uint64 avatarGuid = 1; - uint32 entityId = 2; - uint32 skillDepotId = 3; - repeated uint32 proudSkillList = 4; -} diff --git a/proto/ProudSkillExtraLevelNotify.proto b/proto/ProudSkillExtraLevelNotify.proto deleted file mode 100644 index 4d612d33b..000000000 --- a/proto/ProudSkillExtraLevelNotify.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ProudSkillExtraLevelNotify { - uint64 avatarGuid = 1; - uint32 talentType = 2; - uint32 talentIndex = 3; - uint32 extraLevel = 4; -} diff --git a/proto/PullPrivateChatReq.proto b/proto/PullPrivateChatReq.proto deleted file mode 100644 index e7d48092b..000000000 --- a/proto/PullPrivateChatReq.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message PullPrivateChatReq { - uint32 targetUid = 1; - uint32 fromSequence = 2; - uint32 pullNum = 3; -} diff --git a/proto/PullPrivateChatRsp.proto b/proto/PullPrivateChatRsp.proto deleted file mode 100644 index 076ef87cf..000000000 --- a/proto/PullPrivateChatRsp.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "ChatInfo.proto"; - -message PullPrivateChatRsp { - int32 retcode = 1; - repeated ChatInfo chatInfo = 2; -} diff --git a/proto/PullRecentChatRsp.proto b/proto/PullRecentChatRsp.proto deleted file mode 100644 index 1aafd001d..000000000 --- a/proto/PullRecentChatRsp.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "ChatInfo.proto"; - -message PullRecentChatRsp { - int32 retcode = 1; - repeated ChatInfo chatInfo = 2; -} diff --git a/proto/QueryCurrRegionHttpRsp.proto b/proto/QueryCurrRegionHttpRsp.proto deleted file mode 100644 index 58c2c8be6..000000000 --- a/proto/QueryCurrRegionHttpRsp.proto +++ /dev/null @@ -1,14 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "RegionInfo.proto"; - -message QueryCurrRegionHttpRsp { - int32 retcode = 1; - string message = 2; - RegionInfo regionInfo = 3; - bytes clientSecretKey = 11; - bytes regionCustomConfigEncrypted = 12; - bytes clientRegionCustomConfigEncrypted = 13; -} diff --git a/proto/QueryRegionListHttpRsp.proto b/proto/QueryRegionListHttpRsp.proto deleted file mode 100644 index 934634f5d..000000000 --- a/proto/QueryRegionListHttpRsp.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "RegionSimpleInfo.proto"; - -message QueryRegionListHttpRsp { - uint32 retcode = 1; - repeated RegionSimpleInfo servers = 2; - bytes clientSecretKey = 5; - bytes clientCustomConfigEncrypted = 6; - bool enableLoginPc = 7; -} diff --git a/proto/RegionInfo.proto b/proto/RegionInfo.proto deleted file mode 100644 index 6cad3cb23..000000000 --- a/proto/RegionInfo.proto +++ /dev/null @@ -1,29 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "ResVersionConfig.proto"; - -message RegionInfo { - string ip = 1; - int32 port = 2; - string payCallbackUrl = 3; - string areaType = 7; - string resourceUrl = 8; - string dataUrl = 9; - string feedbackUrl = 10; - string bulletinUrl = 11; - string version = 12; - int32 clientDataVersion = 14; - int32 clientSilenceDataVersion = 18; - string clientDataMd5 = 19; - string clientSilenceDataMd5 = 20; - ResVersionConfig config = 22; - bytes secretKey = 23; - string communityUrl = 24; - string clientVersionSuffix = 26; - string clientSilenceVersionSuffix = 27; - string accountUrl = 31; - string cdkeyUrl = 32; - string privacyUrl = 33; - } diff --git a/proto/RegionSimpleInfo.proto b/proto/RegionSimpleInfo.proto deleted file mode 100644 index 093818fbc..000000000 --- a/proto/RegionSimpleInfo.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message RegionSimpleInfo { - string name = 1; - string title = 2; - string type = 3; - string dispatchUrl = 4; -} diff --git a/proto/Reliquary.proto b/proto/Reliquary.proto deleted file mode 100644 index 2801a5e42..000000000 --- a/proto/Reliquary.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message Reliquary { - uint32 level = 1; - uint32 exp = 2; - uint32 promoteLevel = 3; - uint32 mainPropId = 4; - repeated uint32 appendPropIdList = 5; -} diff --git a/proto/ReliquaryPromoteReq.proto b/proto/ReliquaryPromoteReq.proto deleted file mode 100644 index 1841ed866..000000000 --- a/proto/ReliquaryPromoteReq.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ReliquaryPromoteReq { - uint64 targetGuid = 1; - uint64 itemGuid = 2; -} diff --git a/proto/ReliquaryPromoteRsp.proto b/proto/ReliquaryPromoteRsp.proto deleted file mode 100644 index 053b51e83..000000000 --- a/proto/ReliquaryPromoteRsp.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ReliquaryPromoteRsp { - int32 retcode = 1; - uint64 targetReliquaryGuid = 2; - uint32 oldPromoteLevel = 3; - uint32 curPromoteLevel = 4; - repeated uint32 oldAppendPropList = 5; - repeated uint32 curAppendPropList = 6; -} diff --git a/proto/ReliquaryUpgradeReq.proto b/proto/ReliquaryUpgradeReq.proto deleted file mode 100644 index 468eeb98a..000000000 --- a/proto/ReliquaryUpgradeReq.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "ItemParam.proto"; - -message ReliquaryUpgradeReq { - uint64 targetReliquaryGuid = 1; - repeated uint64 foodReliquaryGuidList = 2; - repeated ItemParam itemParamList = 3; -} diff --git a/proto/ReliquaryUpgradeRsp.proto b/proto/ReliquaryUpgradeRsp.proto deleted file mode 100644 index 4bcdbed46..000000000 --- a/proto/ReliquaryUpgradeRsp.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ReliquaryUpgradeRsp { - int32 retcode = 1; - uint64 targetReliquaryGuid = 2; - uint32 oldLevel = 3; - uint32 curLevel = 4; - uint32 powerUpRate = 5; - repeated uint32 oldAppendPropList = 6; - repeated uint32 curAppendPropList = 7; -} diff --git a/proto/ResVersionConfig.proto b/proto/ResVersionConfig.proto deleted file mode 100644 index 71c053f3f..000000000 --- a/proto/ResVersionConfig.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ResVersionConfig { - int32 version = 1; - string md5 = 2; - string size = 3; - string versionSuffix = 4; - string branch = 5; -} diff --git a/proto/ResinCard.proto b/proto/ResinCard.proto deleted file mode 100644 index 66db1bad8..000000000 --- a/proto/ResinCard.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "ItemParam.proto"; - -message ResinCard { - repeated ItemParam baseItemList = 1; - repeated ItemParam perDayItemList = 2; -} diff --git a/proto/ResinChangeNotify.proto b/proto/ResinChangeNotify.proto deleted file mode 100644 index bf938b424..000000000 --- a/proto/ResinChangeNotify.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ResinChangeNotify { - int32 currValue = 1; - int32 nextAddTimestamp = 2; - int32 curBuyCount = 3; -} diff --git a/proto/ResinCostType.proto b/proto/ResinCostType.proto deleted file mode 100644 index 1c9ac3ff3..000000000 --- a/proto/ResinCostType.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum ResinCostType { - CostNone = 0; - CostNormal = 1; - CostCondense = 2; - CostReunionPrivilege = 3; - CostOpActivity = 4; - CostMaterial = 5; -} diff --git a/proto/Route.proto b/proto/Route.proto deleted file mode 100644 index 3394a9970..000000000 --- a/proto/Route.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "RoutePoint.proto"; - -message Route { - repeated RoutePoint routePoints = 1; - uint32 routeType = 2; -} diff --git a/proto/RoutePoint.proto b/proto/RoutePoint.proto deleted file mode 100644 index f4cb198be..000000000 --- a/proto/RoutePoint.proto +++ /dev/null @@ -1,19 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "MathQuaternion.proto"; -import "Vector.proto"; - -message RoutePoint { - Vector position = 1; - oneof moveParams { - float velocity = 11; - float time = 12; - } - oneof rotateParams { - Vector rotation = 21; - MathQuaternion rotationSpeed = 22; - MathQuaternion axisSpeed = 23; - } -} diff --git a/proto/SceneAreaWeatherNotify.proto b/proto/SceneAreaWeatherNotify.proto deleted file mode 100644 index 4d26db635..000000000 --- a/proto/SceneAreaWeatherNotify.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message SceneAreaWeatherNotify { - uint32 weatherGadgetId = 1; - map weatherValueMap = 2; - uint32 weatherAreaId = 3; - uint32 climateType = 4; - float transDuration = 5; -} diff --git a/proto/SceneAvatarInfo.proto b/proto/SceneAvatarInfo.proto deleted file mode 100644 index 5ce71c9f5..000000000 --- a/proto/SceneAvatarInfo.proto +++ /dev/null @@ -1,28 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "SceneReliquaryInfo.proto"; -import "SceneWeaponInfo.proto"; -import "ServerBuff.proto"; - -message SceneAvatarInfo { - uint32 playerId = 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; -} diff --git a/proto/SceneEntityAiInfo.proto b/proto/SceneEntityAiInfo.proto deleted file mode 100644 index b4754bd11..000000000 --- a/proto/SceneEntityAiInfo.proto +++ /dev/null @@ -1,16 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "ServantInfo.proto"; -import "Vector.proto"; - -message SceneEntityAiInfo { - bool isAiOpen = 1; - Vector bornPos = 2; - map skillCdMap = 3; - ServantInfo servantInfo = 4; - map aiThreatMap = 5; - map skillGroupCdMap = 6; - uint32 curTactic = 7; -} diff --git a/proto/SceneEntityAppearNotify.proto b/proto/SceneEntityAppearNotify.proto deleted file mode 100644 index 0694f1676..000000000 --- a/proto/SceneEntityAppearNotify.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "SceneEntityInfo.proto"; -import "VisionType.proto"; - -message SceneEntityAppearNotify { - repeated SceneEntityInfo entityList = 1; - VisionType appearType = 2; - uint32 param = 3; -} diff --git a/proto/SceneEntityDisappearNotify.proto b/proto/SceneEntityDisappearNotify.proto deleted file mode 100644 index 02871b5a4..000000000 --- a/proto/SceneEntityDisappearNotify.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "VisionType.proto"; - -message SceneEntityDisappearNotify { - repeated uint32 entityList = 1; - VisionType disappearType = 2; -} diff --git a/proto/SceneEntityInfo.proto b/proto/SceneEntityInfo.proto deleted file mode 100644 index d79fe4f58..000000000 --- a/proto/SceneEntityInfo.proto +++ /dev/null @@ -1,39 +0,0 @@ -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"; - -message SceneEntityInfo { - ProtEntityType entityType = 1; - uint32 entityId = 2; - string name = 3; - MotionInfo motionInfo = 4; - repeated PropPair propList = 5; - repeated FightPropPair fightPropList = 6; - uint32 lifeState = 7; - repeated AnimatorParameterValueInfoPair animatorParaList = 9; - oneof entity { - SceneAvatarInfo avatar = 10; - SceneMonsterInfo monster = 11; - SceneNpcInfo npc = 12; - SceneGadgetInfo gadget = 13; - } - uint32 lastMoveSceneTimeMs = 17; - uint32 lastMoveReliableSeq = 18; - EntityClientData entityClientData = 19; - repeated EntityEnvironmentInfo entityEnvironmentInfoList = 20; - EntityAuthorityInfo entityAuthorityInfo = 21; - repeated string tagList = 22; -} diff --git a/proto/SceneEntityMoveNotify.proto b/proto/SceneEntityMoveNotify.proto deleted file mode 100644 index 8e5016d75..000000000 --- a/proto/SceneEntityMoveNotify.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "MotionInfo.proto"; - -message SceneEntityMoveNotify { - uint32 entityId = 1; - MotionInfo motionInfo = 2; - uint32 sceneTime = 3; - uint32 reliableSeq = 4; -} diff --git a/proto/SceneForceUnlockNotify.proto b/proto/SceneForceUnlockNotify.proto deleted file mode 100644 index c78e2dd61..000000000 --- a/proto/SceneForceUnlockNotify.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message SceneForceUnlockNotify { - repeated uint32 forceIdList = 1; - bool isAdd = 2; -} diff --git a/proto/SceneGadgetInfo.proto b/proto/SceneGadgetInfo.proto deleted file mode 100644 index b4430fa0c..000000000 --- a/proto/SceneGadgetInfo.proto +++ /dev/null @@ -1,43 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "GadgetBornType.proto"; -import "GadgetClientParam.proto"; -import "GadgetPlayInfo.proto"; -import "Item.proto"; -import "PlatformInfo.proto"; - -message SceneGadgetInfo { - 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; - Item trifleItem = 12; - uint32 gatherGadget = 13; - uint32 worktop = 14; - GadgetClientParam clientGadget = 15; - uint32 weather = 17; - uint32 abilityGadget = 18; - uint32 statueGadget = 19; - uint32 bossChest = 20; - uint32 blossomChest = 41; - uint32 mpPlayReward = 42; - uint32 generalReward = 43; - uint32 offeringInfo = 44; - uint32 foundationInfo = 45; - 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/SceneInitFinishRsp.proto b/proto/SceneInitFinishRsp.proto deleted file mode 100644 index 1dfc6a2a9..000000000 --- a/proto/SceneInitFinishRsp.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message SceneInitFinishRsp { - int32 retcode = 1; - uint32 enterSceneToken = 2; -} diff --git a/proto/SceneKickPlayerNotify.proto b/proto/SceneKickPlayerNotify.proto deleted file mode 100644 index 6a400ae6f..000000000 --- a/proto/SceneKickPlayerNotify.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message SceneKickPlayerNotify { - uint32 kickerUid = 1; - uint32 targetUid = 2; -} diff --git a/proto/SceneKickPlayerReq.proto b/proto/SceneKickPlayerReq.proto deleted file mode 100644 index fe7e371b7..000000000 --- a/proto/SceneKickPlayerReq.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message SceneKickPlayerReq { - uint32 targetUid = 1; -} diff --git a/proto/SceneKickPlayerRsp.proto b/proto/SceneKickPlayerRsp.proto deleted file mode 100644 index 81100890d..000000000 --- a/proto/SceneKickPlayerRsp.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message SceneKickPlayerRsp { - int32 retcode = 1; - uint32 targetUid = 2; -} diff --git a/proto/SceneMonsterInfo.proto b/proto/SceneMonsterInfo.proto deleted file mode 100644 index f96c6c202..000000000 --- a/proto/SceneMonsterInfo.proto +++ /dev/null @@ -1,30 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "MonsterBornType.proto"; -import "MonsterRoute.proto"; -import "SceneWeaponInfo.proto"; - -message SceneMonsterInfo { - uint32 monsterId = 1; - uint32 groupId = 2; - uint32 configId = 3; - 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 unk1 = 21; -} diff --git a/proto/SceneNpcInfo.proto b/proto/SceneNpcInfo.proto deleted file mode 100644 index 22e811801..000000000 --- a/proto/SceneNpcInfo.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message SceneNpcInfo { - uint32 npcId = 1; - uint32 roomId = 2; - uint32 parentQuestId = 3; - uint32 blockId = 4; -} diff --git a/proto/ScenePlayerInfo.proto b/proto/ScenePlayerInfo.proto deleted file mode 100644 index d1dae174f..000000000 --- a/proto/ScenePlayerInfo.proto +++ /dev/null @@ -1,14 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "OnlinePlayerInfo.proto"; - -message ScenePlayerInfo { - uint32 uid = 1; - uint32 peerId = 2; - string name = 3; - bool isConnected = 4; - uint32 sceneId = 5; - OnlinePlayerInfo onlinePlayerInfo = 6; -} diff --git a/proto/ScenePlayerInfoNotify.proto b/proto/ScenePlayerInfoNotify.proto deleted file mode 100644 index 2c10873a5..000000000 --- a/proto/ScenePlayerInfoNotify.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "ScenePlayerInfo.proto"; - -message ScenePlayerInfoNotify { - repeated ScenePlayerInfo playerInfoList = 1; -} diff --git a/proto/ScenePlayerLocationNotify.proto b/proto/ScenePlayerLocationNotify.proto deleted file mode 100644 index 6eccf373b..000000000 --- a/proto/ScenePlayerLocationNotify.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "PlayerLocationInfo.proto"; - -message ScenePlayerLocationNotify { - uint32 sceneId = 1; - repeated PlayerLocationInfo playerLocList = 2; -} diff --git a/proto/SceneReliquaryInfo.proto b/proto/SceneReliquaryInfo.proto deleted file mode 100644 index 122ca88b2..000000000 --- a/proto/SceneReliquaryInfo.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message SceneReliquaryInfo { - uint32 itemId = 1; - uint64 guid = 2; - uint32 level = 3; - uint32 promoteLevel = 4; -} diff --git a/proto/SceneTeamAvatar.proto b/proto/SceneTeamAvatar.proto deleted file mode 100644 index 0b4683910..000000000 --- a/proto/SceneTeamAvatar.proto +++ /dev/null @@ -1,29 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AbilityControlBlock.proto"; -import "AbilitySyncStateInfo.proto"; -import "AvatarInfo.proto"; -import "SceneAvatarInfo.proto"; -import "SceneEntityInfo.proto"; -import "ServerBuff.proto"; - -message SceneTeamAvatar { - uint32 playerId = 1; - uint64 avatarGuid = 2; - uint32 sceneId = 3; - uint32 entityId = 4; - AvatarInfo avatarInfo = 5; - SceneAvatarInfo sceneAvatarInfo = 6; - AbilitySyncStateInfo avatarAbilityInfo = 7; - repeated ServerBuff serverBuffList = 8; - SceneEntityInfo sceneEntityInfo = 9; - uint64 weaponGuid = 10; - uint32 weaponEntityId = 11; - AbilitySyncStateInfo weaponAbilityInfo = 12; - AbilityControlBlock abilityControlBlock = 13; - bool isReconnect = 14; - bool isPlayerCurAvatar = 15; - bool isOnScene = 16; -} diff --git a/proto/SceneTeamUpdateNotify.proto b/proto/SceneTeamUpdateNotify.proto deleted file mode 100644 index 6aa586ccc..000000000 --- a/proto/SceneTeamUpdateNotify.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "SceneTeamAvatar.proto"; - -message SceneTeamUpdateNotify { - repeated SceneTeamAvatar sceneTeamAvatarList = 1; - bool isInMp = 3; -} diff --git a/proto/SceneTimeNotify.proto b/proto/SceneTimeNotify.proto deleted file mode 100644 index cafe00ad7..000000000 --- a/proto/SceneTimeNotify.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message SceneTimeNotify { - uint32 sceneId = 1; - bool isPaused = 2; - uint64 sceneTime = 3; -} diff --git a/proto/SceneUnlockInfo.proto b/proto/SceneUnlockInfo.proto deleted file mode 100644 index d4dfa2f4f..000000000 --- a/proto/SceneUnlockInfo.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message SceneUnlockInfo { - uint32 sceneId = 1; - bool isLocked = 2; - repeated uint32 sceneTagIdList = 3; -} diff --git a/proto/SceneUnlockInfoNotify.proto b/proto/SceneUnlockInfoNotify.proto deleted file mode 100644 index 28be03d6c..000000000 --- a/proto/SceneUnlockInfoNotify.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "SceneUnlockInfo.proto"; - -message SceneUnlockInfoNotify { - repeated SceneUnlockInfo unlockInfos = 1; -} diff --git a/proto/SceneWeaponInfo.proto b/proto/SceneWeaponInfo.proto deleted file mode 100644 index 5b823b9f5..000000000 --- a/proto/SceneWeaponInfo.proto +++ /dev/null @@ -1,16 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AbilitySyncStateInfo.proto"; - -message SceneWeaponInfo { - uint32 entityId = 1; - uint32 gadgetId = 2; - uint32 itemId = 3; - uint64 guid = 4; - uint32 level = 5; - uint32 promoteLevel = 6; - AbilitySyncStateInfo abilityInfo = 7; - map affixMap = 8; -} diff --git a/proto/ServantInfo.proto b/proto/ServantInfo.proto deleted file mode 100644 index e4c04e33f..000000000 --- a/proto/ServantInfo.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ServantInfo { - uint32 masterEntityId = 1; - uint32 bornSlotIndex = 2; -} diff --git a/proto/ServerBuff.proto b/proto/ServerBuff.proto deleted file mode 100644 index 0de4768e2..000000000 --- a/proto/ServerBuff.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ServerBuff { - uint32 serverBuffUid = 1; - uint32 serverBuffId = 2; - uint32 serverBuffType = 3; - uint32 instancedModifierId = 4; - repeated uint32 doneOnaddedActionList = 5; - bool isOnaddedActionAllow = 6; -} diff --git a/proto/ServerTimeNotify.proto b/proto/ServerTimeNotify.proto deleted file mode 100644 index 9452ef804..000000000 --- a/proto/ServerTimeNotify.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ServerTimeNotify { - uint64 serverTime = 1; -} diff --git a/proto/SetEquipLockStateReq.proto b/proto/SetEquipLockStateReq.proto deleted file mode 100644 index 55f3f9373..000000000 --- a/proto/SetEquipLockStateReq.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message SetEquipLockStateReq { - uint64 targetEquipGuid = 1; - bool isLocked = 2; -} diff --git a/proto/SetEquipLockStateRsp.proto b/proto/SetEquipLockStateRsp.proto deleted file mode 100644 index fe70b22dd..000000000 --- a/proto/SetEquipLockStateRsp.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message SetEquipLockStateRsp { - int32 retcode = 1; - uint64 targetEquipGuid = 2; - bool isLocked = 3; -} diff --git a/proto/SetNameCardReq.proto b/proto/SetNameCardReq.proto deleted file mode 100644 index 4452d3bf6..000000000 --- a/proto/SetNameCardReq.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message SetNameCardReq { - uint32 nameCardId = 1; -} diff --git a/proto/SetNameCardRsp.proto b/proto/SetNameCardRsp.proto deleted file mode 100644 index 821c019cd..000000000 --- a/proto/SetNameCardRsp.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message SetNameCardRsp { - int32 retcode = 1; - uint32 nameCardId = 2; -} diff --git a/proto/SetPlayerBornDataReq.proto b/proto/SetPlayerBornDataReq.proto deleted file mode 100644 index 56b6fd3cf..000000000 --- a/proto/SetPlayerBornDataReq.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message SetPlayerBornDataReq { - uint32 avatarId = 1; - string nickName = 2; -} diff --git a/proto/SetPlayerHeadImageReq.proto b/proto/SetPlayerHeadImageReq.proto deleted file mode 100644 index 90016ced6..000000000 --- a/proto/SetPlayerHeadImageReq.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message SetPlayerHeadImageReq { - uint32 avatarId = 1; -} diff --git a/proto/SetPlayerHeadImageRsp.proto b/proto/SetPlayerHeadImageRsp.proto deleted file mode 100644 index 6a2ea445f..000000000 --- a/proto/SetPlayerHeadImageRsp.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "HeadImage.proto"; - -message SetPlayerHeadImageRsp { - int32 retcode = 1; - HeadImage avatar = 3; -} diff --git a/proto/SetPlayerNameReq.proto b/proto/SetPlayerNameReq.proto deleted file mode 100644 index 558eb0fbd..000000000 --- a/proto/SetPlayerNameReq.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message SetPlayerNameReq { - string nickName = 1; -} diff --git a/proto/SetPlayerNameRsp.proto b/proto/SetPlayerNameRsp.proto deleted file mode 100644 index b4b02e63f..000000000 --- a/proto/SetPlayerNameRsp.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message SetPlayerNameRsp { - int32 retcode = 1; - string nickName = 2; -} diff --git a/proto/SetPlayerPropReq.proto b/proto/SetPlayerPropReq.proto deleted file mode 100644 index d08c2a50f..000000000 --- a/proto/SetPlayerPropReq.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "PropValue.proto"; - -message SetPlayerPropReq { - repeated PropValue propList = 1; -} diff --git a/proto/SetPlayerPropRsp.proto b/proto/SetPlayerPropRsp.proto deleted file mode 100644 index 62d231e96..000000000 --- a/proto/SetPlayerPropRsp.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message SetPlayerPropRsp { - int32 retcode = 1; -} diff --git a/proto/SetPlayerSignatureReq.proto b/proto/SetPlayerSignatureReq.proto deleted file mode 100644 index 595345bcd..000000000 --- a/proto/SetPlayerSignatureReq.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message SetPlayerSignatureReq { - string signature = 1; -} diff --git a/proto/SetPlayerSignatureRsp.proto b/proto/SetPlayerSignatureRsp.proto deleted file mode 100644 index ca09cd1b2..000000000 --- a/proto/SetPlayerSignatureRsp.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message SetPlayerSignatureRsp { - int32 retcode = 1; - string signature = 2; -} diff --git a/proto/SetUpAvatarTeamReq.proto b/proto/SetUpAvatarTeamReq.proto deleted file mode 100644 index b950cb25a..000000000 --- a/proto/SetUpAvatarTeamReq.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message SetUpAvatarTeamReq { - uint32 teamId = 1; - repeated uint64 avatarTeamGuidList = 2; - uint64 curAvatarGuid = 3; -} diff --git a/proto/SetUpAvatarTeamRsp.proto b/proto/SetUpAvatarTeamRsp.proto deleted file mode 100644 index fdb634b8d..000000000 --- a/proto/SetUpAvatarTeamRsp.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message SetUpAvatarTeamRsp { - int32 retcode = 1; - uint32 teamId = 2; - repeated uint64 avatarTeamGuidList = 3; - uint64 curAvatarGuid = 4; -} diff --git a/proto/Shop.proto b/proto/Shop.proto deleted file mode 100644 index 2172757b8..000000000 --- a/proto/Shop.proto +++ /dev/null @@ -1,17 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "ShopCardProduct.proto"; -import "ShopGoods.proto"; -import "ShopMcoinProduct.proto"; - -message Shop { - uint32 shopType = 1; - repeated ShopGoods goodsList = 2; - repeated ShopMcoinProduct mcoinProductList = 3; - repeated ShopCardProduct cardProductList = 4; - uint32 nextRefreshTime = 6; - uint32 cityId = 7; - uint32 cityReputationLevel = 8; -} diff --git a/proto/ShopCardProduct.proto b/proto/ShopCardProduct.proto deleted file mode 100644 index 88b95f7b6..000000000 --- a/proto/ShopCardProduct.proto +++ /dev/null @@ -1,18 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "ResinCard.proto"; - -message ShopCardProduct { - string productId = 1; - string priceTier = 2; - uint32 mcoinBase = 3; - uint32 hcoinPerDay = 4; - uint32 days = 5; - uint32 remainRewardDays = 6; - uint32 cardProductType = 7; - oneof extraCardData { - ResinCard resinCard = 101; - } -} diff --git a/proto/ShopGoods.proto b/proto/ShopGoods.proto deleted file mode 100644 index 672578c54..000000000 --- a/proto/ShopGoods.proto +++ /dev/null @@ -1,24 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "ItemParam.proto"; - -message ShopGoods { - uint32 goodsId = 1; - ItemParam goodsItem = 2; - uint32 scoin = 3; - uint32 hcoin = 4; - repeated ItemParam costItemList = 5; - uint32 boughtNum = 6; - uint32 buyLimit = 7; - uint32 beginTime = 8; - uint32 endTime = 9; - uint32 nextRefreshTime = 10; - uint32 minLevel = 11; - uint32 maxLevel = 12; - repeated uint32 preGoodsIdList = 13; - uint32 mcoin = 14; - uint32 disableType = 15; - uint32 secondarySheetId = 16; -} diff --git a/proto/ShopGoodsDisableType.proto b/proto/ShopGoodsDisableType.proto deleted file mode 100644 index 2c1b19bd0..000000000 --- a/proto/ShopGoodsDisableType.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum ShopGoodsDisableType { - ShopGoodsDisableNone = 0; - ShopGoodsDisableTalentFull = 1; - ShopGoodsDisableFurnitureFormulaUnlocked = 2; -} diff --git a/proto/ShopMcoinProduct.proto b/proto/ShopMcoinProduct.proto deleted file mode 100644 index 53f3dcbf3..000000000 --- a/proto/ShopMcoinProduct.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ShopMcoinProduct { - string productId = 1; - string priceTier = 2; - uint32 mcoinBase = 3; - uint32 mcoinNonFirst = 4; - uint32 mcoinFirst = 5; - uint32 boughtNum = 6; - bool isAudit = 7; -} diff --git a/proto/ShortAbilityHashPair.proto b/proto/ShortAbilityHashPair.proto deleted file mode 100644 index 0eaf10422..000000000 --- a/proto/ShortAbilityHashPair.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message ShortAbilityHashPair { - int32 abilityNameHash = 1; - int32 abilityConfigHash = 2; -} diff --git a/proto/SocialDetail.proto b/proto/SocialDetail.proto deleted file mode 100644 index bc97aa184..000000000 --- a/proto/SocialDetail.proto +++ /dev/null @@ -1,34 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "Birthday.proto"; -import "FriendEnterHomeOption.proto"; -import "HeadImage.proto"; -import "SocialShowAvatarInfo.proto"; - -message SocialDetail { - uint32 uid = 1; - string nickname = 2; - uint32 level = 3; - string signature = 5; - Birthday birthday = 6; - uint32 worldLevel = 7; - uint32 unk1 = 9; - //FriendOnlineState onlineState = 10; - //bool isMpModeAvailable = 10; - bool isFriend = 11; - uint32 unk3 = 12; - uint32 lastActiveTime = 13; - uint32 nameCardId = 14; - bool isInBlacklist = 15; - bool isChatNoDisturb = 16; - string remarkName = 17; - uint32 finishAchievementNum = 18; - uint32 towerFloorIndex = 19; - uint32 towerLevelIndex = 20; - bool isShowAvatar = 21; - repeated SocialShowAvatarInfo showAvatarInfoList = 22; - FriendEnterHomeOption friendEnterHomeOption = 23; - HeadImage avatar = 25; -} diff --git a/proto/SocialShowAvatarInfo.proto b/proto/SocialShowAvatarInfo.proto deleted file mode 100644 index 921cb298a..000000000 --- a/proto/SocialShowAvatarInfo.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message SocialShowAvatarInfo { - uint32 avatarId = 1; - uint32 level = 2; -} diff --git a/proto/StoreItemChangeNotify.proto b/proto/StoreItemChangeNotify.proto deleted file mode 100644 index 270d5e46f..000000000 --- a/proto/StoreItemChangeNotify.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "Item.proto"; -import "StoreType.proto"; - -message StoreItemChangeNotify { - StoreType storeType = 1; - repeated Item itemList = 2; -} diff --git a/proto/StoreItemDelNotify.proto b/proto/StoreItemDelNotify.proto deleted file mode 100644 index 69a70a8e7..000000000 --- a/proto/StoreItemDelNotify.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "StoreType.proto"; - -message StoreItemDelNotify { - StoreType storeType = 1; - repeated uint64 guidList = 2; -} diff --git a/proto/StoreType.proto b/proto/StoreType.proto deleted file mode 100644 index 78e35b4c1..000000000 --- a/proto/StoreType.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum StoreType { - StoreNone = 0; - StorePack = 1; - StoreDepot = 2; -} diff --git a/proto/StoreWeightLimitNotify.proto b/proto/StoreWeightLimitNotify.proto deleted file mode 100644 index 236bacd59..000000000 --- a/proto/StoreWeightLimitNotify.proto +++ /dev/null @@ -1,14 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "StoreType.proto"; - -message StoreWeightLimitNotify { - StoreType storeType = 1; - uint32 weightLimit = 3; - uint32 materialCountLimit = 4; - uint32 weaponCountLimit = 5; - uint32 reliquaryCountLimit = 6; - uint32 furnitureCountLimit = 7; -} diff --git a/proto/SyncScenePlayTeamEntityNotify.proto b/proto/SyncScenePlayTeamEntityNotify.proto deleted file mode 100644 index 1ffe7be6a..000000000 --- a/proto/SyncScenePlayTeamEntityNotify.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message SyncScenePlayTeamEntityNotify { - uint32 sceneId = 1; - //repeated PlayTeamEntityInfo entityInfoList = 2; -} diff --git a/proto/SyncTeamEntityNotify.proto b/proto/SyncTeamEntityNotify.proto deleted file mode 100644 index 1555e37e9..000000000 --- a/proto/SyncTeamEntityNotify.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "TeamEntityInfo.proto"; - -message SyncTeamEntityNotify { - uint32 sceneId = 1; - repeated TeamEntityInfo teamEntityInfoList = 2; -} diff --git a/proto/SystemHint.proto b/proto/SystemHint.proto deleted file mode 100644 index 2bc1f19ef..000000000 --- a/proto/SystemHint.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message SystemHint { - uint32 type = 1; -} diff --git a/proto/TakeoffEquipReq.proto b/proto/TakeoffEquipReq.proto deleted file mode 100644 index bcd6278af..000000000 --- a/proto/TakeoffEquipReq.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message TakeoffEquipReq { - uint64 avatarGuid = 1; - uint32 slot = 2; -} diff --git a/proto/TakeoffEquipRsp.proto b/proto/TakeoffEquipRsp.proto deleted file mode 100644 index ded14965d..000000000 --- a/proto/TakeoffEquipRsp.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message TakeoffEquipRsp { - int32 retcode = 1; - uint64 avatarGuid = 2; - uint32 slot = 3; -} diff --git a/proto/TeamEnterSceneInfo.proto b/proto/TeamEnterSceneInfo.proto deleted file mode 100644 index d0144a81e..000000000 --- a/proto/TeamEnterSceneInfo.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AbilitySyncStateInfo.proto"; - -message TeamEnterSceneInfo { - uint32 teamEntityId = 1; - AbilitySyncStateInfo teamAbilityInfo = 2; - AbilitySyncStateInfo unk = 3; -} diff --git a/proto/TeamEntityInfo.proto b/proto/TeamEntityInfo.proto deleted file mode 100644 index 5f0240ae5..000000000 --- a/proto/TeamEntityInfo.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AbilitySyncStateInfo.proto"; - -message TeamEntityInfo { - uint32 teamEntityId = 1; - uint32 authorityPeerId = 2; - AbilitySyncStateInfo teamAbilityInfo = 3; -} diff --git a/proto/TeamResonanceChangeNotify.proto b/proto/TeamResonanceChangeNotify.proto deleted file mode 100644 index 592fc8a98..000000000 --- a/proto/TeamResonanceChangeNotify.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "AvatarTeamResonanceInfo.proto"; - -message TeamResonanceChangeNotify { - repeated AvatarTeamResonanceInfo infoList = 1; -} diff --git a/proto/TowerAllDataRsp.proto b/proto/TowerAllDataRsp.proto deleted file mode 100644 index 7fde18c16..000000000 --- a/proto/TowerAllDataRsp.proto +++ /dev/null @@ -1,27 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "TowerCurLevelRecord.proto"; -import "TowerFloorRecord.proto"; -import "TowerMonthlyBrief.proto"; - -message TowerAllDataRsp { - uint32 towerScheduleId = 1; - repeated TowerFloorRecord towerFloorRecordList = 2; - uint32 dailyFloorId = 3; - uint32 dailyLevelIndex = 4; - TowerCurLevelRecord curLevelRecord = 5; - uint32 nextScheduleChangeTime = 6; - map floorOpenTimeMap = 7; - bool isFirstInteract = 8; - TowerMonthlyBrief monthlyBrief = 9; - uint32 skipToFloorIndex = 10; - uint32 commemorativeRewardId = 11; - map skipFloorGrantedRewardItemMap = 12; - uint32 validTowerRecordNum = 13; - int32 retcode = 14; - bool isFinishedEntranceFloor = 15; - uint32 scheduleStartTime = 16; - TowerMonthlyBrief lastScheduleMonthlyBrief = 17; -} diff --git a/proto/TowerCurLevelRecord.proto b/proto/TowerCurLevelRecord.proto deleted file mode 100644 index 6c4a282f5..000000000 --- a/proto/TowerCurLevelRecord.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "TowerTeam.proto"; - -message TowerCurLevelRecord { - uint32 curFloorId = 1; - uint32 curLevelIndex = 2; - repeated TowerTeam towerTeamList = 3; - repeated uint32 buffIdList = 4; - bool isEmpty = 5; -} diff --git a/proto/TowerFloorRecord.proto b/proto/TowerFloorRecord.proto deleted file mode 100644 index 7096d2b29..000000000 --- a/proto/TowerFloorRecord.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "TowerLevelRecord.proto"; - -message TowerFloorRecord { - uint32 floorId = 1; - map passedLevelMap = 2; - uint32 floorStarRewardProgress = 3; - repeated TowerLevelRecord passedLevelRecordList = 4; -} diff --git a/proto/TowerLevelRecord.proto b/proto/TowerLevelRecord.proto deleted file mode 100644 index e0e5d95c1..000000000 --- a/proto/TowerLevelRecord.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message TowerLevelRecord { - uint32 levelId = 1; - repeated uint32 satisfiedCondList = 2; -} diff --git a/proto/TowerMonthlyBrief.proto b/proto/TowerMonthlyBrief.proto deleted file mode 100644 index 69b0b90de..000000000 --- a/proto/TowerMonthlyBrief.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message TowerMonthlyBrief { - uint32 towerScheduleId = 1; - uint32 bestFloorIndex = 2; - uint32 bestLevelIndex = 3; - uint32 totalStarCount = 4; -} diff --git a/proto/TowerTeam.proto b/proto/TowerTeam.proto deleted file mode 100644 index a478afe7e..000000000 --- a/proto/TowerTeam.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message TowerTeam { - uint32 towerTeamId = 1; - repeated uint64 avatarGuidList = 2; -} diff --git a/proto/TrackingIOInfo.proto b/proto/TrackingIOInfo.proto deleted file mode 100644 index 0b618cb99..000000000 --- a/proto/TrackingIOInfo.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message TrackingIOInfo { - string appid = 1; - string deviceid = 2; - string mac = 3; - string rydevicetype = 4; - string clientTz = 5; - string currentCaid = 6; - string cachedCaid = 7; -} diff --git a/proto/TrialAvatarGrantRecord.proto b/proto/TrialAvatarGrantRecord.proto deleted file mode 100644 index 45dd737c4..000000000 --- a/proto/TrialAvatarGrantRecord.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message TrialAvatarGrantRecord { - uint32 grantReason = 1; - uint32 fromParentQuestId = 2; -} diff --git a/proto/TrialAvatarInfo.proto b/proto/TrialAvatarInfo.proto deleted file mode 100644 index 867c72369..000000000 --- a/proto/TrialAvatarInfo.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "Item.proto"; -import "TrialAvatarGrantRecord.proto"; - -message TrialAvatarInfo { - uint32 trialAvatarId = 1; - repeated Item trialEquipList = 2; - TrialAvatarGrantRecord grantRecord = 3; -} diff --git a/proto/UnionCmd.proto b/proto/UnionCmd.proto deleted file mode 100644 index ed4747651..000000000 --- a/proto/UnionCmd.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message UnionCmd { - uint32 messageId = 1; - bytes body = 2; -} diff --git a/proto/UnionCmdNotify.proto b/proto/UnionCmdNotify.proto deleted file mode 100644 index 04ff8d910..000000000 --- a/proto/UnionCmdNotify.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "UnionCmd.proto"; - -message UnionCmdNotify { - repeated UnionCmd cmdList = 1; -} diff --git a/proto/UnlockAvatarTalentReq.proto b/proto/UnlockAvatarTalentReq.proto deleted file mode 100644 index b0cc42086..000000000 --- a/proto/UnlockAvatarTalentReq.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message UnlockAvatarTalentReq { - uint64 avatarGuid = 1; - uint32 talentId = 2; -} diff --git a/proto/UnlockAvatarTalentRsp.proto b/proto/UnlockAvatarTalentRsp.proto deleted file mode 100644 index 8bb323484..000000000 --- a/proto/UnlockAvatarTalentRsp.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message UnlockAvatarTalentRsp { - int32 retcode = 1; - uint64 avatarGuid = 2; - uint32 talentId = 3; -} diff --git a/proto/UnlockNameCardNotify.proto b/proto/UnlockNameCardNotify.proto deleted file mode 100644 index 193be0551..000000000 --- a/proto/UnlockNameCardNotify.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message UnlockNameCardNotify { - uint32 nameCardId = 1; -} diff --git a/proto/UseItemReq.proto b/proto/UseItemReq.proto deleted file mode 100644 index 227697ddb..000000000 --- a/proto/UseItemReq.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message UseItemReq { - uint64 guid = 1; - uint32 count = 2; - uint64 targetGuid = 3; - uint32 optionIdx = 4; - bool isEnterMpDungeonTeam = 5; -} diff --git a/proto/UseItemRsp.proto b/proto/UseItemRsp.proto deleted file mode 100644 index 03add18fd..000000000 --- a/proto/UseItemRsp.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message UseItemRsp { - int32 retcode = 1; - uint64 guid = 2; - uint32 itemId = 3; - uint64 targetGuid = 4; - uint32 optionIdx = 5; -} diff --git a/proto/Vector.proto b/proto/Vector.proto deleted file mode 100644 index 562e7436a..000000000 --- a/proto/Vector.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message Vector { - float x = 1; - float y = 2; - float z = 3; -} diff --git a/proto/VisionType.proto b/proto/VisionType.proto deleted file mode 100644 index c3c30492d..000000000 --- a/proto/VisionType.proto +++ /dev/null @@ -1,21 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -enum VisionType { - VisionNone = 0; - VisionMeet = 1; - VisionReborn = 2; - VisionReplace = 3; - VisionWaypointReborn = 4; - VisionMiss = 5; - VisionDie = 6; - VisionGatherEscape = 7; - VisionRefresh = 8; - VisionTransport = 9; - VisionReplaceDie = 10; - VisionReplaceNoNotify = 11; - VisionBorn = 12; - VisionPickup = 13; - VisionRemove = 14; -} diff --git a/proto/Weapon.proto b/proto/Weapon.proto deleted file mode 100644 index e199f58d6..000000000 --- a/proto/Weapon.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message Weapon { - uint32 level = 1; - uint32 exp = 2; - uint32 promoteLevel = 3; - map affixMap = 4; -} diff --git a/proto/WeaponAwakenReq.proto b/proto/WeaponAwakenReq.proto deleted file mode 100644 index 2775c8dbb..000000000 --- a/proto/WeaponAwakenReq.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message WeaponAwakenReq { - uint64 targetWeaponGuid = 1; - uint64 itemGuid = 2; - map affixLevelMap = 3; -} diff --git a/proto/WeaponAwakenRsp.proto b/proto/WeaponAwakenRsp.proto deleted file mode 100644 index 2400cabb2..000000000 --- a/proto/WeaponAwakenRsp.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message WeaponAwakenRsp { - int32 retcode = 1; - uint64 targetWeaponGuid = 2; - uint32 targetWeaponAwakenLevel = 3; - map oldAffixLevelMap = 4; - map curAffixLevelMap = 5; - uint64 avatarGuid = 6; -} diff --git a/proto/WeaponPromoteReq.proto b/proto/WeaponPromoteReq.proto deleted file mode 100644 index dc47477fc..000000000 --- a/proto/WeaponPromoteReq.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message WeaponPromoteReq { - uint64 targetWeaponGuid = 1; -} diff --git a/proto/WeaponPromoteRsp.proto b/proto/WeaponPromoteRsp.proto deleted file mode 100644 index efd7bfb5d..000000000 --- a/proto/WeaponPromoteRsp.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message WeaponPromoteRsp { - int32 retcode = 1; - uint64 targetWeaponGuid = 2; - uint32 oldPromoteLevel = 3; - uint32 curPromoteLevel = 4; -} diff --git a/proto/WeaponUpgradeReq.proto b/proto/WeaponUpgradeReq.proto deleted file mode 100644 index 93e69622b..000000000 --- a/proto/WeaponUpgradeReq.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "ItemParam.proto"; - -message WeaponUpgradeReq { - uint64 targetWeaponGuid = 1; - repeated uint64 foodWeaponGuidList = 2; - repeated ItemParam itemParamList = 3; -} diff --git a/proto/WeaponUpgradeRsp.proto b/proto/WeaponUpgradeRsp.proto deleted file mode 100644 index 77a71f24b..000000000 --- a/proto/WeaponUpgradeRsp.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "ItemParam.proto"; - -message WeaponUpgradeRsp { - int32 retcode = 1; - uint64 targetWeaponGuid = 2; - uint32 oldLevel = 3; - uint32 curLevel = 4; - repeated ItemParam itemParamList = 5; -} diff --git a/proto/WearEquipReq.proto b/proto/WearEquipReq.proto deleted file mode 100644 index 805377d4d..000000000 --- a/proto/WearEquipReq.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message WearEquipReq { - uint64 avatarGuid = 1; - uint64 equipGuid = 2; -} diff --git a/proto/WearEquipRsp.proto b/proto/WearEquipRsp.proto deleted file mode 100644 index 61bb36666..000000000 --- a/proto/WearEquipRsp.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message WearEquipRsp { - int32 retcode = 1; - uint64 avatarGuid = 2; - uint64 equipGuid = 3; -} diff --git a/proto/WeeklyBossResinDiscountInfo.proto b/proto/WeeklyBossResinDiscountInfo.proto deleted file mode 100644 index 2c9a85e04..000000000 --- a/proto/WeeklyBossResinDiscountInfo.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message WeeklyBossResinDiscountInfo { - uint32 discountNum = 1; - uint32 discountNumLimit = 2; - uint32 resinCost = 3; - uint32 originalResinCost = 4; -} diff --git a/proto/WorldDataNotify.proto b/proto/WorldDataNotify.proto deleted file mode 100644 index 9bb4e73be..000000000 --- a/proto/WorldDataNotify.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "PropValue.proto"; - -message WorldDataNotify { - map worldPropMap = 1; -} diff --git a/proto/WorldPlayerDieNotify.proto b/proto/WorldPlayerDieNotify.proto deleted file mode 100644 index 36ecf0425..000000000 --- a/proto/WorldPlayerDieNotify.proto +++ /dev/null @@ -1,14 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "PlayerDieType.proto"; - -message WorldPlayerDieNotify { - PlayerDieType dieType = 1; - uint32 murdererEntityId = 2; - oneof entity { - uint32 monsterId = 3; - uint32 gadgetId = 4; - } -} diff --git a/proto/WorldPlayerInfoNotify.proto b/proto/WorldPlayerInfoNotify.proto deleted file mode 100644 index e9266b666..000000000 --- a/proto/WorldPlayerInfoNotify.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "OnlinePlayerInfo.proto"; - -message WorldPlayerInfoNotify { - repeated OnlinePlayerInfo playerInfoList = 1; - repeated uint32 playerUidList = 2; -} diff --git a/proto/WorldPlayerLocationNotify.proto b/proto/WorldPlayerLocationNotify.proto deleted file mode 100644 index d43efba0c..000000000 --- a/proto/WorldPlayerLocationNotify.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "PlayerLocationInfo.proto"; - -message WorldPlayerLocationNotify { - repeated PlayerLocationInfo playerLocList = 1; -} diff --git a/proto/WorldPlayerRTTNotify.proto b/proto/WorldPlayerRTTNotify.proto deleted file mode 100644 index 56474c13e..000000000 --- a/proto/WorldPlayerRTTNotify.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -import "PlayerRTTInfo.proto"; - -message WorldPlayerRTTNotify { - repeated PlayerRTTInfo playerRttList = 1; -} diff --git a/proto/WorldPlayerReviveRsp.proto b/proto/WorldPlayerReviveRsp.proto deleted file mode 100644 index 1c823e8b6..000000000 --- a/proto/WorldPlayerReviveRsp.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - -message WorldPlayerReviveRsp { - int32 retcode = 1; -} diff --git a/proxy.py b/proxy.py index 1961c90dc..b352af3ac 100644 --- a/proxy.py +++ b/proxy.py @@ -20,7 +20,7 @@ # ## -from mitmproxy import ctx, http +from mitmproxy import http class MlgmXyysd_Genshin_Impact_Proxy: @@ -53,16 +53,13 @@ class MlgmXyysd_Genshin_Impact_Proxy: "hk4e-sdk-os-static.hoyoverse.com", "sdk-os-static.hoyoverse.com", "api-account-os.hoyoverse.com", - "hk4e-sdk-os.hoyoverse.com" + "hk4e-sdk-os.hoyoverse.com", + "overseauspider.yuanshen.com" ] - if flow.request.url.startswith("http://overseauspider.yuanshen.com:8888/log"): - ctx.log.info("Block overseauspider.yuanshen.com") - flow.response = http.HTTPResponse.make(404) - elif flow.request.host in LIST_DOMAINS: - ctx.log.info("Redirect " + flow.request.host) + if flow.request.host in LIST_DOMAINS: flow.request.host = REMOTE_HOST addons = [ MlgmXyysd_Genshin_Impact_Proxy() -] \ No newline at end of file +] diff --git a/run.bat b/run.bat deleted file mode 100644 index 36530cf77..000000000 --- a/run.bat +++ /dev/null @@ -1,7 +0,0 @@ -@echo off - - - -::This will not work if your java is in a different location, plugin as necessary -::this just saves you from changing your PATH -"C:\Program Files\Java\jdk1.8.0_202\bin\java.exe" -jar ./grasscutter.jar \ No newline at end of file diff --git a/src/main/java/emu/grasscutter/commands/PlayerCommands.java b/src/main/java/emu/grasscutter/commands/PlayerCommands.java index 795c91f77..779e91ef9 100644 --- a/src/main/java/emu/grasscutter/commands/PlayerCommands.java +++ b/src/main/java/emu/grasscutter/commands/PlayerCommands.java @@ -189,35 +189,26 @@ public final class PlayerCommands { description = "Gives the player a specified character", permission = "player.givechar") public static class GiveCharCommand implements CommandHandler { @Override public void execute(GenshinPlayer player, List args) { - int target, avatarID, level = 1, ascension = 1; + int target, avatarId, level = 1, ascension = 1; - if(args.size() < 2) { - CommandHandler.sendMessage(null, "Usage: givechar [level]"); + if(args.size() < 1) { + CommandHandler.sendMessage(player, "Usage: givechar [level]"); return; } switch(args.size()) { default: - CommandHandler.sendMessage(null, "Usage: givechar [level]"); + CommandHandler.sendMessage(player, "Usage: givechar [level]"); return; - case 1: - try { - avatarID = Integer.parseInt(args.get(0)); - target = player.getAccount().getPlayerId(); - } catch (NumberFormatException ignored) { - // TODO: Parse from avatar name using GM Handbook. - CommandHandler.sendMessage(player, "Invalid avatar id."); - return; - } - break; case 2: try { target = Integer.parseInt(args.get(0)); if(Grasscutter.getGameServer().getPlayerByUid(target) == null) { - target = player.getUid(); level = Integer.parseInt(args.get(1)); - avatarID = Integer.parseInt(args.get(0)); + target = player.getUid(); + level = Integer.parseInt(args.get(1)); + avatarId = Integer.parseInt(args.get(0)); } else { - avatarID = Integer.parseInt(args.get(1)); + avatarId = Integer.parseInt(args.get(1)); } } catch (NumberFormatException ignored) { // TODO: Parse from avatar name using GM Handbook. @@ -232,7 +223,7 @@ public final class PlayerCommands { CommandHandler.sendMessage(player, "Invalid player ID."); return; } - avatarID = Integer.parseInt(args.get(1)); + avatarId = Integer.parseInt(args.get(1)); level = Integer.parseInt(args.get(2)); } catch (NumberFormatException ignored) { // TODO: Parse from avatar name using GM Handbook. @@ -244,22 +235,22 @@ public final class PlayerCommands { GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target); if(targetPlayer == null) { - CommandHandler.sendMessage(null, "Player not found."); return; + CommandHandler.sendMessage(player, "Player not found."); return; } - AvatarData avatarData = GenshinData.getAvatarDataMap().get(avatarID); + AvatarData avatarData = GenshinData.getAvatarDataMap().get(avatarId); if(avatarData == null) { - CommandHandler.sendMessage(null, "Invalid avatar id."); return; + CommandHandler.sendMessage(player, "Invalid avatar id."); return; } // Calculate ascension level. if (level <= 40) { - ascension = (int)Math.ceil(level / 20); - } else if (level > 20) { - ascension = (int)Math.ceil(level / 10) - 3; + ascension = (int) Math.ceil(level / 20f); + } else { + ascension = (int) Math.ceil(level / 10f) - 3; } - GenshinAvatar avatar = new GenshinAvatar(avatarID); + GenshinAvatar avatar = new GenshinAvatar(avatarId); avatar.setLevel(level); avatar.setPromoteLevel(ascension); @@ -280,7 +271,7 @@ public final class PlayerCommands { int target = Integer.parseInt(args.get(0)); int avatarID = Integer.parseInt(args.get(1)); int level = 1; if(args.size() > 2) level = Integer.parseInt(args.get(2)); - int ascension = 1; + int ascension; GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target); if(targetPlayer == null) { @@ -294,9 +285,9 @@ public final class PlayerCommands { // Calculate ascension level. if (level <= 40) { - ascension = (int)Math.ceil(level / 20); - } else if (level > 20) { - ascension = (int)Math.ceil(level / 10) - 3; + ascension = (int) Math.ceil(level / 20f); + } else { + ascension = (int) Math.ceil(level / 10f) - 3; } GenshinAvatar avatar = new GenshinAvatar(avatarID); @@ -465,7 +456,7 @@ public final class PlayerCommands { @Override public void execute(GenshinPlayer player, List args) { if(args.size() < 1) { - CommandHandler.sendMessage(null, "Usage: setworldlevel "); return; + CommandHandler.sendMessage(player, "Usage: setworldlevel "); return; } try { @@ -503,21 +494,18 @@ public final class PlayerCommands { @Override public void execute(GenshinPlayer player, List args) { if(args.size() < 1) { - CommandHandler.sendMessage(null, "Usage: changescene "); return; + CommandHandler.sendMessage(player, "Usage: changescene "); return; } - - int sceneId = 0; try { - sceneId = Integer.parseInt(args.get(0)); + int sceneId = Integer.parseInt(args.get(0)); + boolean result = player.getWorld().transferPlayerToScene(player, sceneId, player.getPos()); + + if (!result) { + CommandHandler.sendMessage(null, "Scene does not exist or you are already in it"); + } } catch (Exception e) { - return; - } - - boolean result = player.getWorld().transferPlayerToScene(player, sceneId, player.getPos()); - - if (!result) { - CommandHandler.sendMessage(null, "Scene does not exist or you are already in it"); + CommandHandler.sendMessage(player, "Usage: changescene "); return; } } } diff --git a/src/main/java/emu/grasscutter/data/ResourceLoader.java b/src/main/java/emu/grasscutter/data/ResourceLoader.java index f5b9f4f72..f50067c65 100644 --- a/src/main/java/emu/grasscutter/data/ResourceLoader.java +++ b/src/main/java/emu/grasscutter/data/ResourceLoader.java @@ -197,7 +197,7 @@ public class ResourceLoader { } else { Map map = new TreeMap<>(); java.lang.reflect.Type type = new TypeToken>() {}.getType(); - String[] folderNames = {"BinOutput\\Talent\\EquipTalents\\", "BinOutput\\Talent\\AvatarTalents\\"}; + String[] folderNames = {"BinOutput/Talent/EquipTalents/", "BinOutput/Talent/AvatarTalents/"}; for (String name : folderNames) { File folder = new File(Utils.toFilePath(Grasscutter.getConfig().RESOURCE_FOLDER + name)); diff --git a/src/main/java/emu/grasscutter/game/managers/InventoryManager.java b/src/main/java/emu/grasscutter/game/managers/InventoryManager.java index 3d56dfad2..935652d77 100644 --- a/src/main/java/emu/grasscutter/game/managers/InventoryManager.java +++ b/src/main/java/emu/grasscutter/game/managers/InventoryManager.java @@ -471,7 +471,7 @@ public class InventoryManager { } // Consume weapon - player.getInventory().removeItem(feed); + player.getInventory().removeItem(feed, 1); // Get weapon.setRefinement(targetRefineLevel); @@ -804,6 +804,12 @@ public class InventoryManager { // Get talent int currentTalentLevel = avatar.getCoreProudSkillLevel(); int nextTalentId = ((avatar.getAvatarId() % 10000000) * 10) + currentTalentLevel + 1; + + if (avatar.getAvatarId() == 10000006) { + // Lisa is special in that her talentId starts with 4 instead of 6. + nextTalentId = 40 + currentTalentLevel + 1; + } + AvatarTalentData talentData = GenshinData.getAvatarTalentDataMap().get(nextTalentId); if (talentData == null) { diff --git a/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java b/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java index da90caa42..0ac4c4fc8 100644 --- a/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java +++ b/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java @@ -389,6 +389,10 @@ public final class DispatchServer { "/sdk/upload", new DispatchHttpJsonHandler("{\"code\":0}") ); + server.createContext( // /perf/config/verify?device_id=xxx&platform=x&name=xxx + "/perf/config/verify", + new DispatchHttpJsonHandler("{\"code\":0}") + ); // Start server server.start(); Grasscutter.getLogger().info("Dispatch server started on port " + getAddress().getPort()); diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterSceneNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterSceneNotify.java index 69ca9cb5f..e2db99153 100644 --- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterSceneNotify.java +++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterSceneNotify.java @@ -59,6 +59,7 @@ public class PacketPlayerEnterSceneNotify extends GenshinPacket { .setEnterReason(reason.getValue()) .addSceneTagIdList(102) .addSceneTagIdList(107) + .addSceneTagIdList(109) .addSceneTagIdList(113) .addSceneTagIdList(117) .setUnk1(1)