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

Merge branch 'feature/LoadingCourseOnPlane' of https://udrimavric.com/MAVRIC/UDRIGolf2024 into feature/LoadingCourseOnPlane

Browse Source
This commit is contained in:
Noah 2024-04-22 11:46:34 -04:00
commit 5a9c2748cb
6 changed files with 247 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Assets/CoursePrefabs/AR Content Control Room 1.prefab
View File

@ -12908,7 +12908,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8705426838991076611}
m_Layer: 6
m_Layer: 0
m_Name: Colliders
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -13380,6 +13380,7 @@ GameObject:
- component: {fileID: 6231981638342378203}
- component: {fileID: 6231981638343366231}
- component: {fileID: 6239260131462038367}
- component: {fileID: 8770385945657364533}
m_Layer: 6
m_Name: SM_Env_Tiles_03
m_TagString: Untagged
@ -13473,6 +13474,44 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 5.000002, y: 0.09791671, z: 4.999999}
m_Center: {x: -2.500001, y: 0.045907862, z: 2.4999995}
--- !u!114 &8770385945657364533
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6231981638341336615}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9a6ab7cbc45164d19b20476265c251c2, type: 3}
m_Name:
m_EditorClassIdentifier:
_developerDescription:
_unityEventResponse:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 6239260131462038367}
m_TargetAssemblyTypeName: UnityEngine.Collider, UnityEngine
m_MethodName: set_enabled
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
_actionResponses: []
_conditions: []
_operator: 0
_replayEventBufferOnRegister: 1
_eventReference:
_usage: 2
_event: {fileID: 0}
_eventInstancer: {fileID: 0}
_variable: {fileID: 11400000, guid: c06694055e7ae4003afe2a672d2eefb0, type: 2}
_variableInstancer: {fileID: 0}
--- !u!1 &6399812764383669609
GameObject:
m_ObjectHideFlags: 0

39
Assets/CoursePrefabs/AR Content Green Room.prefab
View File

@ -116,6 +116,7 @@ GameObject:
m_Component:
- component: {fileID: 4771820529111267321}
- component: {fileID: 2050424768227789314}
- component: {fileID: 7750816402041376525}
m_Layer: 0
m_Name: FloorCollider
m_TagString: Untagged
@ -159,6 +160,44 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 6.7228794, y: 3.5313902, z: 0.14610924}
m_Center: {x: 0.124147415, y: 0.036335234, z: -0.057532}
--- !u!114 &7750816402041376525
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1788447733110926119}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9a6ab7cbc45164d19b20476265c251c2, type: 3}
m_Name:
m_EditorClassIdentifier:
_developerDescription:
_unityEventResponse:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 2050424768227789314}
m_TargetAssemblyTypeName: UnityEngine.Collider, UnityEngine
m_MethodName: set_enabled
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
_actionResponses: []
_conditions: []
_operator: 0
_replayEventBufferOnRegister: 1
_eventReference:
_usage: 2
_event: {fileID: 0}
_eventInstancer: {fileID: 0}
_variable: {fileID: 11400000, guid: c06694055e7ae4003afe2a672d2eefb0, type: 2}
_variableInstancer: {fileID: 0}
--- !u!1 &2458679129716592682
GameObject:
m_ObjectHideFlags: 0

95
Assets/CoursePrefabs/AR Content Main Room 1.prefab
View File

