diff --git a/proto/ActivityInfo.proto b/proto/ActivityInfo.proto index 892d1452..153304e0 100644 --- a/proto/ActivityInfo.proto +++ b/proto/ActivityInfo.proto @@ -70,7 +70,6 @@ import "BrickBreakerInfo.proto"; import "DuelHeartInfo.proto"; import "SeaLampV3Info.proto"; import "TeamChainInfo.proto"; -import "ElectroherculesBattleInfo.proto"; import "GcgFestivalInfo.proto"; import "ActivityPushTipsData.proto"; import "ActivityWatcherInfo.proto"; @@ -167,7 +166,6 @@ message ActivityInfo { DuelHeartInfo duel_heart_info = 221; SeaLampV3Info sea_lamp_v3info = 1080; TeamChainInfo team_chain_info = 144; - ElectroherculesBattleInfo electrohercules_battle_info = 172; GcgFestivalInfo gcg_festival_info = 71; } } diff --git a/proto/ClientAIStateNotify.proto b/proto/ClientAIStateNotify.proto new file mode 100644 index 00000000..3d72d777 --- /dev/null +++ b/proto/ClientAIStateNotify.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message ClientAIStateNotify { + uint32 entityId = 6; + uint32 curTactic = 10; +} diff --git a/proto/ClientAbilityChangeNotify.proto b/proto/ClientAbilityChangeNotify.proto index 9c5b0b9b..b284d497 100644 --- a/proto/ClientAbilityChangeNotify.proto +++ b/proto/ClientAbilityChangeNotify.proto @@ -2,20 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - - import "AbilityInvokeEntry.proto"; message ClientAbilityChangeNotify { - //enum JMGIEMHIIJI { - // option allow_alias= true; - // NONE = 0; - // PEPPOHPHJOJ = 1129; - // DCDNILFDFLB = 0; - // NNBKOLMPOEA = 1; - // EAJIABGAOCI = 1; - //} - repeated AbilityInvokeEntry invokes = 10; bool isInitHash = 4; uint32 entityId = 9; diff --git a/proto/ClientInputType.proto b/proto/ClientInputType.proto index 376b74b8..681b0007 100644 --- a/proto/ClientInputType.proto +++ b/proto/ClientInputType.proto @@ -2,8 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - - enum ClientInputType { CLIENT_INPUT_TYPE_NONE = 0; CLIENT_INPUT_TYPE_KEYBOARD_MOUSE = 1; diff --git a/proto/ClientLoadingCostumeVerificationNotify.proto b/proto/ClientLoadingCostumeVerificationNotify.proto new file mode 100644 index 00000000..ff3252b6 --- /dev/null +++ b/proto/ClientLoadingCostumeVerificationNotify.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message ClientLoadingCostumeVerificationNotify { + uint64 prefabHash = 15; + uint32 costumeId = 8; + uint64 guid = 13; +} diff --git a/proto/ClientLockGameTimeNotify.proto b/proto/ClientLockGameTimeNotify.proto new file mode 100644 index 00000000..6b332eb8 --- /dev/null +++ b/proto/ClientLockGameTimeNotify.proto @@ -0,0 +1,7 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message ClientLockGameTimeNotify { + bool isLock = 1; +} diff --git a/proto/ElectroherculesBattleInfo.proto b/proto/ElectroherculesBattleInfo.proto deleted file mode 100644 index 85a94fd4..00000000 --- a/proto/ElectroherculesBattleInfo.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - - -import "KJJKCDHJMGD.proto"; - -message ElectroherculesBattleInfo { - repeated KJJKCDHJMGD stageInfoList = 7; - bool pdpfimhpajd = 14; -} diff --git a/proto/GLELFDKHCNK.proto b/proto/GLELFDKHCNK.proto deleted file mode 100644 index 6ac0b71a..00000000 --- a/proto/GLELFDKHCNK.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - - - -message GLELFDKHCNK { - uint32 minFinishTime = 2; - uint32 levelId = 12; - bool isFinish = 13; -} diff --git a/proto/KJJKCDHJMGD.proto b/proto/KJJKCDHJMGD.proto deleted file mode 100644 index fc626889..00000000 --- a/proto/KJJKCDHJMGD.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; - -option java_package = "emu.grasscutter.net.proto"; - - - -import "GLELFDKHCNK.proto"; - -message KJJKCDHJMGD { - repeated GLELFDKHCNK levelInfoList = 10; - uint32 stageId = 1; - bool jpblgaceipn = 3; -} diff --git a/proto/LanternRiteFireworksStageInfo.proto b/proto/LanternRiteFireworksStageInfo.proto index e44b307e..e1ddac99 100644 --- a/proto/LanternRiteFireworksStageInfo.proto +++ b/proto/LanternRiteFireworksStageInfo.proto @@ -2,8 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - - import "LanternRiteFireworksChallengeInfo.proto"; message LanternRiteFireworksStageInfo { diff --git a/proto/LevelupCityReq.proto b/proto/LevelupCityReq.proto new file mode 100644 index 00000000..3fbb8ce4 --- /dev/null +++ b/proto/LevelupCityReq.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message LevelupCityReq { + uint32 sceneId = 14; + uint32 itemNum = 8; + uint32 areaId = 13; +} diff --git a/proto/SceneAvatarInfo.proto b/proto/SceneAvatarInfo.proto index 5b72c17b..386bed78 100644 --- a/proto/SceneAvatarInfo.proto +++ b/proto/SceneAvatarInfo.proto @@ -2,8 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - - import "SceneWeaponInfo.proto"; import "CurVehicleInfo.proto"; import "AvatarExcelInfo.proto"; diff --git a/proto/SceneAvatarStaminaStepReq.proto b/proto/SceneAvatarStaminaStepReq.proto new file mode 100644 index 00000000..71447875 --- /dev/null +++ b/proto/SceneAvatarStaminaStepReq.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "Vector.proto"; + +message SceneAvatarStaminaStepReq { + Vector rot = 4; + bool useClientRot = 9; +} diff --git a/proto/ToTheMoonEnterSceneReq.proto b/proto/ToTheMoonEnterSceneReq.proto new file mode 100644 index 00000000..044109f7 --- /dev/null +++ b/proto/ToTheMoonEnterSceneReq.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message ToTheMoonEnterSceneReq { + uint32 sceneId = 12; + uint32 version = 10; +} diff --git a/proto/ToTheMoonQueryPathReq.proto b/proto/ToTheMoonQueryPathReq.proto index 7522e76b..21ded6ef 100644 --- a/proto/ToTheMoonQueryPathReq.proto +++ b/proto/ToTheMoonQueryPathReq.proto @@ -2,23 +2,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - - import "OptionType.proto"; import "Vector.proto"; import "AStarMethod.proto"; import "FilterType.proto"; message ToTheMoonQueryPathReq { - //enum MAJKIHKKGFG { - // option allow_alias= true; - // NONE = 0; - // PEPPOHPHJOJ = 6105; - // DCDNILFDFLB = 0; - // NNBKOLMPOEA = 1; - // EAJIABGAOCI = 1; - //} - OptionType queryType = 15; int32 queryId = 3; Vector sourcePos = 12; diff --git a/proto/ToTheMoonQueryPathRsp.proto b/proto/ToTheMoonQueryPathRsp.proto index 7330ffb8..32cbf3ef 100644 --- a/proto/ToTheMoonQueryPathRsp.proto +++ b/proto/ToTheMoonQueryPathRsp.proto @@ -2,20 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - - import "PathStatusType.proto"; import "Vector.proto"; message ToTheMoonQueryPathRsp { - //enum DEPALAPFJJF { - // option allow_alias= true; - // NONE = 0; - // PEPPOHPHJOJ = 6155; - // DCDNILFDFLB = 0; - // NNBKOLMPOEA = 1; - //} - int32 queryId = 11; PathStatusType queryStatus = 15; repeated int64 index = 10;