Skip to content

Commit 83a1102

Browse files
jackbrookesjackbrookes
committed
fixed #38 & #41 
1 parent 15bf121 commit 83a1102

File tree

7 files changed

+242
-74
lines changed

7 files changed

+242
-74
lines changed

‎Assets/DevelopmentScene.unity

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1319,6 +1319,36 @@ PrefabInstance:
13191319
propertyPath: m_IsActive
13201320
value: 1
13211321
objectReference: {fileID: 0}
1322+
- target: {fileID: 4835438972542875672, guid: 0a3b6392f04558844bd340e68ced1ff9,
1323+
type: 3}
1324+
propertyPath: m_AnchorMin.y
1325+
value: 0
1326+
objectReference: {fileID: 0}
1327+
- target: {fileID: 4835438972542875672, guid: 0a3b6392f04558844bd340e68ced1ff9,
1328+
type: 3}
1329+
propertyPath: m_AnchorMax.y
1330+
value: 0
1331+
objectReference: {fileID: 0}
1332+
- target: {fileID: 4835438972542875672, guid: 0a3b6392f04558844bd340e68ced1ff9,
1333+
type: 3}
1334+
propertyPath: m_AnchoredPosition.x
1335+
value: 0
1336+
objectReference: {fileID: 0}
1337+
- target: {fileID: 4835438972542875672, guid: 0a3b6392f04558844bd340e68ced1ff9,
1338+
type: 3}
1339+
propertyPath: m_AnchoredPosition.y
1340+
value: 0
1341+
objectReference: {fileID: 0}
1342+
- target: {fileID: 4835438972542875672, guid: 0a3b6392f04558844bd340e68ced1ff9,
1343+
type: 3}
1344+
propertyPath: m_SizeDelta.x
1345+
value: 0
1346+
objectReference: {fileID: 0}
1347+
- target: {fileID: 4835438972542875672, guid: 0a3b6392f04558844bd340e68ced1ff9,
1348+
type: 3}
1349+
propertyPath: m_SizeDelta.y
1350+
value: 0
1351+
objectReference: {fileID: 0}
13221352
- target: {fileID: 4835438972542875700, guid: 0a3b6392f04558844bd340e68ced1ff9,
13231353
type: 3}
13241354
propertyPath: m_AnchorMin.y
@@ -1354,6 +1384,11 @@ PrefabInstance:
13541384
propertyPath: m_IsActive
13551385
value: 1
13561386
objectReference: {fileID: 0}
1387+
- target: {fileID: 4835438972542875827, guid: 0a3b6392f04558844bd340e68ced1ff9,
1388+
type: 3}
1389+
propertyPath: m_IsActive
1390+
value: 1
1391+
objectReference: {fileID: 0}
13571392
- target: {fileID: 4924957845013482385, guid: 0a3b6392f04558844bd340e68ced1ff9,
13581393
type: 3}
13591394
propertyPath: m_AnchorMin.y
@@ -1589,6 +1624,41 @@ PrefabInstance:
15891624
propertyPath: m_Text
15901625
value:
15911626
objectReference: {fileID: 0}
1627+
- target: {fileID: 7877310278013525258, guid: 0a3b6392f04558844bd340e68ced1ff9,
1628+
type: 3}
1629+
propertyPath: m_AnchorMin.y
1630+
value: 0
1631+
objectReference: {fileID: 0}
1632+
- target: {fileID: 7877310278013525258, guid: 0a3b6392f04558844bd340e68ced1ff9,
1633+
type: 3}
1634+
propertyPath: m_AnchorMax.y
1635+
value: 0
1636+
objectReference: {fileID: 0}
1637+
- target: {fileID: 7877310278013525258, guid: 0a3b6392f04558844bd340e68ced1ff9,
1638+
type: 3}
1639+
propertyPath: m_AnchoredPosition.x
1640+
value: 0
1641+
objectReference: {fileID: 0}
1642+
- target: {fileID: 7877310278013525258, guid: 0a3b6392f04558844bd340e68ced1ff9,
1643+
type: 3}
1644+
propertyPath: m_AnchoredPosition.y
1645+
value: 0
1646+
objectReference: {fileID: 0}
1647+
- target: {fileID: 7877310278013525258, guid: 0a3b6392f04558844bd340e68ced1ff9,
1648+
type: 3}
1649+
propertyPath: m_SizeDelta.x
1650+
value: 0
1651+
objectReference: {fileID: 0}
1652+
- target: {fileID: 7877310278013525258, guid: 0a3b6392f04558844bd340e68ced1ff9,
1653+
type: 3}
1654+
propertyPath: m_SizeDelta.y
1655+
value: 0
1656+
objectReference: {fileID: 0}
1657+
- target: {fileID: 7877310278013525306, guid: 0a3b6392f04558844bd340e68ced1ff9,
1658+
type: 3}
1659+
propertyPath: m_Text
1660+
value:
1661+
objectReference: {fileID: 0}
15921662
- target: {fileID: 7936957113956597190, guid: 0a3b6392f04558844bd340e68ced1ff9,
15931663
type: 3}
15941664
propertyPath: m_AnchorMin.y

