diff --git a/proto/ActivityInfo.proto b/proto/ActivityInfo.proto index e99aab49..9a42c62c 100644 --- a/proto/ActivityInfo.proto +++ b/proto/ActivityInfo.proto @@ -17,7 +17,7 @@ import "BlessingInfo.proto"; import "SeaLampInfo.proto"; import "ExpeditionInfo.proto"; import "ArenaChallengeInfo.proto"; -//import "FleurFairInfo.proto"; +import "FleurFairInfo.proto"; import "WaterSpiritInfo.proto"; import "ChallnelerSlabInfo.proto"; import "MistTrialActivityInfo.proto"; diff --git a/proto/DailyTaskUnlockedCitiesNotify.proto b/proto/DailyTaskUnlockedCitiesNotify.proto index 48acb963..f28e5cc1 100644 --- a/proto/DailyTaskUnlockedCitiesNotify.proto +++ b/proto/DailyTaskUnlockedCitiesNotify.proto @@ -1,9 +1,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - - -import "uint32.proto"; message DailyTaskUnlockedCitiesNotify { enum PGKOMCHPHJP { option allow_alias = true; diff --git a/proto/FleurFairInfo.proto b/proto/FleurFairInfo.proto index 76aa1450..819eeb3b 100644 --- a/proto/FleurFairInfo.proto +++ b/proto/FleurFairInfo.proto @@ -1,9 +1,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - - -//import "uint32.proto"; import "FleurFairChapterInfo.proto"; import "FleurFairDungeonSectionInfo.proto"; message FleurFairInfo { diff --git a/proto/Vector.proto b/proto/Vector.proto index c0f4105b..0c351086 100644 --- a/proto/Vector.proto +++ b/proto/Vector.proto @@ -1,7 +1,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message Vector { float x = 1; float y = 2; diff --git a/proto/uint32.proto b/proto/uint32.proto deleted file mode 100644 index b258a96c..00000000 --- a/proto/uint32.proto +++ /dev/null @@ -1,18 +0,0 @@ -syntax = "proto3"; -option java_package = "emu.grasscutter.net.proto"; - - - -import "BalloonInfo.proto"; -import "FallInfo.proto"; -import "MusicInfo.proto"; -message uint32 { - uint32 minigameId = 14; - bool isOpen = 3; - uint32 openTime = 6; - oneof HNMEDAOCKOI { - BalloonInfo balloon_info = 13; - FallInfo fall_info = 11; - MusicInfo music_info = 9; - } -}