Merge remote-tracking branch 'origin/development' into tower

This commit is contained in:
Akka
2022-05-09 15:43:52 +08:00
36 changed files with 1435 additions and 264 deletions

View File

@@ -0,0 +1,11 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "Vector.proto";
message AbilityActionGenerateElemBall {
Vector pos = 1;
Vector rot = 2;
uint32 room_id = 3;
}

View File

@@ -0,0 +1,21 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "ModifierAction.proto";
import "AbilityString.proto";
import "AbilityAttachedModifier.proto";
import "ModifierProperty.proto";
message AbilityMetaModifierChange {
ModifierAction action = 1;
AbilityString parent_ability_name = 2;
AbilityString parent_ability_override = 3;
AbilityAttachedModifier attached_instanced_modifier = 4;
repeated ModifierProperty properties = 5;
int32 modifier_local_id = 6;
bool is_mute_remote = 7;
uint32 apply_entity_id = 8;
bool is_attached_parent_ability = 9;
uint32 server_buff_uid = 10;
}

View File

@@ -0,0 +1,9 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "AbilityScalarValueEntry.proto";
message AbilityMetaReInitOverrideMap {
repeated AbilityScalarValueEntry override_map = 1;
}

View File

@@ -0,0 +1,8 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum ModifierAction {
ADDED = 0;
REMOVED = 1;
}

View File

@@ -0,0 +1,10 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "AbilityString.proto";
message ModifierProperty {
AbilityString key = 1;
float value = 2;
}