Skip to content

Commit c109a3a

Browse files
jackbrookesjackbrookes
committed
fixes
1 parent 1bdf007 commit c109a3a

File tree

8 files changed

+1000
-683
lines changed

8 files changed

+1000
-683
lines changed

‎Assets/UXF/Examples/1a_SpaceShuttle/SpaceShuttleExample.unity

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2273,32 +2273,32 @@ PrefabInstance:
22732273
- target: {fileID: 4612929069887686480, guid: 0a3b6392f04558844bd340e68ced1ff9,
22742274
type: 3}
22752275
propertyPath: m_AnchorMin.y
2276-
value: 0
2276+
value: 1
22772277
objectReference: {fileID: 0}
22782278
- target: {fileID: 4612929069887686480, guid: 0a3b6392f04558844bd340e68ced1ff9,
22792279
type: 3}
22802280
propertyPath: m_AnchorMax.y
2281-
value: 0
2281+
value: 1
22822282
objectReference: {fileID: 0}
22832283
- target: {fileID: 4612929069887686480, guid: 0a3b6392f04558844bd340e68ced1ff9,
22842284
type: 3}
22852285
propertyPath: m_AnchoredPosition.x
2286-
value: 0
2286+
value: 128
22872287
objectReference: {fileID: 0}
22882288
- target: {fileID: 4612929069887686480, guid: 0a3b6392f04558844bd340e68ced1ff9,
22892289
type: 3}
22902290
propertyPath: m_AnchoredPosition.y
2291-
value: 0
2291+
value: -10
22922292
objectReference: {fileID: 0}
22932293
- target: {fileID: 4612929069887686480, guid: 0a3b6392f04558844bd340e68ced1ff9,
22942294
type: 3}
22952295
propertyPath: m_SizeDelta.x
2296-
value: 0
2296+
value: 236
22972297
objectReference: {fileID: 0}
22982298
- target: {fileID: 4612929069887686480, guid: 0a3b6392f04558844bd340e68ced1ff9,
22992299
type: 3}
23002300
propertyPath: m_SizeDelta.y
2301-
value: 0
2301+
value: 60
23022302
objectReference: {fileID: 0}
23032303
- target: {fileID: 4622945449686766140, guid: 0a3b6392f04558844bd340e68ced1ff9,
23042304
type: 3}
@@ -2353,7 +2353,7 @@ PrefabInstance:
23532353
- target: {fileID: 4834968701760316578, guid: 0a3b6392f04558844bd340e68ced1ff9,
23542354
type: 3}
23552355
propertyPath: m_IsActive
2356-
value: 1
2356+
value: 0
23572357
objectReference: {fileID: 0}
23582358
- target: {fileID: 4835438972542875650, guid: 0a3b6392f04558844bd340e68ced1ff9,
23592359
type: 3}

