Poprawa scen instruktażowej oraz z podziekowaniem dodanie canvy XR oraz rozbudowanie tych scen, rozszerzenie skryptu o drugie urzadzenie do tętna
This commit is contained in:
Angelones12
@@ -119,6 +119,63 @@ NavMeshSettings:
|
||||
debug:
|
||||
m_Flags: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
--- !u!1001 &108684374
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 3330275269098388655, guid: 15739b9fae72b8d4eb5a484bfa5f56ed, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Scena
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8800088391004320610, guid: 15739b9fae72b8d4eb5a484bfa5f56ed, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 838.47217
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8800088391004320610, guid: 15739b9fae72b8d4eb5a484bfa5f56ed, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8800088391004320610, guid: 15739b9fae72b8d4eb5a484bfa5f56ed, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -282.8968
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8800088391004320610, guid: 15739b9fae72b8d4eb5a484bfa5f56ed, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8800088391004320610, guid: 15739b9fae72b8d4eb5a484bfa5f56ed, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8800088391004320610, guid: 15739b9fae72b8d4eb5a484bfa5f56ed, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8800088391004320610, guid: 15739b9fae72b8d4eb5a484bfa5f56ed, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8800088391004320610, guid: 15739b9fae72b8d4eb5a484bfa5f56ed, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8800088391004320610, guid: 15739b9fae72b8d4eb5a484bfa5f56ed, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8800088391004320610, guid: 15739b9fae72b8d4eb5a484bfa5f56ed, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 15739b9fae72b8d4eb5a484bfa5f56ed, type: 3}
|
||||
--- !u!1 &146630004
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -363,6 +420,177 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1008957027}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1001 &1426648122
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 5661022518140185141, guid: 07a8cef110403be489d6fd314be7891b, type: 3}
|
||||
propertyPath: m_text
|
||||
value: "Serdecznie dzi\u0119kujemy za po\u015Bwi\u0119cony czas i udzia\u0142
|
||||
w eksperymencie. \nBadanie dobieg\u0142o ko\u0144ca. Prosimy o zdj\u0119cie
|
||||
gogli VR oraz rozmontowanie sprz\u0119tu.\n\nENG below:\nThank you very much
|
||||
for your time and participation in experiment. The study is now complete.
|
||||
Please remove the VR headset and unmount the equipment."
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5661022518140185141, guid: 07a8cef110403be489d6fd314be7891b, type: 3}
|
||||
propertyPath: m_fontSize
|
||||
value: 7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5661022518140185141, guid: 07a8cef110403be489d6fd314be7891b, type: 3}
|
||||
propertyPath: m_fontSizeBase
|
||||
value: 7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5882328165170979262, guid: 07a8cef110403be489d6fd314be7891b, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Canvas VR
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6453079825073784092, guid: 07a8cef110403be489d6fd314be7891b, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6453079825073784092, guid: 07a8cef110403be489d6fd314be7891b, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6453079825073784092, guid: 07a8cef110403be489d6fd314be7891b, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6453079825073784092, guid: 07a8cef110403be489d6fd314be7891b, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6453079825073784092, guid: 07a8cef110403be489d6fd314be7891b, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6453079825073784092, guid: 07a8cef110403be489d6fd314be7891b, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6453079825073784092, guid: 07a8cef110403be489d6fd314be7891b, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 134.2206
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6453079825073784092, guid: 07a8cef110403be489d6fd314be7891b, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 100
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6453079825073784092, guid: 07a8cef110403be489d6fd314be7891b, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6453079825073784092, guid: 07a8cef110403be489d6fd314be7891b, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6453079825073784092, guid: 07a8cef110403be489d6fd314be7891b, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -127
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6453079825073784092, guid: 07a8cef110403be489d6fd314be7891b, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6453079825073784092, guid: 07a8cef110403be489d6fd314be7891b, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6453079825073784092, guid: 07a8cef110403be489d6fd314be7891b, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6453079825073784092, guid: 07a8cef110403be489d6fd314be7891b, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6453079825073784092, guid: 07a8cef110403be489d6fd314be7891b, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 844.4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6453079825073784092, guid: 07a8cef110403be489d6fd314be7891b, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -106
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6453079825073784092, guid: 07a8cef110403be489d6fd314be7891b, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6453079825073784092, guid: 07a8cef110403be489d6fd314be7891b, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6453079825073784092, guid: 07a8cef110403be489d6fd314be7891b, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects:
|
||||
- {fileID: 1063538515833486501, guid: 07a8cef110403be489d6fd314be7891b, type: 3}
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 07a8cef110403be489d6fd314be7891b, type: 3}
|
||||
--- !u!1001 &1460122562
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 2381588104667226739, guid: 5d75c99a5637d5e478c501a2686b8499, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: XR Interaction Manager
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8994504154493034260, guid: 5d75c99a5637d5e478c501a2686b8499, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 868.94543
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8994504154493034260, guid: 5d75c99a5637d5e478c501a2686b8499, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -121.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8994504154493034260, guid: 5d75c99a5637d5e478c501a2686b8499, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -206.93173
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8994504154493034260, guid: 5d75c99a5637d5e478c501a2686b8499, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8994504154493034260, guid: 5d75c99a5637d5e478c501a2686b8499, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8994504154493034260, guid: 5d75c99a5637d5e478c501a2686b8499, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8994504154493034260, guid: 5d75c99a5637d5e478c501a2686b8499, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8994504154493034260, guid: 5d75c99a5637d5e478c501a2686b8499, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8994504154493034260, guid: 5d75c99a5637d5e478c501a2686b8499, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8994504154493034260, guid: 5d75c99a5637d5e478c501a2686b8499, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 5d75c99a5637d5e478c501a2686b8499, type: 3}
|
||||
--- !u!1 &1485759984
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -651,6 +879,63 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1772798432}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1001 &1853991979
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4235318187130217681, guid: 317cbb78d3a37e64d9913e9f04375ced, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: XR Origin (VR)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8902138144322678972, guid: 317cbb78d3a37e64d9913e9f04375ced, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 850.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8902138144322678972, guid: 317cbb78d3a37e64d9913e9f04375ced, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -143.92
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8902138144322678972, guid: 317cbb78d3a37e64d9913e9f04375ced, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -173.6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8902138144322678972, guid: 317cbb78d3a37e64d9913e9f04375ced, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.99957496
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8902138144322678972, guid: 317cbb78d3a37e64d9913e9f04375ced, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8902138144322678972, guid: 317cbb78d3a37e64d9913e9f04375ced, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.029153435
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8902138144322678972, guid: 317cbb78d3a37e64d9913e9f04375ced, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8902138144322678972, guid: 317cbb78d3a37e64d9913e9f04375ced, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8902138144322678972, guid: 317cbb78d3a37e64d9913e9f04375ced, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: -3.341
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8902138144322678972, guid: 317cbb78d3a37e64d9913e9f04375ced, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 317cbb78d3a37e64d9913e9f04375ced, type: 3}
|
||||
--- !u!1 &2044655828
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -662,6 +947,7 @@ GameObject:
|
||||
- component: {fileID: 2044655831}
|
||||
- component: {fileID: 2044655830}
|
||||
- component: {fileID: 2044655829}
|
||||
- component: {fileID: 2044655832}
|
||||
m_Layer: 0
|
||||
m_Name: EventSystem
|
||||
m_TagString: Untagged
|
||||
@@ -730,6 +1016,45 @@ Transform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &2044655832
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2044655828}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ab68ce6587aab0146b8dabefbd806791, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_SendPointerHoverToParent: 1
|
||||
m_ClickSpeed: 0.3
|
||||
m_MoveDeadzone: 0.6
|
||||
m_RepeatDelay: 0.5
|
||||
m_RepeatRate: 0.1
|
||||
m_TrackedDeviceDragThresholdMultiplier: 2
|
||||
m_TrackedScrollDeltaMultiplier: 5
|
||||
m_BypassUIToolkitEvents: 0
|
||||
m_ActiveInputMode: 0
|
||||
m_EnableXRInput: 1
|
||||
m_EnableMouseInput: 1
|
||||
m_EnableTouchInput: 1
|
||||
m_PointAction: {fileID: 0}
|
||||
m_LeftClickAction: {fileID: 0}
|
||||
m_MiddleClickAction: {fileID: 0}
|
||||
m_RightClickAction: {fileID: 0}
|
||||
m_ScrollWheelAction: {fileID: 0}
|
||||
m_NavigateAction: {fileID: 0}
|
||||
m_SubmitAction: {fileID: 0}
|
||||
m_CancelAction: {fileID: 0}
|
||||
m_EnableBuiltinActionsAsFallback: 1
|
||||
m_EnableGamepadInput: 1
|
||||
m_EnableJoystickInput: 1
|
||||
m_HorizontalAxis: Horizontal
|
||||
m_VerticalAxis: Vertical
|
||||
m_SubmitButton: Submit
|
||||
m_CancelButton: Cancel
|
||||
--- !u!1660057539 &9223372036854775807
|
||||
SceneRoots:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -738,3 +1063,7 @@ SceneRoots:
|
||||
- {fileID: 1485759986}
|
||||
- {fileID: 146630008}
|
||||
- {fileID: 2044655831}
|
||||
- {fileID: 108684374}
|
||||
- {fileID: 1460122562}
|
||||
- {fileID: 1853991979}
|
||||
- {fileID: 1426648122}
|
||||
|
||||
Reference in New Issue
Block a user