Fix Scene*Info
This commit is contained in:
parent
e07d12ad71
commit
41bc21f009
|
@ -5,7 +5,7 @@ option java_package = "emu.grasscutter.net.proto";
|
|||
|
||||
|
||||
|
||||
message AbilityGadget {
|
||||
message AbilityGadgetInfo {
|
||||
uint32 campId = 1;
|
||||
uint32 olefgkameoj = 2;
|
||||
uint32 targetEntityId = 3;
|
|
@ -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";
|
||||
|
@ -115,7 +115,7 @@ message ActivityInfo {
|
|||
SeaLampInfo sea_lamp_info = 578;
|
||||
ExpeditionInfo expedition_info = 930;
|
||||
ArenaChallengeInfo arena_challenge_info = 699;
|
||||
FleurFairInfo fleur_fair_info = 1116;
|
||||
//FleurFairInfo fleur_fair_info = 1116;
|
||||
WaterSpiritInfo water_spirit_info = 1651;
|
||||
ChallnelerSlabInfo challneler_slab_info = 1135;
|
||||
MistTrialActivityInfo mist_trial_activity_info = 1320;
|
||||
|
|
|
@ -5,7 +5,7 @@ option java_package = "emu.grasscutter.net.proto";
|
|||
|
||||
|
||||
|
||||
message BlossomChest {
|
||||
message BlossomChestInfo {
|
||||
uint32 resin = 1;
|
||||
repeated uint32 qualifyUidList = 2;
|
||||
repeated uint32 remainUidList = 3;
|
|
@ -3,7 +3,7 @@ option java_package = "emu.grasscutter.net.proto";
|
|||
|
||||
|
||||
|
||||
import "uint32.proto";
|
||||
//import "uint32.proto";
|
||||
import "FleurFairChapterInfo.proto";
|
||||
import "FleurFairDungeonSectionInfo.proto";
|
||||
message FleurFairInfo {
|
||||
|
|
|
@ -5,16 +5,16 @@ option java_package = "emu.grasscutter.net.proto";
|
|||
|
||||
import "GadgetBornType.proto";
|
||||
import "Item.proto";
|
||||
import "GatherGadget.proto";
|
||||
import "Worktop.proto";
|
||||
import "ClientGadget.proto";
|
||||
import "Weather.proto";
|
||||
import "AbilityGadget.proto";
|
||||
import "StatueGadget.proto";
|
||||
import "BossChest.proto";
|
||||
import "BlossomChest.proto";
|
||||
import "MpPlayReward.proto";
|
||||
import "GeneralReward.proto";
|
||||
import "GatherGadgetInfo.proto";
|
||||
import "WorktopInfo.proto";
|
||||
import "ClientGadgetInfo.proto";
|
||||
import "WeatherInfo.proto";
|
||||
import "AbilityGadgetInfo.proto";
|
||||
import "StatueGadgetInfo.proto";
|
||||
import "BossChestInfo.proto";
|
||||
import "BlossomChestInfo.proto";
|
||||
import "MpPlayRewardInfo.proto";
|
||||
import "GeneralRewardInfo.proto";
|
||||
import "OfferingInfo.proto";
|
||||
import "FoundationInfo.proto";
|
||||
import "VehicleInfo.proto";
|
||||
|
@ -28,7 +28,7 @@ import "DeshretObeliskGadgetInfo.proto";
|
|||
import "CoinCollectOperatorInfo.proto";
|
||||
import "PlatformInfo.proto";
|
||||
import "GadgetPlayInfo.proto";
|
||||
message Gadget {
|
||||
message GadgetInfo {
|
||||
uint32 gadgetId = 1;
|
||||
uint32 groupId = 2;
|
||||
uint32 configId = 3;
|
||||
|
@ -42,16 +42,16 @@ message Gadget {
|
|||
uint32 interactId = 11;
|
||||
oneof content {
|
||||
Item item = 12;
|
||||
GatherGadget gather_gadget = 13;
|
||||
Worktop worktop = 14;
|
||||
ClientGadget client_gadget = 15;
|
||||
Weather weather = 17;
|
||||
AbilityGadget ability_gadget = 18;
|
||||
StatueGadget statue_gadget = 19;
|
||||
BossChest boss_chest = 20;
|
||||
BlossomChest blossom_chest = 41;
|
||||
MpPlayReward mp_play_reward = 42;
|
||||
GeneralReward general_reward = 43;
|
||||
GatherGadgetInfo gather_gadget = 13;
|
||||
WorktopInfo worktop = 14;
|
||||
ClientGadgetInfo client_gadget = 15;
|
||||
WeatherInfo weather = 17;
|
||||
AbilityGadgetInfo ability_gadget = 18;
|
||||
StatueGadgetInfo statue_gadget = 19;
|
||||
BossChestInfo boss_chest = 20;
|
||||
BlossomChestInfo blossom_chest = 41;
|
||||
MpPlayRewardInfo mp_play_reward = 42;
|
||||
GeneralRewardInfo general_reward = 43;
|
||||
OfferingInfo offering_info = 44;
|
||||
FoundationInfo foundation_info = 45;
|
||||
VehicleInfo vehicle_info = 46;
|
|
@ -4,7 +4,7 @@ option java_package = "emu.grasscutter.net.proto";
|
|||
|
||||
|
||||
import "ItemParam.proto";
|
||||
message GeneralReward {
|
||||
message GeneralRewardInfo {
|
||||
uint32 resin = 1;
|
||||
uint32 deadTime = 2;
|
||||
repeated uint32 remainUidList = 3;
|
|
@ -1,6 +1,6 @@
|
|||
syntax = "proto3";
|
||||
option java_package = "emu.grasscutter.net.proto";
|
||||
message MpPlayReward {
|
||||
message MpPlayRewardInfo {
|
||||
uint32 resin = 1;
|
||||
repeated uint32 remainUidList = 2;
|
||||
repeated uint32 qualifyUidList = 3;
|
|
@ -5,16 +5,18 @@ option java_package = "emu.grasscutter.net.proto";
|
|||
|
||||
import "ProtEntityType.proto";
|
||||
import "MotionInfo.proto";
|
||||
import "Avatar.proto";
|
||||
import "Monster.proto";
|
||||
import "Npc.proto";
|
||||
import "Gadget.proto";
|
||||
import "EntityClientData.proto";
|
||||
import "EntityAuthorityInfo.proto";
|
||||
import "PropPair.proto";
|
||||
import "FightPropPair.proto";
|
||||
import "AnimatorParameterValueInfoPair.proto";
|
||||
import "EntityEnvironmentInfo.proto";
|
||||
|
||||
import "SceneAvatarInfo.proto";
|
||||
import "SceneGadgetInfo.proto";
|
||||
import "SceneMonsterInfo.proto";
|
||||
import "SceneNpcInfo.proto";
|
||||
|
||||
import "ServerBuff.proto";
|
||||
message SceneEntityInfo {
|
||||
ProtEntityType entityType = 1;
|
||||
|
@ -26,10 +28,10 @@ message SceneEntityInfo {
|
|||
uint32 lifeState = 7;
|
||||
repeated AnimatorParameterValueInfoPair animatorParaList = 9;
|
||||
oneof entity {
|
||||
Avatar avatar = 10;
|
||||
Monster monster = 11;
|
||||
Npc npc = 12;
|
||||
Gadget gadget = 13;
|
||||
SceneAvatarInfo avatar = 10;
|
||||
SceneMonsterInfo monster = 11;
|
||||
SceneNpcInfo npc = 12;
|
||||
SceneGadgetInfo gadget = 13;
|
||||
}
|
||||
uint32 lastMoveSceneTimeMs = 17;
|
||||
uint32 lastMoveReliableSeq = 18;
|
||||
|
|
|
@ -4,17 +4,18 @@ option java_package = "emu.grasscutter.net.proto";
|
|||
|
||||
|
||||
import "GadgetBornType.proto";
|
||||
import "Item.proto";
|
||||
import "GatherGadget.proto";
|
||||
import "Worktop.proto";
|
||||
import "ClientGadget.proto";
|
||||
import "Weather.proto";
|
||||
import "AbilityGadget.proto";
|
||||
import "StatueGadget.proto";
|
||||
import "BossChest.proto";
|
||||
import "BlossomChest.proto";
|
||||
import "MpPlayReward.proto";
|
||||
import "GeneralReward.proto";
|
||||
import "TrifleItem.proto";
|
||||
|
||||
import "GatherGadgetInfo.proto";
|
||||
import "WorktopInfo.proto";
|
||||
import "ClientGadgetInfo.proto";
|
||||
import "WeatherInfo.proto";
|
||||
import "AbilityGadgetInfo.proto";
|
||||
import "StatueGadgetInfo.proto";
|
||||
import "BossChestInfo.proto";
|
||||
import "BlossomChestInfo.proto";
|
||||
import "MpPlayRewardInfo.proto";
|
||||
import "GeneralRewardInfo.proto";
|
||||
import "OfferingInfo.proto";
|
||||
import "FoundationInfo.proto";
|
||||
import "VehicleInfo.proto";
|
||||
|
@ -26,6 +27,7 @@ import "RoguelikeGadgetInfo.proto";
|
|||
import "NightCrowGadgetInfo.proto";
|
||||
import "DeshretObeliskGadgetInfo.proto";
|
||||
import "CoinCollectOperatorInfo.proto";
|
||||
|
||||
import "PlatformInfo.proto";
|
||||
import "GadgetPlayInfo.proto";
|
||||
message SceneGadgetInfo {
|
||||
|
@ -40,18 +42,19 @@ message SceneGadgetInfo {
|
|||
uint32 authorityPeerId = 9;
|
||||
bool isEnableInteract = 10;
|
||||
uint32 interactId = 11;
|
||||
|
||||
oneof content {
|
||||
Item item = 12;
|
||||
GatherGadget gather_gadget = 13;
|
||||
Worktop worktop = 14;
|
||||
ClientGadget client_gadget = 15;
|
||||
Weather weather = 17;
|
||||
AbilityGadget ability_gadget = 18;
|
||||
StatueGadget statue_gadget = 19;
|
||||
BossChest boss_chest = 20;
|
||||
BlossomChest blossom_chest = 41;
|
||||
MpPlayReward mp_play_reward = 42;
|
||||
GeneralReward general_reward = 43;
|
||||
TrifleItem trifle_item = 12;
|
||||
GatherGadgetInfo gather_gadget = 13;
|
||||
WorktopInfo worktop = 14;
|
||||
ClientGadgetInfo client_gadget = 15;
|
||||
WeatherInfo weather = 17;
|
||||
AbilityGadgetInfo ability_gadget = 18;
|
||||
StatueGadgetInfo statue_gadget = 19;
|
||||
BossChestInfo boss_chest = 20;
|
||||
BlossomChestInfo blossom_chest = 41;
|
||||
MpPlayRewardInfo mp_play_reward = 42;
|
||||
GeneralRewardInfo general_reward = 43;
|
||||
OfferingInfo offering_info = 44;
|
||||
FoundationInfo foundation_info = 45;
|
||||
VehicleInfo vehicle_info = 46;
|
||||
|
@ -64,6 +67,7 @@ message SceneGadgetInfo {
|
|||
DeshretObeliskGadgetInfo deshret_obelisk_gadget_info = 63;
|
||||
CoinCollectOperatorInfo coin_collect_operator_info = 64;
|
||||
}
|
||||
|
||||
uint32 markFlag = 21;
|
||||
uint32 propOwnerEntityId = 22;
|
||||
PlatformInfo platform = 23;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
syntax = "proto3";
|
||||
option java_package = "emu.grasscutter.net.proto";
|
||||
message Npc {
|
||||
message SceneNpcInfo {
|
||||
uint32 npcId = 1;
|
||||
uint32 roomId = 2;
|
||||
uint32 parentQuestId = 3;
|
|
@ -1,5 +1,5 @@
|
|||
syntax = "proto3";
|
||||
option java_package = "emu.grasscutter.net.proto";
|
||||
message StatueGadget {
|
||||
message StatueGadgetInfo {
|
||||
repeated uint32 nkbgahefmbn = 1;
|
||||
}
|
|
@ -1,5 +1,5 @@
|
|||
syntax = "proto3";
|
||||
option java_package = "emu.grasscutter.net.proto";
|
||||
message Weather {
|
||||
message WeatherInfo {
|
||||
uint32 weatherAreaId = 1;
|
||||
}
|
Loading…
Reference in New Issue