‎Assets/UXF/Examples/2_MoveToTarget/MoveToTargetExample.unity

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1421,6 +1421,36 @@ PrefabInstance:
14211421
propertyPath: m_SizeDelta.y
14221422
value: 0
14231423
objectReference: {fileID: 0}
1424+
- target: {fileID: 1726072748377084703, guid: 0a3b6392f04558844bd340e68ced1ff9,
1425+
type: 3}
1426+
propertyPath: m_AnchorMin.y
1427+
value: 0
1428+
objectReference: {fileID: 0}
1429+
- target: {fileID: 1726072748377084703, guid: 0a3b6392f04558844bd340e68ced1ff9,
1430+
type: 3}
1431+
propertyPath: m_AnchorMax.y
1432+
value: 0
1433+
objectReference: {fileID: 0}
1434+
- target: {fileID: 1726072748377084703, guid: 0a3b6392f04558844bd340e68ced1ff9,
1435+
type: 3}
1436+
propertyPath: m_AnchoredPosition.x
1437+
value: 0
1438+
objectReference: {fileID: 0}
1439+
- target: {fileID: 1726072748377084703, guid: 0a3b6392f04558844bd340e68ced1ff9,
1440+
type: 3}
1441+
propertyPath: m_AnchoredPosition.y
1442+
value: 0
1443+
objectReference: {fileID: 0}
1444+
- target: {fileID: 1726072748377084703, guid: 0a3b6392f04558844bd340e68ced1ff9,
1445+
type: 3}
1446+
propertyPath: m_SizeDelta.x
1447+
value: 0
1448+
objectReference: {fileID: 0}
1449+
- target: {fileID: 1726072748377084703, guid: 0a3b6392f04558844bd340e68ced1ff9,
1450+
type: 3}
1451+
propertyPath: m_SizeDelta.y
1452+
value: 0
1453+
objectReference: {fileID: 0}
14241454
- target: {fileID: 2311804077452366147, guid: 0a3b6392f04558844bd340e68ced1ff9,
14251455
type: 3}
14261456
propertyPath: m_AnchorMin.y
@@ -1461,6 +1491,36 @@ PrefabInstance:
14611491
propertyPath: m_AnchoredPosition.y
14621492
value: 0
14631493
objectReference: {fileID: 0}
1494+
- target: {fileID: 2897568975779925122, guid: 0a3b6392f04558844bd340e68ced1ff9,
1495+
type: 3}
1496+
propertyPath: m_AnchorMin.y
1497+
value: 0
1498+
objectReference: {fileID: 0}
1499+
- target: {fileID: 2897568975779925122, guid: 0a3b6392f04558844bd340e68ced1ff9,
1500+
type: 3}
1501+
propertyPath: m_AnchorMax.y
1502+
value: 0
1503+
objectReference: {fileID: 0}
1504+
- target: {fileID: 2897568975779925122, guid: 0a3b6392f04558844bd340e68ced1ff9,
1505+
type: 3}
1506+
propertyPath: m_AnchoredPosition.x
1507+
value: 0
1508+
objectReference: {fileID: 0}
1509+
- target: {fileID: 2897568975779925122, guid: 0a3b6392f04558844bd340e68ced1ff9,
1510+
type: 3}
1511+
propertyPath: m_AnchoredPosition.y
1512+
value: 0
1513+
objectReference: {fileID: 0}
1514+
- target: {fileID: 2897568975779925122, guid: 0a3b6392f04558844bd340e68ced1ff9,
1515+
type: 3}
1516+
propertyPath: m_SizeDelta.x
1517+
value: 0
1518+
objectReference: {fileID: 0}
1519+
- target: {fileID: 2897568975779925122, guid: 0a3b6392f04558844bd340e68ced1ff9,
1520+
type: 3}
1521+
propertyPath: m_SizeDelta.y
1522+
value: 0
1523+
objectReference: {fileID: 0}
14641524
- target: {fileID: 3110759810348992417, guid: 0a3b6392f04558844bd340e68ced1ff9,
14651525
type: 3}
14661526
propertyPath: m_AnchorMin.y
@@ -1541,6 +1601,41 @@ PrefabInstance:
15411601
propertyPath: m_IsActive
15421602
value: 1
15431603
objectReference: {fileID: 0}
1604+
- target: {fileID: 4835438972542875700, guid: 0a3b6392f04558844bd340e68ced1ff9,
1605+
type: 3}
1606+
propertyPath: m_AnchorMin.y
1607+
value: 0
1608+
objectReference: {fileID: 0}
1609+
- target: {fileID: 4835438972542875700, guid: 0a3b6392f04558844bd340e68ced1ff9,
1610+
type: 3}
1611+
propertyPath: m_AnchorMax.y
1612+
value: 0
1613+
objectReference: {fileID: 0}
1614+
- target: {fileID: 4835438972542875700, guid: 0a3b6392f04558844bd340e68ced1ff9,
1615+
type: 3}
1616+
propertyPath: m_AnchoredPosition.x
1617+
value: 0
1618+
objectReference: {fileID: 0}
1619+
- target: {fileID: 4835438972542875700, guid: 0a3b6392f04558844bd340e68ced1ff9,
1620+
type: 3}
1621+
propertyPath: m_AnchoredPosition.y
1622+
value: 0
1623+
objectReference: {fileID: 0}
1624+
- target: {fileID: 4835438972542875700, guid: 0a3b6392f04558844bd340e68ced1ff9,
1625+
type: 3}
1626+
propertyPath: m_SizeDelta.x
1627+
value: 0
1628+
objectReference: {fileID: 0}
1629+
- target: {fileID: 4835438972542875700, guid: 0a3b6392f04558844bd340e68ced1ff9,
1630+
type: 3}
1631+
propertyPath: m_SizeDelta.y
1632+
value: 0
1633+
objectReference: {fileID: 0}
1634+
- target: {fileID: 4835438972542875823, guid: 0a3b6392f04558844bd340e68ced1ff9,
1635+
type: 3}
1636+
propertyPath: m_IsActive
1637+
value: 1
1638+
objectReference: {fileID: 0}
15441639
- target: {fileID: 4979987231477995344, guid: 0a3b6392f04558844bd340e68ced1ff9,
15451640
type: 3}
15461641
propertyPath: m_AnchorMax.x
@@ -1616,6 +1711,41 @@ PrefabInstance:
16161711
propertyPath: m_SizeDelta.y
16171712
value: 0
16181713
objectReference: {fileID: 0}
1714+
- target: {fileID: 7877310278013525286, guid: 0a3b6392f04558844bd340e68ced1ff9,
1715+
type: 3}
1716+
propertyPath: m_AnchorMin.y
1717+
value: 0
1718+
objectReference: {fileID: 0}
1719+
- target: {fileID: 7877310278013525286, guid: 0a3b6392f04558844bd340e68ced1ff9,
1720+
type: 3}
1721+
propertyPath: m_AnchorMax.y
1722+
value: 0
1723+
objectReference: {fileID: 0}
1724+
- target: {fileID: 7877310278013525286, guid: 0a3b6392f04558844bd340e68ced1ff9,
1725+
type: 3}
1726+
propertyPath: m_AnchoredPosition.x
1727+
value: 0
1728+
objectReference: {fileID: 0}
1729+
- target: {fileID: 7877310278013525286, guid: 0a3b6392f04558844bd340e68ced1ff9,
1730+
type: 3}
1731+
propertyPath: m_AnchoredPosition.y
1732+
value: 0
1733+
objectReference: {fileID: 0}
1734+
- target: {fileID: 7877310278013525286, guid: 0a3b6392f04558844bd340e68ced1ff9,
1735+
type: 3}
1736+
propertyPath: m_SizeDelta.x
1737+
value: 0
1738+
objectReference: {fileID: 0}
1739+
- target: {fileID: 7877310278013525286, guid: 0a3b6392f04558844bd340e68ced1ff9,
1740+
type: 3}
1741+
propertyPath: m_SizeDelta.y
1742+
value: 0
1743+
objectReference: {fileID: 0}
1744+
- target: {fileID: 7877310278013525334, guid: 0a3b6392f04558844bd340e68ced1ff9,
1745+
type: 3}
1746+
propertyPath: m_Text
1747+
value:
1748+
objectReference: {fileID: 0}
16191749
- target: {fileID: 8307715182677704244, guid: 0a3b6392f04558844bd340e68ced1ff9,
16201750
type: 3}
16211751
propertyPath: m_AnchorMax.x

