Skip to content

Commit e5fbd04

Browse files
jackbrookesjackbrookes
authored
Merge pull request #8 from jackbrookes/development
Merged dev branch
2 parents af3308d + 1d6adee commit e5fbd04

21 files changed

+2750
-832
lines changed

‎Assets/DevelopmentScene.unity

Lines changed: 319 additions & 69 deletions
Large diffs are not rendered by default.

‎Assets/UXF/Examples/Advanced/AdvancedExample.unity

Lines changed: 303 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,22 @@ RectTransform:
439439
m_AnchoredPosition: {x: 0, y: 0}
440440
m_SizeDelta: {x: 0, y: 0}
441441
m_Pivot: {x: 0, y: 0}
442+
--- !u!1 &772481549 stripped
443+
GameObject:
444+
m_PrefabParentObject: {fileID: 1232849728441532, guid: 0a3b6392f04558844bd340e68ced1ff9,
445+
type: 2}
446+
m_PrefabInternal: {fileID: 1212509306}
447+
--- !u!114 &772481554
448+
MonoBehaviour:
449+
m_ObjectHideFlags: 0
450+
m_PrefabParentObject: {fileID: 0}
451+
m_PrefabInternal: {fileID: 0}
452+
m_GameObject: {fileID: 772481549}
453+
m_Enabled: 1
454+
m_EditorHideFlags: 0
455+
m_Script: {fileID: 11500000, guid: 51f945e5620a8ab47bd508d682077a50, type: 3}
456+
m_Name:
457+
m_EditorClassIdentifier:
442458
--- !u!1 &973809109
443459
GameObject:
444460
m_ObjectHideFlags: 0
@@ -666,7 +682,7 @@ Prefab:
666682
- target: {fileID: 224546371281550106, guid: 0a3b6392f04558844bd340e68ced1ff9,
667683
type: 2}
668684
propertyPath: m_SizeDelta.y
669-
value: 75
685+
value: 0
670686
objectReference: {fileID: 0}
671687
- target: {fileID: 114916036141644208, guid: 0a3b6392f04558844bd340e68ced1ff9,
672688
type: 2}
@@ -978,6 +994,291 @@ Prefab:
978994
propertyPath: onSessionEnd.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
979995
value: UnityEngine.Object, UnityEngine
980996
objectReference: {fileID: 0}
997+
- target: {fileID: 224550780365075244, guid: 0a3b6392f04558844bd340e68ced1ff9,
998+
type: 2}
999+
propertyPath: m_AnchorMax.x
1000+
value: 1
1001+
objectReference: {fileID: 0}
1002+
- target: {fileID: 224550780365075244, guid: 0a3b6392f04558844bd340e68ced1ff9,
1003+
type: 2}
1004+
propertyPath: m_AnchorMax.y
1005+
value: 1
1006+
objectReference: {fileID: 0}
1007+
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
1008+
type: 2}
1009+
propertyPath: m_AnchorMin.y
1010+
value: 1
1011+
objectReference: {fileID: 0}
1012+
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
1013+
type: 2}
1014+
propertyPath: m_AnchorMax.y
1015+
value: 1
1016+
objectReference: {fileID: 0}
1017+
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
1018+
type: 2}
1019+
propertyPath: m_AnchoredPosition.x
1020+
value: 12
1021+
objectReference: {fileID: 0}
1022+
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
1023+
type: 2}
1024+
propertyPath: m_AnchoredPosition.y
1025+
value: -10
1026+
objectReference: {fileID: 0}
1027+
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
1028+
type: 2}
1029+
propertyPath: m_AnchorMin.y
1030+
value: 1
1031+
objectReference: {fileID: 0}
1032+
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
1033+
type: 2}
1034+
propertyPath: m_AnchorMax.y
1035+
value: 1
1036+
objectReference: {fileID: 0}
1037+
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
1038+
type: 2}
1039+
propertyPath: m_AnchoredPosition.x
1040+
value: 33
1041+
objectReference: {fileID: 0}
1042+
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
1043+
type: 2}
1044+
propertyPath: m_AnchoredPosition.y
1045+
value: -10
1046+
objectReference: {fileID: 0}
1047+
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
1048+
type: 2}
1049+
propertyPath: m_AnchorMin.y
1050+
value: 1
1051+
objectReference: {fileID: 0}
1052+
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
1053+
type: 2}
1054+
propertyPath: m_AnchorMax.y
1055+
value: 1
1056+
objectReference: {fileID: 0}
1057+
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
1058+
type: 2}
1059+
propertyPath: m_AnchoredPosition.x
1060+
value: 12
1061+
objectReference: {fileID: 0}
1062+
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
1063+
type: 2}
1064+
propertyPath: m_AnchoredPosition.y
1065+
value: -10
1066+
objectReference: {fileID: 0}
1067+
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
1068+
type: 2}
1069+
propertyPath: m_AnchorMin.y
1070+
value: 1
1071+
objectReference: {fileID: 0}
1072+
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
1073+
type: 2}
1074+
propertyPath: m_AnchorMax.y
1075+
value: 1
1076+
objectReference: {fileID: 0}
1077+
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
1078+
type: 2}
1079+
propertyPath: m_AnchoredPosition.x
1080+
value: 29
1081+
objectReference: {fileID: 0}
1082+
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
1083+
type: 2}
1084+
propertyPath: m_AnchoredPosition.y
1085+
value: -10
1086+
objectReference: {fileID: 0}
1087+
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
1088+
type: 2}
1089+
propertyPath: m_AnchorMin.y
1090+
value: 1
1091+
objectReference: {fileID: 0}
1092+
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
1093+
type: 2}
1094+
propertyPath: m_AnchorMax.y
1095+
value: 1
1096+
objectReference: {fileID: 0}
1097+
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
1098+
type: 2}
1099+
propertyPath: m_AnchoredPosition.x
1100+
value: 182.75
1101+
objectReference: {fileID: 0}
1102+
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
1103+
type: 2}
1104+
propertyPath: m_AnchoredPosition.y
1105+
value: -10
1106+
objectReference: {fileID: 0}
1107+
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
1108+
type: 2}
1109+
propertyPath: m_SizeDelta.x
1110+
value: 100
1111+
objectReference: {fileID: 0}
1112+
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
1113+
type: 2}
1114+
propertyPath: m_AnchorMin.y
1115+
value: 1
1116+
objectReference: {fileID: 0}
1117+
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
1118+
type: 2}
1119+
propertyPath: m_AnchorMax.y
1120+
value: 1
1121+
objectReference: {fileID: 0}
1122+
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
1123+
type: 2}
1124+
propertyPath: m_AnchoredPosition.x
1125+
value: 523.25
1126+
objectReference: {fileID: 0}
1127+
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
1128+
type: 2}
1129+
propertyPath: m_AnchoredPosition.y
1130+
value: -10
1131+
objectReference: {fileID: 0}
1132+
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
1133+
type: 2}
1134+
propertyPath: m_SizeDelta.x
1135+
value: 100
1136+
objectReference: {fileID: 0}
1137+
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
1138+
type: 2}
1139+
propertyPath: m_AnchorMin.y
1140+
value: 1
1141+
objectReference: {fileID: 0}
1142+
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
1143+
type: 2}
1144+
propertyPath: m_AnchorMax.y
1145+
value: 1
1146+
objectReference: {fileID: 0}
1147+
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
1148+
type: 2}
1149+
propertyPath: m_AnchoredPosition.x
1150+
value: 863.75
1151+
objectReference: {fileID: 0}
1152+
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
1153+
type: 2}
1154+
propertyPath: m_AnchoredPosition.y
1155+
value: -10
1156+
objectReference: {fileID: 0}
1157+
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
1158+
type: 2}
1159+
propertyPath: m_SizeDelta.x
1160+
value: 100
1161+
objectReference: {fileID: 0}
1162+
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
1163+
type: 2}
1164+
propertyPath: m_AnchorMin.y
1165+
value: 1
1166+
objectReference: {fileID: 0}
1167+
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
1168+
type: 2}
1169+
propertyPath: m_AnchorMax.y
1170+
value: 1
1171+
objectReference: {fileID: 0}
1172+
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
1173+
type: 2}
1174+
propertyPath: m_AnchoredPosition.x
1175+
value: 1204.25
1176+
objectReference: {fileID: 0}
1177+
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
1178+
type: 2}
1179+
propertyPath: m_AnchoredPosition.y
1180+
value: -10
1181+
objectReference: {fileID: 0}
1182+
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
1183+
type: 2}
1184+
propertyPath: m_SizeDelta.x
1185+
value: 100
1186+
objectReference: {fileID: 0}
1187+
- target: {fileID: 224487761690423894, guid: 0a3b6392f04558844bd340e68ced1ff9,
1188+
type: 2}
1189+
propertyPath: m_SizeDelta.y
1190+
value: 0
1191+
objectReference: {fileID: 0}
1192+
- target: {fileID: 224235448540703324, guid: 0a3b6392f04558844bd340e68ced1ff9,
1193+
type: 2}
1194+
propertyPath: m_AnchorMin.y
1195+
value: 1
1196+
objectReference: {fileID: 0}
1197+
- target: {fileID: 224235448540703324, guid: 0a3b6392f04558844bd340e68ced1ff9,
1198+
type: 2}
1199+
propertyPath: m_AnchorMax.y
1200+
value: 1
1201+
objectReference: {fileID: 0}
1202+
- target: {fileID: 224235448540703324, guid: 0a3b6392f04558844bd340e68ced1ff9,
1203+
type: 2}
1204+
propertyPath: m_AnchoredPosition.x
1205+
value: 40.5
1206+
objectReference: {fileID: 0}
1207+
- target: {fileID: 224235448540703324, guid: 0a3b6392f04558844bd340e68ced1ff9,
1208+
type: 2}
1209+
propertyPath: m_AnchoredPosition.y
1210+
value: -10
1211+
objectReference: {fileID: 0}
1212+
- target: {fileID: 224235448540703324, guid: 0a3b6392f04558844bd340e68ced1ff9,
1213+
type: 2}
1214+
propertyPath: m_SizeDelta.x
1215+
value: 81
1216+
objectReference: {fileID: 0}
1217+
- target: {fileID: 224235448540703324, guid: 0a3b6392f04558844bd340e68ced1ff9,
1218+
type: 2}
1219+
propertyPath: m_SizeDelta.y
1220+
value: 20
1221+
objectReference: {fileID: 0}
1222+
- target: {fileID: 224025734146448884, guid: 0a3b6392f04558844bd340e68ced1ff9,
1223+
type: 2}
1224+
propertyPath: m_AnchorMin.y
1225+
value: 1
1226+
objectReference: {fileID: 0}
1227+
- target: {fileID: 224025734146448884, guid: 0a3b6392f04558844bd340e68ced1ff9,
1228+
type: 2}
1229+
propertyPath: m_AnchorMax.y
1230+
value: 1
1231+
objectReference: {fileID: 0}
1232+
- target: {fileID: 224025734146448884, guid: 0a3b6392f04558844bd340e68ced1ff9,
1233+
type: 2}
1234+
propertyPath: m_AnchoredPosition.x
1235+
value: 776.5
1236+
objectReference: {fileID: 0}
1237+
- target: {fileID: 224025734146448884, guid: 0a3b6392f04558844bd340e68ced1ff9,
1238+
type: 2}
1239+
propertyPath: m_AnchoredPosition.y
1240+
value: -10
1241+
objectReference: {fileID: 0}
1242+
- target: {fileID: 224025734146448884, guid: 0a3b6392f04558844bd340e68ced1ff9,
1243+
type: 2}
1244+
propertyPath: m_SizeDelta.x
1245+
value: 1387
1246+
objectReference: {fileID: 0}
1247+
- target: {fileID: 224025734146448884, guid: 0a3b6392f04558844bd340e68ced1ff9,
1248+
type: 2}
1249+
propertyPath: m_SizeDelta.y
1250+
value: 20
1251+
objectReference: {fileID: 0}
1252+
- target: {fileID: 224999085726949720, guid: 0a3b6392f04558844bd340e68ced1ff9,
1253+
type: 2}
1254+
propertyPath: m_AnchorMin.y
1255+
value: 1
1256+
objectReference: {fileID: 0}
1257+
- target: {fileID: 224999085726949720, guid: 0a3b6392f04558844bd340e68ced1ff9,
1258+
type: 2}
1259+
propertyPath: m_AnchorMax.y
1260+
value: 1
1261+
objectReference: {fileID: 0}
1262+
- target: {fileID: 224999085726949720, guid: 0a3b6392f04558844bd340e68ced1ff9,
1263+
type: 2}
1264+
propertyPath: m_AnchoredPosition.x
1265+
value: 1508.5
1266+
objectReference: {fileID: 0}
1267+
- target: {fileID: 224999085726949720, guid: 0a3b6392f04558844bd340e68ced1ff9,
1268+
type: 2}
1269+
propertyPath: m_AnchoredPosition.y
1270+
value: -10
1271+
objectReference: {fileID: 0}
1272+
- target: {fileID: 224999085726949720, guid: 0a3b6392f04558844bd340e68ced1ff9,
1273+
type: 2}
1274+
propertyPath: m_SizeDelta.x
1275+
value: 73
1276+
objectReference: {fileID: 0}
1277+
- target: {fileID: 224999085726949720, guid: 0a3b6392f04558844bd340e68ced1ff9,
1278+
type: 2}
1279+
propertyPath: m_SizeDelta.y
1280+
value: 20
1281+
objectReference: {fileID: 0}
9811282
m_RemovedComponents: []
9821283
m_ParentPrefab: {fileID: 100100000, guid: 0a3b6392f04558844bd340e68ced1ff9, type: 2}
9831284
m_IsPrefabParent: 0
@@ -1472,7 +1773,7 @@ RectTransform:
14721773
m_AnchorMin: {x: 0, y: 0}
14731774
m_AnchorMax: {x: 1, y: 0}
14741775
m_AnchoredPosition: {x: 0, y: 0}
1475-
m_SizeDelta: {x: -100, y: 55.56}
1776+
m_SizeDelta: {x: -100, y: 87.88}
14761777
m_Pivot: {x: 0.5, y: 0}
14771778
--- !u!114 &2024855461
14781779
MonoBehaviour:

0 commit comments

Comments
 (0)