‎Assets/UXF/Prefabs/[UXF_Rig].prefab

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -931,7 +931,7 @@ RectTransform:
931931
m_LocalScale: {x: 1, y: 1, z: 1}
932932
m_Children:
933933
- {fileID: 80835919952702251}
934-
m_Father: {fileID: 1577028961808161241}
934+
m_Father: {fileID: 1726072748377084874}
935935
m_RootOrder: 1
936936
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
937937
m_AnchorMin: {x: 1, y: 0.5}
@@ -1037,7 +1037,7 @@ MonoBehaviour:
10371037
m_Script: {fileID: 11500000, guid: 330023be939756b41b52054a3d796152, type: 3}
10381038
m_Name:
10391039
m_EditorClassIdentifier:
1040-
inputField: {fileID: 1615748934895259183}
1040+
inputField: {fileID: 1726072748377084797}
10411041
--- !u!1 &1171537770349854272
10421042
GameObject:
10431043
m_ObjectHideFlags: 0
@@ -1572,10 +1572,10 @@ RectTransform:
15721572
m_LocalPosition: {x: 0, y: 0, z: 0}
15731573
m_LocalScale: {x: 1, y: 1, z: 1}
15741574
m_Children:
1575-
- {fileID: 3110759810348992417}
1576-
- {fileID: 4612929069887686480}
1577-
- {fileID: 1507222259595111547}
1578-
- {fileID: 7948667913022628418}
1575+
- {fileID: 2897568975779925142}
1576+
- {fileID: 4835438972542875672}
1577+
- {fileID: 1726072748377084723}
1578+
- {fileID: 7877310278013525258}
15791579
m_Father: {fileID: 4979987231477995344}
15801580
m_RootOrder: 0
15811581
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2727,13 +2727,13 @@ MonoBehaviour:
27272727
m_CorrespondingSourceObject: {fileID: 0}
27282728
m_PrefabInstance: {fileID: 0}
27292729
m_PrefabAsset: {fileID: 0}
2730-
m_GameObject: {fileID: 2896031059644693069}
2730+
m_GameObject: {fileID: 2897568975779925079}
27312731
m_Enabled: 1
27322732
m_EditorHideFlags: 0
27332733
m_Script: {fileID: 11500000, guid: 348b50adaf435754aa3adb61b9d1155d, type: 3}
27342734
m_Name:
27352735
m_EditorClassIdentifier:
2736-
dropdown: {fileID: 6789253931344208075}
2736+
dropdown: {fileID: 2897568975779925192}
27372737
--- !u!1 &2901584607484809767
27382738
GameObject:
27392739
m_ObjectHideFlags: 0
@@ -5282,13 +5282,13 @@ MonoBehaviour:
52825282
m_CorrespondingSourceObject: {fileID: 0}
52835283
m_PrefabInstance: {fileID: 0}
52845284
m_PrefabAsset: {fileID: 0}
5285-
m_GameObject: {fileID: 4834968701760316578}
5285+
m_GameObject: {fileID: 4835438972542875827}
52865286
m_Enabled: 1
52875287
m_EditorHideFlags: 0
52885288
m_Script: {fileID: 11500000, guid: 5747e520a80c72849886c32bbce2b181, type: 3}
52895289
m_Name:
52905290
m_EditorClassIdentifier:
5291-
inputField: {fileID: 1941970266495124426}
5291+
inputField: {fileID: 4835438972542875715}
52925292
--- !u!1 &4921505235379613987
52935293
GameObject:
52945294
m_ObjectHideFlags: 0
@@ -6321,7 +6321,7 @@ RectTransform:
63216321
m_LocalScale: {x: 1, y: 1, z: 1}
63226322
m_Children:
63236323
- {fileID: 6783585386340811927}
6324-
m_Father: {fileID: 4687239340321207026}
6324+
m_Father: {fileID: 4835438972542875873}
63256325
m_RootOrder: 1
63266326
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
63276327
m_AnchorMin: {x: 1, y: 0.5}
@@ -8371,7 +8371,7 @@ RectTransform:
83718371
m_LocalPosition: {x: 0, y: 0, z: 0}
83728372
m_LocalScale: {x: 1, y: 1, z: 1}
83738373
m_Children:
8374-
- {fileID: 6495799047135181285}
8374+
- {fileID: 7936957113956597242}
83758375
m_Father: {fileID: 6431357393539466631}
83768376
m_RootOrder: 0
83778377
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -8448,7 +8448,7 @@ RectTransform:
84488448
m_LocalScale: {x: 1, y: 1, z: 1}
84498449
m_Children:
84508450
- {fileID: 793044841086912741}
8451-
m_Father: {fileID: 4280540402044010303}
8451+
m_Father: {fileID: 2897568975779925121}
84528452
m_RootOrder: 1
84538453
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
84548454
m_AnchorMin: {x: 1, y: 0.5}
@@ -9230,10 +9230,10 @@ MonoBehaviour:
92309230
tsAndCsInitialState: 0
92319231
instructionsContentTransform: {fileID: 4267567203292169432}
92329232
sidebarContentTransform: {fileID: 2834388984357925155}
9233-
settingsElement: {fileID: 6789253931344208075}
9234-
localFilePathElement: {fileID: 1941970266495124426}
9235-
ppidElement: {fileID: 5628817354739738849}
9236-
sessionNumElement: {fileID: 3798925361076037336}
9233+
settingsElement: {fileID: 2897568975779925192}
9234+
localFilePathElement: {fileID: 4835438972542875715}
9235+
ppidElement: {fileID: 1726072748377084776}
9236+
sessionNumElement: {fileID: 7877310278013525329}
92379237
tsAndCsToggle: {fileID: 3684702312775877842}
92389238
textPrefab: {fileID: 6478900352697465694, guid: 15c278d5156bae1489e9a38ad279bee2,
92399239
type: 3}
@@ -9425,7 +9425,7 @@ PrefabInstance:
94259425
objectReference: {fileID: 0}
94269426
m_RemovedComponents: []
94279427
m_SourcePrefab: {fileID: 100100000, guid: 15c278d5156bae1489e9a38ad279bee2, type: 3}
9428-
--- !u!114 &1615748934895259183 stripped
9428+
--- !u!114 &1726072748377084797 stripped
94299429
MonoBehaviour:
94309430
m_CorrespondingSourceObject: {fileID: 114970555796053392, guid: 15c278d5156bae1489e9a38ad279bee2,
94319431
type: 3}
@@ -9437,13 +9437,13 @@ MonoBehaviour:
94379437
m_Script: {fileID: 575553740, guid: f70555f144d8491a825f0804e09c671c, type: 3}
94389438
m_Name:
94399439
m_EditorClassIdentifier:
9440-
--- !u!224 &1577028961808161241 stripped
9440+
--- !u!224 &1726072748377084874 stripped
94419441
RectTransform:
94429442
m_CorrespondingSourceObject: {fileID: 150454391267887718, guid: 15c278d5156bae1489e9a38ad279bee2,
94439443
type: 3}
94449444
m_PrefabInstance: {fileID: 1726072748377084863}
94459445
m_PrefabAsset: {fileID: 0}
9446-
--- !u!114 &5628817354739738849 stripped
9446+
--- !u!114 &1726072748377084776 stripped
94479447
MonoBehaviour:
94489448
m_CorrespondingSourceObject: {fileID: 6478900352697465694, guid: 15c278d5156bae1489e9a38ad279bee2,
94499449
type: 3}
@@ -9455,7 +9455,7 @@ MonoBehaviour:
94559455
m_Script: {fileID: 11500000, guid: e62d33c83c20a154a95029aefc30368d, type: 3}
94569456
m_Name:
94579457
m_EditorClassIdentifier:
9458-
--- !u!224 &1507222259595111547 stripped
9458+
--- !u!224 &1726072748377084723 stripped
94599459
RectTransform:
94609460
m_CorrespondingSourceObject: {fileID: 224762906418741188, guid: 15c278d5156bae1489e9a38ad279bee2,
94619461
type: 3}
@@ -9624,31 +9624,31 @@ PrefabInstance:
96249624
objectReference: {fileID: 0}
96259625
m_RemovedComponents: []
96269626
m_SourcePrefab: {fileID: 100100000, guid: 9e81924d28cd0d849a13e5abce816d3a, type: 3}
9627-
--- !u!224 &3110759810348992417 stripped
9627+
--- !u!224 &2897568975779925142 stripped
96289628
RectTransform:
96299629
m_CorrespondingSourceObject: {fileID: 224502893949471668, guid: 9e81924d28cd0d849a13e5abce816d3a,
96309630
type: 3}
96319631
m_PrefabInstance: {fileID: 2897568975779925013}
96329632
m_PrefabAsset: {fileID: 0}
9633-
--- !u!114 &6789253931344208075 stripped
9633+
--- !u!114 &2897568975779925192 stripped
96349634
MonoBehaviour:
96359635
m_CorrespondingSourceObject: {fileID: 8506875127483083998, guid: 9e81924d28cd0d849a13e5abce816d3a,
96369636
type: 3}
96379637
m_PrefabInstance: {fileID: 2897568975779925013}
96389638
m_PrefabAsset: {fileID: 0}
9639-
m_GameObject: {fileID: 2896031059644693069}
9639+
m_GameObject: {fileID: 2897568975779925079}
96409640
m_Enabled: 1
96419641
m_EditorHideFlags: 0
96429642
m_Script: {fileID: 11500000, guid: e62d33c83c20a154a95029aefc30368d, type: 3}
96439643
m_Name:
96449644
m_EditorClassIdentifier:
9645-
--- !u!1 &2896031059644693069 stripped
9645+
--- !u!1 &2897568975779925079 stripped
96469646
GameObject:
96479647
m_CorrespondingSourceObject: {fileID: 1969525990930008, guid: 9e81924d28cd0d849a13e5abce816d3a,
96489648
type: 3}
96499649
m_PrefabInstance: {fileID: 2897568975779925013}
96509650
m_PrefabAsset: {fileID: 0}
9651-
--- !u!224 &4280540402044010303 stripped
9651+
--- !u!224 &2897568975779925121 stripped
96529652
RectTransform:
96539653
m_CorrespondingSourceObject: {fileID: 1392091059206779690, guid: 9e81924d28cd0d849a13e5abce816d3a,
96549654
type: 3}
@@ -9781,31 +9781,31 @@ PrefabInstance:
97819781
objectReference: {fileID: 0}
97829782
m_RemovedComponents: []
97839783
m_SourcePrefab: {fileID: 100100000, guid: 15c278d5156bae1489e9a38ad279bee2, type: 3}
9784-
--- !u!224 &4612929069887686480 stripped
9784+
--- !u!224 &4835438972542875672 stripped
97859785
RectTransform:
97869786
m_CorrespondingSourceObject: {fileID: 224762906418741188, guid: 15c278d5156bae1489e9a38ad279bee2,
97879787
type: 3}
97889788
m_PrefabInstance: {fileID: 4835438972542875796}
97899789
m_PrefabAsset: {fileID: 0}
9790-
--- !u!1 &4834968701760316578 stripped
9790+
--- !u!1 &4835438972542875827 stripped
97919791
GameObject:
97929792
m_CorrespondingSourceObject: {fileID: 1033861776628790, guid: 15c278d5156bae1489e9a38ad279bee2,
97939793
type: 3}
97949794
m_PrefabInstance: {fileID: 4835438972542875796}
97959795
m_PrefabAsset: {fileID: 0}
9796-
--- !u!224 &4687239340321207026 stripped
9796+
--- !u!224 &4835438972542875873 stripped
97979797
RectTransform:
97989798
m_CorrespondingSourceObject: {fileID: 150454391267887718, guid: 15c278d5156bae1489e9a38ad279bee2,
97999799
type: 3}
98009800
m_PrefabInstance: {fileID: 4835438972542875796}
98019801
m_PrefabAsset: {fileID: 0}
9802-
--- !u!114 &1941970266495124426 stripped
9802+
--- !u!114 &4835438972542875715 stripped
98039803
MonoBehaviour:
98049804
m_CorrespondingSourceObject: {fileID: 6478900352697465694, guid: 15c278d5156bae1489e9a38ad279bee2,
98059805
type: 3}
98069806
m_PrefabInstance: {fileID: 4835438972542875796}
98079807
m_PrefabAsset: {fileID: 0}
9808-
m_GameObject: {fileID: 4834968701760316578}
9808+
m_GameObject: {fileID: 4835438972542875827}
98099809
m_Enabled: 1
98109810
m_EditorHideFlags: 0
98119811
m_Script: {fileID: 11500000, guid: e62d33c83c20a154a95029aefc30368d, type: 3}
@@ -9969,7 +9969,7 @@ PrefabInstance:
99699969
objectReference: {fileID: 0}
99709970
m_RemovedComponents: []
99719971
m_SourcePrefab: {fileID: 100100000, guid: 15c278d5156bae1489e9a38ad279bee2, type: 3}
9972-
--- !u!114 &3798925361076037336 stripped
9972+
--- !u!114 &7877310278013525329 stripped
99739973
MonoBehaviour:
99749974
m_CorrespondingSourceObject: {fileID: 6478900352697465694, guid: 15c278d5156bae1489e9a38ad279bee2,
99759975
type: 3}
@@ -9981,7 +9981,7 @@ MonoBehaviour:
99819981
m_Script: {fileID: 11500000, guid: e62d33c83c20a154a95029aefc30368d, type: 3}
99829982
m_Name:
99839983
m_EditorClassIdentifier:
9984-
--- !u!224 &7948667913022628418 stripped
9984+
--- !u!224 &7877310278013525258 stripped
99859985
RectTransform:
99869986
m_CorrespondingSourceObject: {fileID: 224762906418741188, guid: 15c278d5156bae1489e9a38ad279bee2,
99879987
type: 3}
@@ -10106,7 +10106,7 @@ PrefabInstance:
1010610106
objectReference: {fileID: 0}
1010710107
m_RemovedComponents: []
1010810108
m_SourcePrefab: {fileID: 100100000, guid: 7c12eedbd5f4e9742aecfaac8b2f1d72, type: 3}
10109-
--- !u!224 &6495799047135181285 stripped
10109+
--- !u!224 &7936957113956597242 stripped
1011010110
RectTransform:
1011110111
m_CorrespondingSourceObject: {fileID: 3747006573595346056, guid: 7c12eedbd5f4e9742aecfaac8b2f1d72,
1011210112
type: 3}

‎Assets/UXF/Scripts/Etc/Editor/UXFBuildPreprocessor.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ public void OnProcessScene(Scene scene, BuildReport report)
2828
.GetRootGameObjects()
2929
.SelectMany(go => go.GetComponentsInChildren<UXF.UI.UIController>(true));
3030

31+
if (report.summary.platform == BuildTarget.WebGL &&
32+
PlayerSettings.WebGL.template != "PROJECT:UXF WebGL")
33+
{
34+
Debug.LogWarning("The UXF WebGL template is not selected in WebGL player settings! This may lead to errors. You can fix the is with the UXF Wizard (press UXF at the top, Show UXF Wizard).");
35+
}
36+
3137
foreach (var ui in uis)
3238
{
3339
var localHandlers = ui.ActiveLocalFileDataHandlers;

0 commit comments

Comments
 (0)