‎Assets/UXF/Plugins/AWSJS.jslib

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,19 @@ mergeInto(LibraryManager.library, {
1212
});
1313

1414
callbackGameObjectName = Pointer_stringify(callbackGameObjectName);
15-
16-
window.addEventListener("beforeunload", function(e) {
17-
18-
// These are the messages you're seeing in the gif
15+
window.onbeforeunload = function(e) {
1916
console.log("Calling OnClose from Browser!");
20-
gameInstance.SendMessage(callbackGameObjectName, "HandleBeforeUnloadEvent");
17+
unityInstance.SendMessage(callbackGameObjectName, "HandleBeforeUnloadEvent");
2118

22-
// Cancel the event
23-
e.preventDefault();
19+
// Cancel the event\\
20+
(e || window.event).preventDefault();
2421

2522
// This never shows up correctly for me, but it does prompt
2623
// the player to close their window with a dialogue box
2724
var dialogText = "Are you sure you would like to continue unloading the page?";
28-
e.returnValue = dialogText;
25+
(e || window.event).returnValue = dialogText;
2926
return dialogText;
30-
});
27+
};
3128

3229
},
3330

@@ -192,10 +189,10 @@ mergeInto(LibraryManager.library, {
192189

193190
DDB_Cleanup: function() {
194191

195-
window.addEventListener('beforeunload', function(e) {
192+
window.onbeforeunload = function(e) {
196193
// the absence of a returnValue property on the event will guarantee the browser unload happens
197194
delete e['returnValue'];
198-
});
195+
};
199196

200197
}
201198

0 commit comments

Comments
 (0)