sync proto ability lunagc

This commit is contained in:
Yuuki 2024-06-27 12:57:22 +08:00
parent 96f3b9e4a1
commit d5269bc503
25 changed files with 139 additions and 128 deletions

View File

@ -3,9 +3,10 @@ option java_package = "emu.grasscutter.net.proto";
import "Vector.proto"; import "Vector.proto";
// 4.6.0 // 4.7.0
//AbilityActionGenerateElemBall or AbilityActionCreateGadget
message AbilityActionGenerateElemBall { message AbilityActionGenerateElemBall {
uint32 room_id = 6; Vector pos = 6;
Vector rot = 10; Vector rot = 8;
Vector pos = 14; uint32 room_id = 15;
} }

View File

@ -0,0 +1,10 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "Vector.proto";
// 4.7.0
message AbilityActionSetCrashDamage {
Vector hit_pos = 4;
float damage = 12;
}

View File

@ -4,7 +4,7 @@ option java_package = "emu.grasscutter.net.proto";
import "AbilityString.proto"; import "AbilityString.proto";
import "AbilityScalarValueEntry.proto"; import "AbilityScalarValueEntry.proto";
// 4.6.0 // 4.7.0
message AbilityAppliedAbility { message AbilityAppliedAbility {
AbilityString ability_name = 1; AbilityString ability_name = 1;
AbilityString ability_override = 2; AbilityString ability_override = 2;

View File

@ -5,8 +5,7 @@ import "AbilityString.proto";
import "AbilityAttachedModifier.proto"; import "AbilityAttachedModifier.proto";
import "ModifierDurability.proto"; import "ModifierDurability.proto";
// 4.7.0
// 4.6.0
message AbilityAppliedModifier { message AbilityAppliedModifier {
int32 modifier_local_id = 1; int32 modifier_local_id = 1;
uint32 parent_ability_entity_id = 2; uint32 parent_ability_entity_id = 2;
@ -21,5 +20,5 @@ message AbilityAppliedModifier {
ModifierDurability modifier_durability = 11; ModifierDurability modifier_durability = 11;
uint32 sbuff_uid = 12; uint32 sbuff_uid = 12;
bool is_serverbuff_modifier = 13; bool is_serverbuff_modifier = 13;
bool IAPDOPJIGFF = 14; bool IILBHFODNKJ = 14;
} }

View File

@ -1,7 +1,7 @@
syntax = "proto3"; syntax = "proto3";
option java_package = "emu.grasscutter.net.proto"; option java_package = "emu.grasscutter.net.proto";
// 4.6.0 // 4.7.0
message AbilityAttachedModifier { message AbilityAttachedModifier {
bool is_invalid = 1; bool is_invalid = 1;
uint32 owner_entity_id = 2; uint32 owner_entity_id = 2;

View File

@ -3,9 +3,9 @@ option java_package = "emu.grasscutter.net.proto";
import "Vector.proto"; import "Vector.proto";
// 4.6.0 // 4.7.0
message AbilityBornType { message AbilityBornType {
Vector rot = 7; Vector move_dir = 5;
Vector move_dir = 10; Vector rot = 12;
Vector pos = 13; Vector pos = 15;
} }

View File

@ -1,7 +1,8 @@
syntax = "proto3"; syntax = "proto3";
option java_package = "emu.grasscutter.net.proto"; option java_package = "emu.grasscutter.net.proto";
import "AbilityEmbryo.proto"; import "AbilityEmbryo.proto";
// Obf: GGPHMELJCOL
// 4.7.0
message AbilityControlBlock { message AbilityControlBlock {
repeated AbilityEmbryo ability_embryo_list = 1; repeated AbilityEmbryo ability_embryo_list = 1;
} }

View File

@ -1,6 +1,6 @@
syntax = "proto3"; syntax = "proto3";
option java_package = "emu.grasscutter.net.proto"; option java_package = "emu.grasscutter.net.proto";
// Obf: PLELJEGMEOD // 4.7.0
message AbilityEmbryo { message AbilityEmbryo {
uint32 ability_id = 1; uint32 ability_id = 1;
fixed32 ability_name_hash = 2; fixed32 ability_name_hash = 2;

View File

@ -1,6 +1,6 @@
syntax = "proto3"; syntax = "proto3";
option java_package = "emu.grasscutter.net.proto"; option java_package = "emu.grasscutter.net.proto";
// Obf: AHHOEHNNEIN // 4.7.0
message AbilityGadgetInfo { message AbilityGadgetInfo {
uint32 camp_id = 1; uint32 camp_id = 1;
uint32 camp_target_type = 2; uint32 camp_target_type = 2;

View File

@ -4,7 +4,8 @@ option java_package = "emu.grasscutter.net.proto";
import "AbilityInvokeEntry.proto"; import "AbilityInvokeEntry.proto";
// 4.7 // 4.7.0
// CmdId: 3901
message AbilityInvocationsNotify { message AbilityInvocationsNotify {
repeated AbilityInvokeEntry invokes = 9; repeated AbilityInvokeEntry invokes = 9;
} }

View File

@ -1,7 +1,7 @@
syntax = "proto3"; syntax = "proto3";
option java_package = "emu.grasscutter.net.proto"; option java_package = "emu.grasscutter.net.proto";
// 4.6.0 // 4.7.0
enum AbilityInvokeArgument { enum AbilityInvokeArgument {
ABILITY_INVOKE_ARGUMENT_NONE = 0; ABILITY_INVOKE_ARGUMENT_NONE = 0;
ABILITY_INVOKE_ARGUMENT_META_MODIFIER_CHANGE = 1; ABILITY_INVOKE_ARGUMENT_META_MODIFIER_CHANGE = 1;
@ -76,6 +76,6 @@ enum AbilityInvokeArgument {
ABILITY_INVOKE_ARGUMENT_MIXIN_ROTATION_FOLLOW_CAMERA = 128; ABILITY_INVOKE_ARGUMENT_MIXIN_ROTATION_FOLLOW_CAMERA = 128;
ABILITY_INVOKE_ARGUMENT_MIXIN_BUOYANT_FORCE = 129; ABILITY_INVOKE_ARGUMENT_MIXIN_BUOYANT_FORCE = 129;
ABILITY_INVOKE_ARGUMENT_MIXIN_FILMFEST_BALL_GAME = 130; ABILITY_INVOKE_ARGUMENT_MIXIN_FILMFEST_BALL_GAME = 130;
AABILITY_INVOKE_ARGUMENT_MIXIN_CHECK_SCAN_ENTITY = 131; ABILITY_INVOKE_ARGUMENT_MIXIN_CHECK_SCAN_ENTITY = 131;
ABILITY_INVOKE_ARGUMENT_MIXIN_TIME_TRACK_PLAYER = 133; ABILITY_INVOKE_ARGUMENT_MIXIN_TIME_TRACK_PLAYER = 133;
} }

View File

@ -1,20 +1,19 @@
syntax = "proto3"; syntax = "proto3";
option java_package = "emu.grasscutter.net.proto"; option java_package = "emu.grasscutter.net.proto";
import "AbilityInvokeEntryHead.proto"; import "AbilityInvokeEntryHead.proto";
import "AbilityInvokeArgument.proto";
import "ForwardType.proto"; import "ForwardType.proto";
import "AbilityInvokeArgument.proto";
// 4.7 // 4.7.0
message AbilityInvokeEntry { message AbilityInvokeEntry {
uint32 entity_id = 11;
AbilityInvokeEntryHead head = 10;
bytes ability_data = 12;
AbilityInvokeArgument argument_type = 15;
ForwardType forward_type = 13;
uint32 forward_peer = 2;
uint32 event_id = 1; uint32 event_id = 1;
uint32 forward_peer = 2;
bool is_ignore_auth = 4; bool is_ignore_auth = 4;
double total_tick_time = 7; double total_tick_time = 7;
AbilityInvokeEntryHead head = 10;
uint32 entity_id = 11;
bytes ability_data = 12;
ForwardType forward_type = 13;
AbilityInvokeArgument argument_type = 15;
} }

View File

@ -1,14 +1,13 @@
syntax = "proto3"; syntax = "proto3";
option java_package = "emu.grasscutter.net.proto"; option java_package = "emu.grasscutter.net.proto";
// 4.7.0 // 4.7.0
message AbilityInvokeEntryHead { message AbilityInvokeEntryHead {
uint32 instanced_ability_id = 8;
uint32 instanced_modifier_id = 7;
uint32 server_buff_uid = 14;
int32 modifier_config_local_id = 13;
int32 local_id = 15;
uint32 target_id = 3; uint32 target_id = 3;
uint32 instanced_modifier_id = 7;
uint32 instanced_ability_id = 8;
bool is_serverbuff_modifier = 9; bool is_serverbuff_modifier = 9;
int32 modifier_config_local_id = 13;
uint32 server_buff_uid = 14;
int32 local_id = 15;
} }

View File

@ -2,7 +2,8 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto"; option java_package = "emu.grasscutter.net.proto";
import "AbilityAppliedAbility.proto"; import "AbilityAppliedAbility.proto";
// 4.6.0
// 4.7.0
message AbilityMetaAddAbility { message AbilityMetaAddAbility {
AbilityAppliedAbility ability = 12; AbilityAppliedAbility ability = 7;
} }

View File

@ -1,36 +1,24 @@
// https://github.com/SlushinPS/beach-simulator
// Copyright (C) 2023 Slushy Team
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
syntax = "proto3"; syntax = "proto3";
option java_package = "emu.grasscutter.net.proto"; option java_package = "emu.grasscutter.net.proto";
import "AbilityAttachedModifier.proto";
import "ModifierProperty.proto";
import "ModifierAction.proto";
import "AbilityString.proto"; import "AbilityString.proto";
// Obf: FFBMKELHDNF import "ModifierProperty.proto";
import "AbilityAttachedModifier.proto";
import "ModifierAction.proto";
// 4.7.0
message AbilityMetaModifierChange { message AbilityMetaModifierChange {
AbilityAttachedModifier attached_instanced_modifier = 15; uint32 server_buff_uid = 2;
uint32 server_buff_uid = 5; AbilityString parent_ability_override = 3;
repeated ModifierProperty properties = 6; repeated ModifierProperty properties = 4;
bool BNMCKEBPDGI = 11; uint32 apply_entity_id = 5;
bool is_attached_parent_ability = 2; AbilityAttachedModifier attached_instanced_modifier = 6;
uint32 apply_entity_id = 9;
ModifierAction action = 1;
bool HEDGMMNKADC = 10;
AbilityString parent_ability_name = 7; AbilityString parent_ability_name = 7;
AbilityString parent_ability_override = 8; int32 modifier_local_id = 8;
int32 modifier_local_id = 14; bool is_attached_parent_ability = 10;
bool EFONMKFIJNA = 11;
bool MAPJDCOAIMG = 12;
float KKAAMMJBABH = 13;
uint64 KKFHAIPCCFA = 14;
ModifierAction action = 15;
} }

View File

@ -3,7 +3,7 @@ option java_package = "emu.grasscutter.net.proto";
import "AbilityScalarValueEntry.proto"; import "AbilityScalarValueEntry.proto";
// 4.6.0 // 4.7.0
message AbilityMetaReInitOverrideMap { message AbilityMetaReInitOverrideMap {
repeated AbilityScalarValueEntry override_map = 15; repeated AbilityScalarValueEntry override_map = 10;
} }

View File

@ -1,26 +1,9 @@
// https://github.com/SlushinPS/beach-simulator
// Copyright (C) 2023 Slushy Team
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
syntax = "proto3"; syntax = "proto3";
option java_package = "emu.grasscutter.net.proto"; option java_package = "emu.grasscutter.net.proto";
import "AnimatorParameterValueInfoPair.proto"; import "AnimatorParameterValueInfoPair.proto";
// Obf: AFDPLNIIALH
// 4.7.0
message AbilityMetaSetPoseParameter { message AbilityMetaSetPoseParameter {
AnimatorParameterValueInfoPair value = 1; AnimatorParameterValueInfoPair value = 3;
} }

View File

@ -3,16 +3,18 @@ option java_package = "emu.grasscutter.net.proto";
import "MassivePropSyncInfo.proto"; import "MassivePropSyncInfo.proto";
import "BreakoutSnapShot.proto"; import "BreakoutSnapShot.proto";
//import "DPJAFMMGPCK.proto";
// 4.6.0 // 4.7.0
message AbilityMixinRecoverInfo { message AbilityMixinRecoverInfo {
oneof source {
uint32 instanced_ability_id = 1;
uint32 instanced_modifier_id = 2;
}
uint32 local_id = 3; uint32 local_id = 3;
repeated uint32 data_list = 4; repeated uint32 data_list = 4;
bool is_serverbuff_modifier = 5; bool is_serverbuff_modifier = 5;
repeated MassivePropSyncInfo massive_prop_list = 6; repeated MassivePropSyncInfo massive_prop_list = 6;
BreakoutSnapShot breakout_snap_shot = 7; BreakoutSnapShot breakout_snap_shot = 7;
//DPJAFMMGPCK IKBDKGFHKMA = 8;
oneof Source {
uint32 instanced_ability_id = 1;
uint32 instanced_modifier_id = 2;
}
} }

View File

@ -0,0 +1,11 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "MassivePropSyncInfo.proto";
// 4.7.0
message AbilityMixinScenePropSync {
bool is_clear_all = 1;
repeated int64 delete_id_list = 2;
repeated MassivePropSyncInfo massive_prop_list = 9;
}

View File

@ -0,0 +1,24 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "Vector.proto";
// 4.7.0
message AbilityMixinWindSeedSpawner {
message AddSignal {
}
message RefreshSeed {
repeated Vector pos_list = 11;
}
message CatchSeed {
uint32 entity_id = 15;
}
oneof cmd {
AddSignal add_signal = 11;
RefreshSeed refresh_seed = 9;
CatchSeed catch_seed = 2;
}
}

View File

@ -1,6 +1,7 @@
syntax = "proto3"; syntax = "proto3";
option java_package = "emu.grasscutter.net.proto"; option java_package = "emu.grasscutter.net.proto";
// Obf: HOIECOCMCMI
// 4.7.0
enum AbilityScalarType { enum AbilityScalarType {
ABILITY_SCALAR_TYPE_UNKNOW = 0; ABILITY_SCALAR_TYPE_UNKNOW = 0;
ABILITY_SCALAR_TYPE_FLOAT = 1; ABILITY_SCALAR_TYPE_FLOAT = 1;

View File

@ -4,7 +4,7 @@ option java_package = "emu.grasscutter.net.proto";
import "AbilityString.proto"; import "AbilityString.proto";
import "AbilityScalarType.proto"; import "AbilityScalarType.proto";
// 4.6.0 // 4.7.0
message AbilityScalarValueEntry { message AbilityScalarValueEntry {
AbilityString key = 1; AbilityString key = 1;
AbilityScalarType value_type = 2; AbilityScalarType value_type = 2;
@ -15,3 +15,9 @@ message AbilityScalarValueEntry {
uint32 uint_value = 6; uint32 uint_value = 6;
} }
} }
/*
message AbilityScalarValueEntry {
AbilityString key = 1;
float float_value = 3;
}
*/

View File

@ -1,7 +1,7 @@
syntax = "proto3"; syntax = "proto3";
option java_package = "emu.grasscutter.net.proto"; option java_package = "emu.grasscutter.net.proto";
// 4.6.0 // 4.7.0
message AbilityString { message AbilityString {
oneof type { oneof type {
string str = 1; string str = 1;

View File

@ -1,5 +1,4 @@
syntax = "proto3"; syntax = "proto3";
option java_package = "emu.grasscutter.net.proto"; option java_package = "emu.grasscutter.net.proto";
import "AbilityScalarValueEntry.proto"; import "AbilityScalarValueEntry.proto";
@ -7,6 +6,7 @@ import "AbilityAppliedAbility.proto";
import "AbilityAppliedModifier.proto"; import "AbilityAppliedModifier.proto";
import "AbilityMixinRecoverInfo.proto"; import "AbilityMixinRecoverInfo.proto";
// 4.7.0
message AbilitySyncStateInfo { message AbilitySyncStateInfo {
bool is_inited = 1; bool is_inited = 1;
repeated AbilityScalarValueEntry dynamic_value_map = 2; repeated AbilityScalarValueEntry dynamic_value_map = 2;

View File

@ -1,24 +1,9 @@
// https://github.com/SlushinPS/beach-simulator
// Copyright (C) 2023 Slushy Team
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
syntax = "proto3"; syntax = "proto3";
option java_package = "emu.grasscutter.net.proto"; option java_package = "emu.grasscutter.net.proto";
import "AbilityString.proto"; import "AbilityString.proto";
// Obf: HFHFECKAJGB
// 4.7.0
message ModifierProperty { message ModifierProperty {
AbilityString key = 10; AbilityString key = 11;
float value = 14; float value = 1;
} }