Skip to content

Commit 2a8774e

Browse files
jackbrookesjackbrookes
committed
template fix
1 parent 378df98 commit 2a8774e

File tree

6 files changed

+81
-45
lines changed

6 files changed

+81
-45
lines changed

‎Assets/Editor/ExportUFXPackage.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ static void ExportPackage()
1313
string[] assets = new string[]
1414
{
1515
"Assets/StreamingAssets",
16-
"Assets/UXF"
16+
"Assets/UXF",
17+
"Assets/WebGLTemplates"
1718
};
1819

1920
DateTime dt = DateTime.Now;

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

Lines changed: 43 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1562,7 +1562,7 @@ PrefabInstance:
15621562
- target: {fileID: 1727009847109406601, guid: 0a3b6392f04558844bd340e68ced1ff9,
15631563
type: 3}
15641564
propertyPath: m_IsActive
1565-
value: 0
1565+
value: 1
15661566
objectReference: {fileID: 0}
15671567
- target: {fileID: 1732293800056408338, guid: 0a3b6392f04558844bd340e68ced1ff9,
15681568
type: 3}
@@ -2273,32 +2273,32 @@ PrefabInstance:
22732273
- target: {fileID: 4612929069887686480, guid: 0a3b6392f04558844bd340e68ced1ff9,
22742274
type: 3}
22752275
propertyPath: m_AnchorMin.y
2276-
value: 1
2276+
value: 0
22772277
objectReference: {fileID: 0}
22782278
- target: {fileID: 4612929069887686480, guid: 0a3b6392f04558844bd340e68ced1ff9,
22792279
type: 3}
22802280
propertyPath: m_AnchorMax.y
2281-
value: 1
2281+
value: 0
22822282
objectReference: {fileID: 0}
22832283
- target: {fileID: 4612929069887686480, guid: 0a3b6392f04558844bd340e68ced1ff9,
22842284
type: 3}
22852285
propertyPath: m_AnchoredPosition.x
2286-
value: 128
2286+
value: 0
22872287
objectReference: {fileID: 0}
22882288
- target: {fileID: 4612929069887686480, guid: 0a3b6392f04558844bd340e68ced1ff9,
22892289
type: 3}
22902290
propertyPath: m_AnchoredPosition.y
2291-
value: -90
2291+
value: 0
22922292
objectReference: {fileID: 0}
22932293
- target: {fileID: 4612929069887686480, guid: 0a3b6392f04558844bd340e68ced1ff9,
22942294
type: 3}
22952295
propertyPath: m_SizeDelta.x
2296-
value: 236
2296+
value: 0
22972297
objectReference: {fileID: 0}
22982298
- target: {fileID: 4612929069887686480, guid: 0a3b6392f04558844bd340e68ced1ff9,
22992299
type: 3}
23002300
propertyPath: m_SizeDelta.y
2301-
value: 60
2301+
value: 0
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: 0
2356+
value: 1
23572357
objectReference: {fileID: 0}
23582358
- target: {fileID: 4835438972542875650, guid: 0a3b6392f04558844bd340e68ced1ff9,
23592359
type: 3}
@@ -3080,6 +3080,11 @@ PrefabInstance:
30803080
propertyPath: m_SizeDelta.y
30813081
value: 0
30823082
objectReference: {fileID: 0}
3083+
- target: {fileID: 7839017981507438752, guid: 0a3b6392f04558844bd340e68ced1ff9,
3084+
type: 3}
3085+
propertyPath: m_Text
3086+
value:
3087+
objectReference: {fileID: 0}
30833088
- target: {fileID: 7845351710777796617, guid: 0a3b6392f04558844bd340e68ced1ff9,
30843089
type: 3}
30853090
propertyPath: m_AnchorMin.y
@@ -3160,6 +3165,36 @@ PrefabInstance:
31603165
propertyPath: m_SizeDelta.y
31613166
value: -30
31623167
objectReference: {fileID: 0}
3168+
- target: {fileID: 7948667913022628418, guid: 0a3b6392f04558844bd340e68ced1ff9,
3169+
type: 3}
3170+
propertyPath: m_AnchorMin.y
3171+
value: 0
3172+
objectReference: {fileID: 0}
3173+
- target: {fileID: 7948667913022628418, guid: 0a3b6392f04558844bd340e68ced1ff9,
3174+
type: 3}
3175+
propertyPath: m_AnchorMax.y
3176+
value: 0
3177+
objectReference: {fileID: 0}
3178+
- target: {fileID: 7948667913022628418, guid: 0a3b6392f04558844bd340e68ced1ff9,
3179+
type: 3}
3180+
propertyPath: m_AnchoredPosition.x
3181+
value: 0
3182+
objectReference: {fileID: 0}
3183+
- target: {fileID: 7948667913022628418, guid: 0a3b6392f04558844bd340e68ced1ff9,
3184+
type: 3}
3185+
propertyPath: m_AnchoredPosition.y
3186+
value: 0
3187+
objectReference: {fileID: 0}
3188+
- target: {fileID: 7948667913022628418, guid: 0a3b6392f04558844bd340e68ced1ff9,
3189+
type: 3}
3190+
propertyPath: m_SizeDelta.x
3191+
value: 0
3192+
objectReference: {fileID: 0}
3193+
- target: {fileID: 7948667913022628418, guid: 0a3b6392f04558844bd340e68ced1ff9,
3194+
type: 3}
3195+
propertyPath: m_SizeDelta.y
3196+
value: 0
3197+
objectReference: {fileID: 0}
31633198
- target: {fileID: 8239929524254948407, guid: 0a3b6392f04558844bd340e68ced1ff9,
31643199
type: 3}
31653200
propertyPath: m_AnchorMin.y

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

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -929,7 +929,7 @@ RectTransform:
929929
m_LocalScale: {x: 1, y: 1, z: 1}
930930
m_Children:
931931
- {fileID: 80835919952702251}
932-
m_Father: {fileID: 1726072748377084726}
932+
m_Father: {fileID: 1577028961808161241}
933933
m_RootOrder: 1
934934
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
935935
m_AnchorMin: {x: 1, y: 0.5}
@@ -1035,7 +1035,7 @@ MonoBehaviour:
10351035
m_Script: {fileID: 11500000, guid: 330023be939756b41b52054a3d796152, type: 3}
10361036
m_Name:
10371037
m_EditorClassIdentifier:
1038-
inputField: {fileID: 1726072748377084777}
1038+
inputField: {fileID: 1615748934895259183}
10391039
--- !u!1 &1171537770349854272
10401040
GameObject:
10411041
m_ObjectHideFlags: 0
@@ -1570,10 +1570,10 @@ RectTransform:
15701570
m_LocalPosition: {x: 0, y: 0, z: 0}
15711571
m_LocalScale: {x: 1, y: 1, z: 1}
15721572
m_Children:
1573-
- {fileID: 2897568975779925122}
1574-
- {fileID: 4835438972542875700}
1575-
- {fileID: 1726072748377084703}
1576-
- {fileID: 7877310278013525286}
1573+
- {fileID: 3110759810348992417}
1574+
- {fileID: 4612929069887686480}
1575+
- {fileID: 1507222259595111547}
1576+
- {fileID: 7948667913022628418}
15771577
m_Father: {fileID: 4979987231477995344}
15781578
m_RootOrder: 0
15791579
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2577,13 +2577,13 @@ MonoBehaviour:
25772577
m_CorrespondingSourceObject: {fileID: 0}
25782578
m_PrefabInstance: {fileID: 0}
25792579
m_PrefabAsset: {fileID: 0}
2580-
m_GameObject: {fileID: 2897568975779925059}
2580+
m_GameObject: {fileID: 2896031059644693069}
25812581
m_Enabled: 1
25822582
m_EditorHideFlags: 0
25832583
m_Script: {fileID: 11500000, guid: 348b50adaf435754aa3adb61b9d1155d, type: 3}
25842584
m_Name:
25852585
m_EditorClassIdentifier:
2586-
dropdown: {fileID: 2897568975779925220}
2586+
dropdown: {fileID: 6789253931344208075}
25872587
--- !u!1 &2901584607484809767
25882588
GameObject:
25892589
m_ObjectHideFlags: 0
@@ -5130,13 +5130,13 @@ MonoBehaviour:
51305130
m_CorrespondingSourceObject: {fileID: 0}
51315131
m_PrefabInstance: {fileID: 0}
51325132
m_PrefabAsset: {fileID: 0}
5133-
m_GameObject: {fileID: 4835438972542875823}
5133+
m_GameObject: {fileID: 4834968701760316578}
51345134
m_Enabled: 1
51355135
m_EditorHideFlags: 0
51365136
m_Script: {fileID: 11500000, guid: 5747e520a80c72849886c32bbce2b181, type: 3}
51375137
m_Name:
51385138
m_EditorClassIdentifier:
5139-
inputField: {fileID: 4835438972542875775}
5139+
inputField: {fileID: 1941970266495124426}
51405140
--- !u!1 &4921505235379613987
51415141
GameObject:
51425142
m_ObjectHideFlags: 0
@@ -6169,7 +6169,7 @@ RectTransform:
61696169
m_LocalScale: {x: 1, y: 1, z: 1}
61706170
m_Children:
61716171
- {fileID: 6783585386340811927}
6172-
m_Father: {fileID: 4835438972542875677}
6172+
m_Father: {fileID: 4687239340321207026}
61736173
m_RootOrder: 1
61746174
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
61756175
m_AnchorMin: {x: 1, y: 0.5}
@@ -8296,7 +8296,7 @@ RectTransform:
82968296
m_LocalPosition: {x: 0, y: 0, z: 0}
82978297
m_LocalScale: {x: 1, y: 1, z: 1}
82988298
m_Children:
8299-
- {fileID: 7936957113956597190}
8299+
- {fileID: 6495799047135181285}
83008300
m_Father: {fileID: 6431357393539466631}
83018301
m_RootOrder: 0
83028302
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -8373,7 +8373,7 @@ RectTransform:
83738373
m_LocalScale: {x: 1, y: 1, z: 1}
83748374
m_Children:
83758375
- {fileID: 793044841086912741}
8376-
m_Father: {fileID: 2897568975779925181}
8376+
m_Father: {fileID: 4280540402044010303}
83778377
m_RootOrder: 1
83788378
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
83798379
m_AnchorMin: {x: 1, y: 0.5}
@@ -9155,10 +9155,10 @@ MonoBehaviour:
91559155
tsAndCsInitialState: 0
91569156
instructionsContentTransform: {fileID: 4267567203292169432}
91579157
sidebarContentTransform: {fileID: 2834388984357925155}
9158-
settingsElement: {fileID: 2897568975779925220}
9159-
localFilePathElement: {fileID: 4835438972542875775}
9160-
ppidElement: {fileID: 1726072748377084756}
9161-
sessionNumElement: {fileID: 7877310278013525357}
9158+
settingsElement: {fileID: 6789253931344208075}
9159+
localFilePathElement: {fileID: 1941970266495124426}
9160+
ppidElement: {fileID: 5628817354739738849}
9161+
sessionNumElement: {fileID: 3798925361076037336}
91629162
tsAndCsToggle: {fileID: 3684702312775877842}
91639163
textPrefab: {fileID: 6478900352697465694, guid: 15c278d5156bae1489e9a38ad279bee2,
91649164
type: 3}
@@ -9350,7 +9350,7 @@ PrefabInstance:
93509350
objectReference: {fileID: 0}
93519351
m_RemovedComponents: []
93529352
m_SourcePrefab: {fileID: 100100000, guid: 15c278d5156bae1489e9a38ad279bee2, type: 3}
9353-
--- !u!114 &1726072748377084777 stripped
9353+
--- !u!114 &1615748934895259183 stripped
93549354
MonoBehaviour:
93559355
m_CorrespondingSourceObject: {fileID: 114970555796053392, guid: 15c278d5156bae1489e9a38ad279bee2,
93569356
type: 3}
@@ -9362,19 +9362,19 @@ MonoBehaviour:
93629362
m_Script: {fileID: 575553740, guid: f70555f144d8491a825f0804e09c671c, type: 3}
93639363
m_Name:
93649364
m_EditorClassIdentifier:
9365-
--- !u!224 &1726072748377084726 stripped
9365+
--- !u!224 &1577028961808161241 stripped
93669366
RectTransform:
93679367
m_CorrespondingSourceObject: {fileID: 150454391267887718, guid: 15c278d5156bae1489e9a38ad279bee2,
93689368
type: 3}
93699369
m_PrefabInstance: {fileID: 1726072748377084863}
93709370
m_PrefabAsset: {fileID: 0}
9371-
--- !u!224 &1726072748377084703 stripped
9371+
--- !u!224 &1507222259595111547 stripped
93729372
RectTransform:
93739373
m_CorrespondingSourceObject: {fileID: 224762906418741188, guid: 15c278d5156bae1489e9a38ad279bee2,
93749374
type: 3}
93759375
m_PrefabInstance: {fileID: 1726072748377084863}
93769376
m_PrefabAsset: {fileID: 0}
9377-
--- !u!114 &1726072748377084756 stripped
9377+
--- !u!114 &5628817354739738849 stripped
93789378
MonoBehaviour:
93799379
m_CorrespondingSourceObject: {fileID: 6478900352697465694, guid: 15c278d5156bae1489e9a38ad279bee2,
93809380
type: 3}
@@ -9549,31 +9549,31 @@ PrefabInstance:
95499549
objectReference: {fileID: 0}
95509550
m_RemovedComponents: []
95519551
m_SourcePrefab: {fileID: 100100000, guid: 9e81924d28cd0d849a13e5abce816d3a, type: 3}
9552-
--- !u!224 &2897568975779925122 stripped
9552+
--- !u!224 &3110759810348992417 stripped
95539553
RectTransform:
95549554
m_CorrespondingSourceObject: {fileID: 224502893949471668, guid: 9e81924d28cd0d849a13e5abce816d3a,
95559555
type: 3}
95569556
m_PrefabInstance: {fileID: 2897568975779925013}
95579557
m_PrefabAsset: {fileID: 0}
9558-
--- !u!1 &2897568975779925059 stripped
9558+
--- !u!1 &2896031059644693069 stripped
95599559
GameObject:
95609560
m_CorrespondingSourceObject: {fileID: 1969525990930008, guid: 9e81924d28cd0d849a13e5abce816d3a,
95619561
type: 3}
95629562
m_PrefabInstance: {fileID: 2897568975779925013}
95639563
m_PrefabAsset: {fileID: 0}
9564-
--- !u!114 &2897568975779925220 stripped
9564+
--- !u!114 &6789253931344208075 stripped
95659565
MonoBehaviour:
95669566
m_CorrespondingSourceObject: {fileID: 8506875127483083998, guid: 9e81924d28cd0d849a13e5abce816d3a,
95679567
type: 3}
95689568
m_PrefabInstance: {fileID: 2897568975779925013}
95699569
m_PrefabAsset: {fileID: 0}
9570-
m_GameObject: {fileID: 2897568975779925059}
9570+
m_GameObject: {fileID: 2896031059644693069}
95719571
m_Enabled: 1
95729572
m_EditorHideFlags: 0
95739573
m_Script: {fileID: 11500000, guid: e62d33c83c20a154a95029aefc30368d, type: 3}
95749574
m_Name:
95759575
m_EditorClassIdentifier:
9576-
--- !u!224 &2897568975779925181 stripped
9576+
--- !u!224 &4280540402044010303 stripped
95779577
RectTransform:
95789578
m_CorrespondingSourceObject: {fileID: 1392091059206779690, guid: 9e81924d28cd0d849a13e5abce816d3a,
95799579
type: 3}
@@ -9706,31 +9706,31 @@ PrefabInstance:
97069706
objectReference: {fileID: 0}
97079707
m_RemovedComponents: []
97089708
m_SourcePrefab: {fileID: 100100000, guid: 15c278d5156bae1489e9a38ad279bee2, type: 3}
9709-
--- !u!114 &4835438972542875775 stripped
9709+
--- !u!114 &1941970266495124426 stripped
97109710
MonoBehaviour:
97119711
m_CorrespondingSourceObject: {fileID: 6478900352697465694, guid: 15c278d5156bae1489e9a38ad279bee2,
97129712
type: 3}
97139713
m_PrefabInstance: {fileID: 4835438972542875796}
97149714
m_PrefabAsset: {fileID: 0}
9715-
m_GameObject: {fileID: 4835438972542875823}
9715+
m_GameObject: {fileID: 4834968701760316578}
97169716
m_Enabled: 1
97179717
m_EditorHideFlags: 0
97189718
m_Script: {fileID: 11500000, guid: e62d33c83c20a154a95029aefc30368d, type: 3}
97199719
m_Name:
97209720
m_EditorClassIdentifier:
9721-
--- !u!1 &4835438972542875823 stripped
9721+
--- !u!1 &4834968701760316578 stripped
97229722
GameObject:
97239723
m_CorrespondingSourceObject: {fileID: 1033861776628790, guid: 15c278d5156bae1489e9a38ad279bee2,
97249724
type: 3}
97259725
m_PrefabInstance: {fileID: 4835438972542875796}
97269726
m_PrefabAsset: {fileID: 0}
9727-
--- !u!224 &4835438972542875700 stripped
9727+
--- !u!224 &4612929069887686480 stripped
97289728
RectTransform:
97299729
m_CorrespondingSourceObject: {fileID: 224762906418741188, guid: 15c278d5156bae1489e9a38ad279bee2,
97309730
type: 3}
97319731
m_PrefabInstance: {fileID: 4835438972542875796}
97329732
m_PrefabAsset: {fileID: 0}
9733-
--- !u!224 &4835438972542875677 stripped
9733+
--- !u!224 &4687239340321207026 stripped
97349734
RectTransform:
97359735
m_CorrespondingSourceObject: {fileID: 150454391267887718, guid: 15c278d5156bae1489e9a38ad279bee2,
97369736
type: 3}
@@ -9894,7 +9894,7 @@ PrefabInstance:
98949894
objectReference: {fileID: 0}
98959895
m_RemovedComponents: []
98969896
m_SourcePrefab: {fileID: 100100000, guid: 15c278d5156bae1489e9a38ad279bee2, type: 3}
9897-
--- !u!114 &7877310278013525357 stripped
9897+
--- !u!114 &3798925361076037336 stripped
98989898
MonoBehaviour:
98999899
m_CorrespondingSourceObject: {fileID: 6478900352697465694, guid: 15c278d5156bae1489e9a38ad279bee2,
99009900
type: 3}
@@ -9906,7 +9906,7 @@ MonoBehaviour:
99069906
m_Script: {fileID: 11500000, guid: e62d33c83c20a154a95029aefc30368d, type: 3}
99079907
m_Name:
99089908
m_EditorClassIdentifier:
9909-
--- !u!224 &7877310278013525286 stripped
9909+
--- !u!224 &7948667913022628418 stripped
99109910
RectTransform:
99119911
m_CorrespondingSourceObject: {fileID: 224762906418741188, guid: 15c278d5156bae1489e9a38ad279bee2,
99129912
type: 3}
@@ -10031,7 +10031,7 @@ PrefabInstance:
1003110031
objectReference: {fileID: 0}
1003210032
m_RemovedComponents: []
1003310033
m_SourcePrefab: {fileID: 100100000, guid: 7c12eedbd5f4e9742aecfaac8b2f1d72, type: 3}
10034-
--- !u!224 &7936957113956597190 stripped
10034+
--- !u!224 &6495799047135181285 stripped
1003510035
RectTransform:
1003610036
m_CorrespondingSourceObject: {fileID: 3747006573595346056, guid: 7c12eedbd5f4e9742aecfaac8b2f1d72,
1003710037
type: 3}

‎Assets/UXF/Scripts/DataHandling/WebAWSDynamoDB.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ public void GetUXFDataFromDB(string experimentName, UXFDataType dataType, string
284284

285285

286286
/// <summary>
287-
/// Get an item in the database that has not been stored by UXF. The method happens asynchronously and so calls <paramref name="callbackFunction"/> when it has finished.
287+
/// Get an item in the database that has not been stored by UXF. The method happens asynchronously and so calls <paramref name="callback"/> when it has finished.
288288
/// This method will automatically construct the request for you.
289289
/// </summary>
290290
/// <param name="tableName">Name of the database table.</param>

‎Assets/WebGLTemplates/UXF WebGL/thumbnail.png‎

5.68 KB
Loading

‎docs/wiki‎

Submodule wiki updated from c2e0165 to 19c5442

0 commit comments

Comments
 (0)