Grasscutter
/
GC-Proto
mirror of https://gitlab.com/YuukiPS/GC-Proto.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.2' into '3.2' 

fix ShapeType

See merge request yukiz/grasscutter-protos!1
This commit is contained in:
Yuuki 2022-11-07 08:56:30 +00:00
parent 99086a2514 af9a0657ed
commit f88ddc796f
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
proto/GMObstacleInfo.proto
View File

@ -18,7 +18,7 @@
syntax = "proto3"; syntax = "proto3";
import "MathQuaternion.proto"; import "MathQuaternion.proto";
//import "ShapeType.proto"; import "ObstacleInfo.proto";
import "Vector.proto"; import "Vector.proto";
import "Vector3Int.proto"; import "Vector3Int.proto";
@ -26,7 +26,7 @@ option java_package = "emu.grasscutter.net.proto";
message GMObstacleInfo { message GMObstacleInfo {
int64 timestamp = 14; int64 timestamp = 14;
//ShapeType shape = 2; ObstacleInfo.ShapeType shape = 2;
int32 obstacle_id = 13; int32 obstacle_id = 13;
MathQuaternion rotation = 3; MathQuaternion rotation = 3;
Vector center = 8; Vector center = 8;

6
proto/ObstacleInfo.proto
View File

@ -27,13 +27,13 @@ message ObstacleInfo {
MathQuaternion rotation = 4; MathQuaternion rotation = 4;
int32 obstacle_id = 2; int32 obstacle_id = 2;
Vector center = 14; Vector center = 14;
//ShapeType shape = 6; ShapeType shape = 6;
Vector3Int extents = 12; Vector3Int extents = 12;
/*
enum ShapeType { enum ShapeType {
SHAPE_TYPE_OBSTACLE_SHAPE_CAPSULE = 0; SHAPE_TYPE_OBSTACLE_SHAPE_CAPSULE = 0;
SHAPE_TYPE_OBSTACLE_SHAPE_BOX = 1; SHAPE_TYPE_OBSTACLE_SHAPE_BOX = 1;
} }
*/
} }

6
proto/ToTheMoonObstacleInfo.proto
View File

@ -23,16 +23,16 @@ import "Vector.proto";
option java_package = "emu.grasscutter.net.proto"; option java_package = "emu.grasscutter.net.proto";
message ToTheMoonObstacleInfo { message ToTheMoonObstacleInfo {
//ShapeType type = 2; ShapeType type = 2;
int32 handle_id = 11; int32 handle_id = 11;
MathQuaternion rotation = 7; MathQuaternion rotation = 7;
Vector center = 13; Vector center = 13;
Vector half_extents = 14; Vector half_extents = 14;
/*
enum ShapeType { enum ShapeType {
SHAPE_TYPE_OBSTACLE_SHAPE_CAPSULE = 0; SHAPE_TYPE_OBSTACLE_SHAPE_CAPSULE = 0;
SHAPE_TYPE_OBSTACLE_SHAPE_BOX = 1; SHAPE_TYPE_OBSTACLE_SHAPE_BOX = 1;
} }
*/
} }