* Rename RotationSpeed to MathQuaternion

* Fix DailyTaskFilterCityRsp
This commit is contained in:
Akbar Yahya 2023-01-29 15:27:40 +08:00
parent 41bc21f009
commit a9b72e6aa2
5 changed files with 18 additions and 17 deletions

View File

@ -1,13 +1,14 @@
syntax = "proto3"; syntax = "proto3";
option java_package = "emu.grasscutter.net.proto"; option java_package = "emu.grasscutter.net.proto";
message DailyTaskFilterCityRsp { message DailyTaskFilterCityRsp {
enum BAECKJPDBMI { //enum BAECKJPDBMI {
option allow_alias = true; // option allow_alias = true;
NONE = 0; // NONE = 0;
PEPPOHPHJOJ = 131; // PEPPOHPHJOJ = 131;
DCDNILFDFLB = 0; // DCDNILFDFLB = 0;
NNBKOLMPOEA = 1; // NNBKOLMPOEA = 1;
} //}
repeated uint32 city_id = 15; int32 retcode = 5;
uint32 city_id = 15;
} }

View File

@ -1,6 +1,6 @@
syntax = "proto3"; syntax = "proto3";
option java_package = "emu.grasscutter.net.proto"; option java_package = "emu.grasscutter.net.proto";
message RotationSpeed { message MathQuaternion {
float x = 1; float x = 1;
float y = 2; float y = 2;
float z = 3; float z = 3;

View File

@ -6,11 +6,11 @@ option java_package = "emu.grasscutter.net.proto";
import "Vector.proto"; import "Vector.proto";
import "Vector3Int.proto"; import "Vector3Int.proto";
import "ShapeType.proto"; import "ShapeType.proto";
import "RotationSpeed.proto"; import "MathQuaternion.proto";
message ObstacleInfo { message ObstacleInfo {
Vector center = 4; Vector center = 4;
Vector3Int extents = 12; Vector3Int extents = 12;
ShapeType shape = 5; ShapeType shape = 5;
int32 obstacleId = 9; int32 obstacleId = 9;
RotationSpeed Vector = 2; MathQuaternion Vector = 2;
} }

View File

@ -4,7 +4,7 @@ option java_package = "emu.grasscutter.net.proto";
import "Vector.proto"; import "Vector.proto";
import "RotationSpeed.proto"; import "MathQuaternion.proto";
import "MovingPlatformType.proto"; import "MovingPlatformType.proto";
import "Route.proto"; import "Route.proto";
message PlatformInfo { message PlatformInfo {
@ -14,10 +14,10 @@ message PlatformInfo {
uint32 startSceneTime = 4; uint32 startSceneTime = 4;
Vector startPos = 7; Vector startPos = 7;
bool isStarted = 8; bool isStarted = 8;
RotationSpeed startRot = 9; MathQuaternion startRot = 9;
uint32 stopSceneTime = 10; uint32 stopSceneTime = 10;
Vector posOffset = 11; Vector posOffset = 11;
RotationSpeed rotOffset = 12; MathQuaternion rotOffset = 12;
MovingPlatformType movingPlatformType = 13; MovingPlatformType movingPlatformType = 13;
bool isActive = 14; bool isActive = 14;
Route route = 15; Route route = 15;

View File

@ -4,7 +4,7 @@ option java_package = "emu.grasscutter.net.proto";
import "Vector.proto"; import "Vector.proto";
import "RotationSpeed.proto"; import "MathQuaternion.proto";
message RoutePoint { message RoutePoint {
Vector position = 1; Vector position = 1;
float arriveRange = 2; float arriveRange = 2;
@ -15,7 +15,7 @@ message RoutePoint {
} }
oneof rotate_params { oneof rotate_params {
Vector rotation = 21; Vector rotation = 21;
RotationSpeed rotation_speed = 22; MathQuaternion rotation_speed = 22;
RotationSpeed axis_speed = 23; MathQuaternion axis_speed = 23;
} }
} }