Skip to content

Commit 5cb109d

Browse files
committed
Updated example
1 parent 56bb37a commit 5cb109d

8 files changed

+195
-15
lines changed

Assets/UXF/Examples/Advanced/AdvancedExample.unity

Lines changed: 181 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ Transform:
145145
- {fileID: 973809112}
146146
- {fileID: 735506980}
147147
m_Father: {fileID: 0}
148-
m_RootOrder: 3
148+
m_RootOrder: 4
149149
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
150150
--- !u!114 &70762164
151151
MonoBehaviour:
@@ -1092,6 +1092,92 @@ MonoBehaviour:
10921092
leftTarget: {fileID: 1214997496}
10931093
rightTarget: {fileID: 707951871}
10941094
session: {fileID: 1212509307}
1095+
--- !u!1 &1453687332
1096+
GameObject:
1097+
m_ObjectHideFlags: 0
1098+
m_PrefabParentObject: {fileID: 0}
1099+
m_PrefabInternal: {fileID: 0}
1100+
serializedVersion: 5
1101+
m_Component:
1102+
- component: {fileID: 1453687333}
1103+
- component: {fileID: 1453687335}
1104+
- component: {fileID: 1453687334}
1105+
m_Layer: 5
1106+
m_Name: Text
1107+
m_TagString: Untagged
1108+
m_Icon: {fileID: 0}
1109+
m_NavMeshLayer: 0
1110+
m_StaticEditorFlags: 0
1111+
m_IsActive: 1
1112+
--- !u!224 &1453687333
1113+
RectTransform:
1114+
m_ObjectHideFlags: 0
1115+
m_PrefabParentObject: {fileID: 0}
1116+
m_PrefabInternal: {fileID: 0}
1117+
m_GameObject: {fileID: 1453687332}
1118+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1119+
m_LocalPosition: {x: 0, y: 0, z: 0}
1120+
m_LocalScale: {x: 1, y: 1, z: 1}
1121+
m_Children: []
1122+
m_Father: {fileID: 2027007189}
1123+
m_RootOrder: 0
1124+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1125+
m_AnchorMin: {x: 0, y: 0}
1126+
m_AnchorMax: {x: 0, y: 1}
1127+
m_AnchoredPosition: {x: 10, y: -10}
1128+
m_SizeDelta: {x: 200, y: -20}
1129+
m_Pivot: {x: 0, y: 1}
1130+
--- !u!114 &1453687334
1131+
MonoBehaviour:
1132+
m_ObjectHideFlags: 0
1133+
m_PrefabParentObject: {fileID: 0}
1134+
m_PrefabInternal: {fileID: 0}
1135+
m_GameObject: {fileID: 1453687332}
1136+
m_Enabled: 1
1137+
m_EditorHideFlags: 0
1138+
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
1139+
m_Name:
1140+
m_EditorClassIdentifier:
1141+
m_Material: {fileID: 0}
1142+
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
1143+
m_RaycastTarget: 1
1144+
m_OnCullStateChanged:
1145+
m_PersistentCalls:
1146+
m_Calls: []
1147+
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
1148+
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
1149+
m_FontData:
1150+
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
1151+
m_FontSize: 13
1152+
m_FontStyle: 0
1153+
m_BestFit: 0
1154+
m_MinSize: 1
1155+
m_MaxSize: 40
1156+
m_Alignment: 0
1157+
m_AlignByGeometry: 0
1158+
m_RichText: 1
1159+
m_HorizontalOverflow: 0
1160+
m_VerticalOverflow: 0
1161+
m_LineSpacing: 1
1162+
m_Text: "In this example, you must first move to the red square. It will turn orange,
1163+
then green.\n\nIn one condition, you must move your cursor to the highlighted
1164+
circle (\"normal\"). In another, you must move to the circle that is NOT highlighted
1165+
(\"inverted\"). \n\nEach session will contain two blocks, one block per condition.
1166+
The ExperimentStartupController component in [UXF_UI] has been updated (using
1167+
the inspector) to contain a new participant datapoint, which will be selected
1168+
if the participant performs the inverted condition first.\n\nThis value is accessed
1169+
using the participantDetails dictionary when generating the session (ExperimentGenerator),
1170+
and dictates which of the two blocks is normal/inverted. Additionally, the ExperimentGenerator
1171+
pre-determines several settings and attaches them to the blocks and trials. \n\nThe
1172+
actual trial begins when the square turns green.\n\nA PositionRotationTracker
1173+
component is attached to the CursorFollower GameObject and is referenced in the
1174+
session inspector. \n\n"
1175+
--- !u!222 &1453687335
1176+
CanvasRenderer:
1177+
m_ObjectHideFlags: 0
1178+
m_PrefabParentObject: {fileID: 0}
1179+
m_PrefabInternal: {fileID: 0}
1180+
m_GameObject: {fileID: 1453687332}
10951181
--- !u!1 &1471062200
10961182
GameObject:
10971183
m_ObjectHideFlags: 0
@@ -1401,3 +1487,97 @@ MonoBehaviour:
14011487
invertedInstructions: Move to the square. When the square turns green, move to the
14021488
circle that is NOT highlighted
14031489
session: {fileID: 1212509307}
1490+
--- !u!1 &2027007185
1491+
GameObject:
1492+
m_ObjectHideFlags: 0
1493+
m_PrefabParentObject: {fileID: 0}
1494+
m_PrefabInternal: {fileID: 0}
1495+
serializedVersion: 5
1496+
m_Component:
1497+
- component: {fileID: 2027007189}
1498+
- component: {fileID: 2027007188}
1499+
- component: {fileID: 2027007187}
1500+
- component: {fileID: 2027007186}
1501+
m_Layer: 5
1502+
m_Name: Info
1503+
m_TagString: Untagged
1504+
m_Icon: {fileID: 0}
1505+
m_NavMeshLayer: 0
1506+
m_StaticEditorFlags: 0
1507+
m_IsActive: 1
1508+
--- !u!114 &2027007186
1509+
MonoBehaviour:
1510+
m_ObjectHideFlags: 0
1511+
m_PrefabParentObject: {fileID: 0}
1512+
m_PrefabInternal: {fileID: 0}
1513+
m_GameObject: {fileID: 2027007185}
1514+
m_Enabled: 1
1515+
m_EditorHideFlags: 0
1516+
m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
1517+
m_Name:
1518+
m_EditorClassIdentifier:
1519+
m_IgnoreReversedGraphics: 1
1520+
m_BlockingObjects: 0
1521+
m_BlockingMask:
1522+
serializedVersion: 2
1523+
m_Bits: 4294967295
1524+
--- !u!114 &2027007187
1525+
MonoBehaviour:
1526+
m_ObjectHideFlags: 0
1527+
m_PrefabParentObject: {fileID: 0}
1528+
m_PrefabInternal: {fileID: 0}
1529+
m_GameObject: {fileID: 2027007185}
1530+
m_Enabled: 1
1531+
m_EditorHideFlags: 0
1532+
m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
1533+
m_Name:
1534+
m_EditorClassIdentifier:
1535+
m_UiScaleMode: 0
1536+
m_ReferencePixelsPerUnit: 100
1537+
m_ScaleFactor: 1
1538+
m_ReferenceResolution: {x: 800, y: 600}
1539+
m_ScreenMatchMode: 0
1540+
m_MatchWidthOrHeight: 0
1541+
m_PhysicalUnit: 3
1542+
m_FallbackScreenDPI: 96
1543+
m_DefaultSpriteDPI: 96
1544+
m_DynamicPixelsPerUnit: 1
1545+
--- !u!223 &2027007188
1546+
Canvas:
1547+
m_ObjectHideFlags: 0
1548+
m_PrefabParentObject: {fileID: 0}
1549+
m_PrefabInternal: {fileID: 0}
1550+
m_GameObject: {fileID: 2027007185}
1551+
m_Enabled: 1
1552+
serializedVersion: 3
1553+
m_RenderMode: 0
1554+
m_Camera: {fileID: 0}
1555+
m_PlaneDistance: 100
1556+
m_PixelPerfect: 0
1557+
m_ReceivesEvents: 1
1558+
m_OverrideSorting: 0
1559+
m_OverridePixelPerfect: 0
1560+
m_SortingBucketNormalizedSize: 0
1561+
m_AdditionalShaderChannelsFlag: 0
1562+
m_SortingLayerID: 0
1563+
m_SortingOrder: 0
1564+
m_TargetDisplay: 0
1565+
--- !u!224 &2027007189
1566+
RectTransform:
1567+
m_ObjectHideFlags: 0
1568+
m_PrefabParentObject: {fileID: 0}
1569+
m_PrefabInternal: {fileID: 0}
1570+
m_GameObject: {fileID: 2027007185}
1571+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1572+
m_LocalPosition: {x: 0, y: 0, z: 0}
1573+
m_LocalScale: {x: 0, y: 0, z: 0}
1574+
m_Children:
1575+
- {fileID: 1453687333}
1576+
m_Father: {fileID: 0}
1577+
m_RootOrder: 3
1578+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1579+
m_AnchorMin: {x: 0, y: 0}
1580+
m_AnchorMax: {x: 0, y: 0}
1581+
m_AnchoredPosition: {x: 0, y: 0}
1582+
m_SizeDelta: {x: 0, y: 0}
1583+
m_Pivot: {x: 0, y: 0}

Assets/UXF/Examples/Advanced/Scripts/CursorFollower.cs.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/UXF/Examples/Advanced/Scripts/ExperimentGenerator.cs.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/UXF/Examples/Advanced/Scripts/InstructionsController.cs.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/UXF/Examples/Advanced/Scripts/StartBlockController.cs.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/UXF/Examples/Advanced/Scripts/TargetController.cs.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/UXF/Examples/Advanced/Scripts/TargetManager.cs.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/UXF/Examples/Advanced/Scripts/TaskManager.cs.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)