1
0
mirror of https://projects.caleb-brown.dev/UDRI-XRT/UDRIGEEKCup2024.git synced 2025-01-22 07:08:51 -05:00

Merge branch 'development' into Obstical-Work

This commit is contained in:
Kip Taylor 2024-04-23 14:19:51 -04:00
commit 86bf49d282
3 changed files with 37 additions and 7 deletions

View File

@ -25,7 +25,7 @@ Transform:
m_GameObject: {fileID: 713620919343188744} m_GameObject: {fileID: 713620919343188744}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 2.33}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 1 m_ConstrainProportionsScale: 1
m_Children: m_Children:
@ -115,7 +115,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1273508384157506, guid: 22b5884c8772b654489e4ed1d6987802, type: 3} - target: {fileID: 1273508384157506, guid: 22b5884c8772b654489e4ed1d6987802, type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1298767457708356, guid: 22b5884c8772b654489e4ed1d6987802, type: 3} - target: {fileID: 1298767457708356, guid: 22b5884c8772b654489e4ed1d6987802, type: 3}
propertyPath: m_Layer propertyPath: m_Layer
@ -251,6 +251,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: -90 value: -90
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6770967778482584083, guid: 7fadbf24dc7c14173a60e008099ea15f,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: [] m_RemovedGameObjects: []
m_AddedGameObjects: [] m_AddedGameObjects: []

View File

@ -25,7 +25,7 @@ Transform:
m_GameObject: {fileID: 1134376618909689890} m_GameObject: {fileID: 1134376618909689890}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0.25, y: 0, z: 1.41}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 1 m_ConstrainProportionsScale: 1
m_Children: m_Children:
@ -115,7 +115,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1273508384157506, guid: 22b5884c8772b654489e4ed1d6987802, type: 3} - target: {fileID: 1273508384157506, guid: 22b5884c8772b654489e4ed1d6987802, type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1298767457708356, guid: 22b5884c8772b654489e4ed1d6987802, type: 3} - target: {fileID: 1298767457708356, guid: 22b5884c8772b654489e4ed1d6987802, type: 3}
propertyPath: m_Layer propertyPath: m_Layer
@ -196,11 +196,31 @@ PrefabInstance:
serializedVersion: 3 serializedVersion: 3
m_TransformParent: {fileID: 497128392619825818} m_TransformParent: {fileID: 497128392619825818}
m_Modifications: m_Modifications:
- target: {fileID: 2422903280073362139, guid: 23df27f8eab164f53a62e09b8b7c7325,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2529697415610420776, guid: 23df27f8eab164f53a62e09b8b7c7325, - target: {fileID: 2529697415610420776, guid: 23df27f8eab164f53a62e09b8b7c7325,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Main_Room value: Main_Room
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2624569838257048262, guid: 23df27f8eab164f53a62e09b8b7c7325,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6864179191514092418, guid: 23df27f8eab164f53a62e09b8b7c7325,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6864179191514092418, guid: 23df27f8eab164f53a62e09b8b7c7325,
type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8622549130173790273, guid: 23df27f8eab164f53a62e09b8b7c7325, - target: {fileID: 8622549130173790273, guid: 23df27f8eab164f53a62e09b8b7c7325,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x

View File

@ -98,7 +98,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!4 &5326566115739564864 --- !u!4 &5326566115739564864
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -143,7 +143,7 @@ Transform:
m_GameObject: {fileID: 3622802909112921052} m_GameObject: {fileID: 3622802909112921052}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: -0.607, y: 0, z: 2.064}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 1 m_ConstrainProportionsScale: 1
m_Children: m_Children:
@ -458,7 +458,7 @@ Transform:
m_GameObject: {fileID: 9029269653538476387} m_GameObject: {fileID: 9029269653538476387}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0, y: -1, z: -0, w: 0} m_LocalRotation: {x: -0, y: -1, z: -0, w: 0}
m_LocalPosition: {x: 0, y: 0.2, z: 0} m_LocalPosition: {x: -0.1, y: 0.2, z: 0.58}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@ -522,6 +522,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3974055811102851262, guid: 0c2d73280f95e463cb0a553c52a488a7,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4908809923922535070, guid: 0c2d73280f95e463cb0a553c52a488a7, - target: {fileID: 4908809923922535070, guid: 0c2d73280f95e463cb0a553c52a488a7,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name