Merge branch 'main' into Navigation

This commit is contained in:
maverickdgg 2023-03-25 17:29:13 +08:00
commit 72bbc72531
4 changed files with 5 additions and 5 deletions

View File

@ -1,5 +1,5 @@
0 StaticObject 1101000000000000 0 StaticObject 1101000000000000
1 Player 1101000000000000 1 Furniture 1101000000000000
2 Food 1000000000000000 2 Food 1000000000000000
3 Breakable 1100000000000000 3 Breakable 1100000000000000
4 ScoringWallCollider 0110000000000000 4 ScoringWallCollider 0110000000000000
@ -8,7 +8,7 @@
7 StaticWithCameraCollision 1111000000000000 7 StaticWithCameraCollision 1111000000000000
8 Floor 1100000000000000 8 Floor 1100000000000000
9 Navigation 0001000000000000 9 Navigation 0001000000000000
10 11 0000000000000000 10 Player 1100000000000000
11 12 0000000000000000 11 12 0000000000000000
12 13 0000000000000000 12 13 0000000000000000
13 14 0000000000000000 13 14 0000000000000000

View File

@ -8444,7 +8444,7 @@
Collider Component: Collider Component:
Colliders: Colliders:
- Is Trigger: false - Is Trigger: false
Collision Tag: 1 Collision Tag: 10
Type: Capsule Type: Capsule
Radius: 0.300000012 Radius: 0.300000012
Height: 0.300000012 Height: 0.300000012

View File

@ -2991,7 +2991,7 @@
Collider Component: Collider Component:
Colliders: Colliders:
- Is Trigger: false - Is Trigger: false
Collision Tag: 1 Collision Tag: 10
Type: Capsule Type: Capsule
Radius: 0.300000012 Radius: 0.300000012
Height: 0.300000012 Height: 0.300000012

View File

@ -12316,7 +12316,7 @@
Collider Component: Collider Component:
Colliders: Colliders:
- Is Trigger: false - Is Trigger: false
Collision Tag: 1 Collision Tag: 10
Type: Capsule Type: Capsule
Radius: 0.300000012 Radius: 0.300000012
Height: 0.300000012 Height: 0.300000012