@ -414,6 +414,7 @@ GameObject:
m_Component:
- component: {fileID: 3326712357909623868}
- component: {fileID: 83835649525950447}
- component: {fileID: 794368612076738499}
m_Layer: 6
m_Name: Floor
m_TagString: Untagged
@ -457,6 +458,44 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 9.516679, y: 7.8316584, z: 0.34393713}
m_Center: {x: -0.23675013, y: -0.63225657, z: -0.16532663}
--- !u!114 &794368612076738499
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2341108321183187393}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9a6ab7cbc45164d19b20476265c251c2, type: 3}
m_Name:
m_EditorClassIdentifier:
_developerDescription:
_unityEventResponse:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 83835649525950447}
m_TargetAssemblyTypeName: UnityEngine.Collider, UnityEngine
m_MethodName: set_enabled
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
_actionResponses: []
_conditions: []
_operator: 0
_replayEventBufferOnRegister: 1
_eventReference:
_usage: 2
_event: {fileID: 0}
_eventInstancer: {fileID: 0}
_variable: {fileID: 11400000, guid: c06694055e7ae4003afe2a672d2eefb0, type: 2}
_variableInstancer: {fileID: 0}
--- !u!1 &3385517515702562529
GameObject:
m_ObjectHideFlags: 0
@ -1773,7 +1812,11 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 1921429216111340, guid: 6693b268206f7d5418b455597fb30a28,
type: 3}
insertIndex: -1
addedObject: {fileID: 8562672288256373251}
m_SourcePrefab: {fileID: 100100000, guid: 6693b268206f7d5418b455597fb30a28, type: 3}
--- !u!4 &793077062651056678 stripped
Transform:
@ -1781,6 +1824,56 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 797602275295831332}
m_PrefabAsset: {fileID: 0}
--- !u!1 &799235606661959624 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1921429216111340, guid: 6693b268206f7d5418b455597fb30a28,
type: 3}
m_PrefabInstance: {fileID: 797602275295831332}
m_PrefabAsset: {fileID: 0}
--- !u!114 &8562672288256373251
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 799235606661959624}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9a6ab7cbc45164d19b20476265c251c2, type: 3}
m_Name:
m_EditorClassIdentifier:
_developerDescription:
_unityEventResponse:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 860994596747967826}
m_TargetAssemblyTypeName: UnityEngine.Collider, UnityEngine
m_MethodName: set_enabled
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
_actionResponses: []
_conditions: []
_operator: 0
_replayEventBufferOnRegister: 1
_eventReference:
_usage: 2
_event: {fileID: 0}
_eventInstancer: {fileID: 0}
_variable: {fileID: 11400000, guid: c06694055e7ae4003afe2a672d2eefb0, type: 2}
_variableInstancer: {fileID: 0}
--- !u!64 &860994596747967826 stripped
MeshCollider:
m_CorrespondingSourceObject: {fileID: 64027916584638582, guid: 6693b268206f7d5418b455597fb30a28,
type: 3}
m_PrefabInstance: {fileID: 797602275295831332}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1068533904419380468
PrefabInstance:
m_ObjectHideFlags: 0

74
Assets/CoursePrefabs/Control_Room.prefab
View File

@ -50,7 +50,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 782634506160621956}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -150,7 +150,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6078770376794553262}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -199,11 +199,51 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 3277065184914629628}
m_Modifications:
- target: {fileID: 59627506673481626, guid: 5ee2517b0b7144e8892959257e46d92a,
type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 574885612832023710, guid: 5ee2517b0b7144e8892959257e46d92a,
type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 788597612474399250, guid: 5ee2517b0b7144e8892959257e46d92a,
type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1746987816102834222, guid: 5ee2517b0b7144e8892959257e46d92a,
type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2184988316656342954, guid: 5ee2517b0b7144e8892959257e46d92a,
type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2851204837053469891, guid: 5ee2517b0b7144e8892959257e46d92a,
type: 3}
propertyPath: m_Name
value: AR Content Control Room
objectReference: {fileID: 0}
- target: {fileID: 4132408986415743252, guid: 5ee2517b0b7144e8892959257e46d92a,
type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4480087873361496978, guid: 5ee2517b0b7144e8892959257e46d92a,
type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5150664481931160824, guid: 5ee2517b0b7144e8892959257e46d92a,
type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5181318039997983483, guid: 5ee2517b0b7144e8892959257e46d92a,
type: 3}
propertyPath: m_LocalPosition.x
@ -254,6 +294,36 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: -90
objectReference: {fileID: 0}
- target: {fileID: 5253255368712559449, guid: 5ee2517b0b7144e8892959257e46d92a,
type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5458263902315265290, guid: 5ee2517b0b7144e8892959257e46d92a,
type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5504889859321627669, guid: 5ee2517b0b7144e8892959257e46d92a,
type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6399812764383669609, guid: 5ee2517b0b7144e8892959257e46d92a,
type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7433259826791815944, guid: 5ee2517b0b7144e8892959257e46d92a,
type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8628402554833882845, guid: 5ee2517b0b7144e8892959257e46d92a,
type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []

4
Assets/CoursePrefabs/Green_Room.prefab
View File

@ -17,7 +17,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 2147483647
m_IsActive: 1
m_IsActive: 0
--- !u!4 &5999757072121744290
Transform:
m_ObjectHideFlags: 0
@ -138,7 +138,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4908809923922535070}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1

15
Assets/Samples/MAVRIC.GEEKCup/QRCode/Prefabs/course-01.prefab
View File

@ -201,16 +201,6 @@ PrefabInstance:
propertyPath: m_Name
value: Control_Room
objectReference: {fileID: 0}
- target: {fileID: 1343013228891885674, guid: 7fadbf24dc7c14173a60e008099ea15f,
type: 3}
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
- target: {fileID: 1373004051263680654, guid: 7fadbf24dc7c14173a60e008099ea15f,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3277065184914629628, guid: 7fadbf24dc7c14173a60e008099ea15f,
type: 3}
propertyPath: m_LocalPosition.x
@ -261,11 +251,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: -90
objectReference: {fileID: 0}
- target: {fileID: 6770967778482584083, guid: 7fadbf24dc7c14173a60e008099ea15f,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []