From 99086a2514f656c874e73d5713982c43a5a814b1 Mon Sep 17 00:00:00 2001 From: Akbar Yahya <11765082+akbaryahya@users.noreply.github.com> Date: Mon, 7 Nov 2022 04:51:07 +0800 Subject: [PATCH] Miss file ShapeType --- proto/GMObstacleInfo.proto | 4 ++-- proto/ObstacleInfo.proto | 4 +++- proto/ToTheMoonObstacleInfo.proto | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/proto/GMObstacleInfo.proto b/proto/GMObstacleInfo.proto index 260e5c45..56a41421 100644 --- a/proto/GMObstacleInfo.proto +++ b/proto/GMObstacleInfo.proto @@ -18,7 +18,7 @@ syntax = "proto3"; import "MathQuaternion.proto"; -import "ShapeType.proto"; +//import "ShapeType.proto"; import "Vector.proto"; import "Vector3Int.proto"; @@ -26,7 +26,7 @@ option java_package = "emu.grasscutter.net.proto"; message GMObstacleInfo { int64 timestamp = 14; - ShapeType shape = 2; + //ShapeType shape = 2; int32 obstacle_id = 13; MathQuaternion rotation = 3; Vector center = 8; diff --git a/proto/ObstacleInfo.proto b/proto/ObstacleInfo.proto index 67d720f3..e328edc8 100644 --- a/proto/ObstacleInfo.proto +++ b/proto/ObstacleInfo.proto @@ -27,11 +27,13 @@ message ObstacleInfo { MathQuaternion rotation = 4; int32 obstacle_id = 2; Vector center = 14; - ShapeType shape = 6; + //ShapeType shape = 6; Vector3Int extents = 12; +/* enum ShapeType { SHAPE_TYPE_OBSTACLE_SHAPE_CAPSULE = 0; SHAPE_TYPE_OBSTACLE_SHAPE_BOX = 1; } + */ } diff --git a/proto/ToTheMoonObstacleInfo.proto b/proto/ToTheMoonObstacleInfo.proto index 23d69197..271423a1 100644 --- a/proto/ToTheMoonObstacleInfo.proto +++ b/proto/ToTheMoonObstacleInfo.proto @@ -23,14 +23,16 @@ import "Vector.proto"; option java_package = "emu.grasscutter.net.proto"; message ToTheMoonObstacleInfo { - ShapeType type = 2; + //ShapeType type = 2; int32 handle_id = 11; MathQuaternion rotation = 7; Vector center = 13; Vector half_extents = 14; +/* enum ShapeType { SHAPE_TYPE_OBSTACLE_SHAPE_CAPSULE = 0; SHAPE_TYPE_OBSTACLE_SHAPE_BOX = 1; } + */ }