Skip to content

Commit 00e29c3

Browse files
jackbrookesjackbrookes
committed
fixed #44 and added Version in Wizard
1 parent 01ca7c5 commit 00e29c3

File tree

6 files changed

+95
-58
lines changed

6 files changed

+95
-58
lines changed

‎Assets/Editor/ExportUFXPackage.cs

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,35 @@ public class ExportUFXPackage : MonoBehaviour
1010
[MenuItem("UXF/Export package")]
1111
static void ExportPackage()
1212
{
13-
string[] assets = new string[]
13+
string version;
14+
if (File.Exists("VERSION.txt"))
1415
{
15-
"Assets/StreamingAssets",
16-
"Assets/UXF",
17-
"Assets/WebGLTemplates"
18-
};
16+
version = File.ReadAllText("VERSION.txt");
17+
}
18+
else
19+
{
20+
version = "unknown";
21+
}
22+
23+
string outName = string.Format("UXF.v{0}.unitypackage", version);
24+
if (EditorUtility.DisplayDialog("Export Package", string.Format("Export package '{0}'?", outName), "Yes", "Cancel"))
25+
{
26+
string[] assets = new string[]
27+
{
28+
"Assets/StreamingAssets",
29+
"Assets/UXF",
30+
"Assets/WebGLTemplates"
31+
};
32+
33+
if (!Directory.Exists("Package"))
34+
Directory.CreateDirectory("Package");
1935

20-
DateTime dt = DateTime.Now;
21-
string date = dt.ToString("yyyy_MM_dd");
36+
string path = Path.Combine("Package", outName);
2237

23-
if (!Directory.Exists("Package"))
24-
Directory.CreateDirectory("Package");
25-
string path = string.Format("Package/UXF_{0}.unitypackage", date);
38+
ExportPackageOptions options = ExportPackageOptions.Recurse;
2639

27-
ExportPackageOptions options = ExportPackageOptions.Recurse;
40+
AssetDatabase.ExportPackage(assets, path, options);
41+
}
2842

29-
AssetDatabase.ExportPackage(assets, path, options);
3043
}
3144
}

‎Assets/UXF/Examples/4_CorsiBlock/CorsiBlockExample.unity

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2816,7 +2816,7 @@ PrefabInstance:
28162816
- target: {fileID: 1999034067558573094, guid: 0a3b6392f04558844bd340e68ced1ff9,
28172817
type: 3}
28182818
propertyPath: active
2819-
value: 1
2819+
value: 0
28202820
objectReference: {fileID: 0}
28212821
- target: {fileID: 2311804077452366147, guid: 0a3b6392f04558844bd340e68ced1ff9,
28222822
type: 3}
@@ -2856,7 +2856,7 @@ PrefabInstance:
28562856
- target: {fileID: 2834388984357925155, guid: 0a3b6392f04558844bd340e68ced1ff9,
28572857
type: 3}
28582858
propertyPath: m_AnchoredPosition.y
2859-
value: 1755
2859+
value: 1885
28602860
objectReference: {fileID: 0}
28612861
- target: {fileID: 2896031059644693069, guid: 0a3b6392f04558844bd340e68ced1ff9,
28622862
type: 3}
@@ -2946,7 +2946,7 @@ PrefabInstance:
29462946
- target: {fileID: 4267567203292169432, guid: 0a3b6392f04558844bd340e68ced1ff9,
29472947
type: 3}
29482948
propertyPath: m_AnchoredPosition.y
2949-
value: 3240
2949+
value: 3480
29502950
objectReference: {fileID: 0}
29512951
- target: {fileID: 4298776666381973480, guid: 0a3b6392f04558844bd340e68ced1ff9,
29522952
type: 3}
@@ -3086,7 +3086,7 @@ PrefabInstance:
30863086
- target: {fileID: 6301449615104170796, guid: 0a3b6392f04558844bd340e68ced1ff9,
30873087
type: 3}
30883088
propertyPath: active
3089-
value: 0
3089+
value: 1
30903090
objectReference: {fileID: 0}
30913091
- target: {fileID: 6301449615104170796, guid: 0a3b6392f04558844bd340e68ced1ff9,
30923092
type: 3}
@@ -3143,6 +3143,16 @@ PrefabInstance:
31433143
propertyPath: m_SizeDelta.y
31443144
value: 0
31453145
objectReference: {fileID: 0}
3146+
- target: {fileID: 7877310278013525285, guid: 0a3b6392f04558844bd340e68ced1ff9,
3147+
type: 3}
3148+
propertyPath: m_RootOrder
3149+
value: 6
3150+
objectReference: {fileID: 0}
3151+
- target: {fileID: 7877310278013525428, guid: 0a3b6392f04558844bd340e68ced1ff9,
3152+
type: 3}
3153+
propertyPath: m_IsActive
3154+
value: 0
3155+
objectReference: {fileID: 0}
31463156
- target: {fileID: 7877499147840307632, guid: 0a3b6392f04558844bd340e68ced1ff9,
31473157
type: 3}
31483158
propertyPath: m_IsActive

‎Assets/UXF/Plugins/AWSJS.jslib

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,7 @@ mergeInto(LibraryManager.library, {
5454
KeyType: 'RANGE'
5555
}
5656
],
57-
ProvisionedThroughput: {
58-
ReadCapacityUnits: 5,
59-
WriteCapacityUnits: 5
60-
},
57+
BillingMode: "PAY_PER_REQUEST",
6158
TableName: tableName
6259
};
6360
} else {
@@ -70,10 +67,7 @@ mergeInto(LibraryManager.library, {
7067
AttributeName: Pointer_stringify(primaryKeyName),
7168
KeyType: 'HASH'
7269
}],
73-
ProvisionedThroughput: {
74-
ReadCapacityUnits: 5,
75-
WriteCapacityUnits: 5
76-
},
70+
BillingMode: "PAY_PER_REQUEST",
7771
TableName: tableName
7872
};
7973
}

‎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: 1726072748377084723}
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: 1726072748377084773}
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: 2897568975779925135}
1576+
- {fileID: 4835438972542875703}
1577+
- {fileID: 1726072748377084700}
1578+
- {fileID: 7877310278013525285}
15791579
m_Father: {fileID: 4979987231477995344}
15801580
m_RootOrder: 0
15811581
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2579,13 +2579,13 @@ MonoBehaviour:
25792579
m_CorrespondingSourceObject: {fileID: 0}
25802580
m_PrefabInstance: {fileID: 0}
25812581
m_PrefabAsset: {fileID: 0}
2582-
m_GameObject: {fileID: 2896031059644693069}
2582+
m_GameObject: {fileID: 2897568975779925080}
25832583
m_Enabled: 1
25842584
m_EditorHideFlags: 0
25852585
m_Script: {fileID: 11500000, guid: 348b50adaf435754aa3adb61b9d1155d, type: 3}
25862586
m_Name:
25872587
m_EditorClassIdentifier:
2588-
dropdown: {fileID: 6789253931344208075}
2588+
dropdown: {fileID: 2897568975779925216}
25892589
--- !u!1 &2901584607484809767
25902590
GameObject:
25912591
m_ObjectHideFlags: 0
@@ -5134,13 +5134,13 @@ MonoBehaviour:
51345134
m_CorrespondingSourceObject: {fileID: 0}
51355135
m_PrefabInstance: {fileID: 0}
51365136
m_PrefabAsset: {fileID: 0}
5137-
m_GameObject: {fileID: 4834968701760316578}
5137+
m_GameObject: {fileID: 4835438972542875814}
51385138
m_Enabled: 1
51395139
m_EditorHideFlags: 0
51405140
m_Script: {fileID: 11500000, guid: 5747e520a80c72849886c32bbce2b181, type: 3}
51415141
m_Name:
51425142
m_EditorClassIdentifier:
5143-
inputField: {fileID: 1941970266495124426}
5143+
inputField: {fileID: 4835438972542875771}
51445144
--- !u!1 &4921505235379613987
51455145
GameObject:
51465146
m_ObjectHideFlags: 0
@@ -6173,7 +6173,7 @@ RectTransform:
61736173
m_LocalScale: {x: 1, y: 1, z: 1}
61746174
m_Children:
61756175
- {fileID: 6783585386340811927}
6176-
m_Father: {fileID: 4687239340321207026}
6176+
m_Father: {fileID: 4835438972542875672}
61776177
m_RootOrder: 1
61786178
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
61796179
m_AnchorMin: {x: 1, y: 0.5}
@@ -8300,7 +8300,7 @@ RectTransform:
83008300
m_LocalPosition: {x: 0, y: 0, z: 0}
83018301
m_LocalScale: {x: 1, y: 1, z: 1}
83028302
m_Children:
8303-
- {fileID: 6495799047135181285}
8303+
- {fileID: 7936957113956597187}
83048304
m_Father: {fileID: 6431357393539466631}
83058305
m_RootOrder: 0
83068306
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -8377,7 +8377,7 @@ RectTransform:
83778377
m_LocalScale: {x: 1, y: 1, z: 1}
83788378
m_Children:
83798379
- {fileID: 793044841086912741}
8380-
m_Father: {fileID: 4280540402044010303}
8380+
m_Father: {fileID: 2897568975779925182}
83818381
m_RootOrder: 1
83828382
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
83838383
m_AnchorMin: {x: 1, y: 0.5}
@@ -9159,10 +9159,10 @@ MonoBehaviour:
91599159
tsAndCsInitialState: 0
91609160
instructionsContentTransform: {fileID: 4267567203292169432}
91619161
sidebarContentTransform: {fileID: 2834388984357925155}
9162-
settingsElement: {fileID: 6789253931344208075}
9163-
localFilePathElement: {fileID: 1941970266495124426}
9164-
ppidElement: {fileID: 5628817354739738849}
9165-
sessionNumElement: {fileID: 3798925361076037336}
9162+
settingsElement: {fileID: 2897568975779925216}
9163+
localFilePathElement: {fileID: 4835438972542875771}
9164+
ppidElement: {fileID: 1726072748377084752}
9165+
sessionNumElement: {fileID: 7877310278013525353}
91669166
tsAndCsToggle: {fileID: 3684702312775877842}
91679167
textPrefab: {fileID: 6478900352697465694, guid: 15c278d5156bae1489e9a38ad279bee2,
91689168
type: 3}
@@ -9354,7 +9354,7 @@ PrefabInstance:
93549354
objectReference: {fileID: 0}
93559355
m_RemovedComponents: []
93569356
m_SourcePrefab: {fileID: 100100000, guid: 15c278d5156bae1489e9a38ad279bee2, type: 3}
9357-
--- !u!114 &1615748934895259183 stripped
9357+
--- !u!114 &1726072748377084773 stripped
93589358
MonoBehaviour:
93599359
m_CorrespondingSourceObject: {fileID: 114970555796053392, guid: 15c278d5156bae1489e9a38ad279bee2,
93609360
type: 3}
@@ -9366,19 +9366,19 @@ MonoBehaviour:
93669366
m_Script: {fileID: 575553740, guid: f70555f144d8491a825f0804e09c671c, type: 3}
93679367
m_Name:
93689368
m_EditorClassIdentifier:
9369-
--- !u!224 &1577028961808161241 stripped
9369+
--- !u!224 &1726072748377084723 stripped
93709370
RectTransform:
93719371
m_CorrespondingSourceObject: {fileID: 150454391267887718, guid: 15c278d5156bae1489e9a38ad279bee2,
93729372
type: 3}
93739373
m_PrefabInstance: {fileID: 1726072748377084863}
93749374
m_PrefabAsset: {fileID: 0}
9375-
--- !u!224 &1507222259595111547 stripped
9375+
--- !u!224 &1726072748377084700 stripped
93769376
RectTransform:
93779377
m_CorrespondingSourceObject: {fileID: 224762906418741188, guid: 15c278d5156bae1489e9a38ad279bee2,
93789378
type: 3}
93799379
m_PrefabInstance: {fileID: 1726072748377084863}
93809380
m_PrefabAsset: {fileID: 0}
9381-
--- !u!114 &5628817354739738849 stripped
9381+
--- !u!114 &1726072748377084752 stripped
93829382
MonoBehaviour:
93839383
m_CorrespondingSourceObject: {fileID: 6478900352697465694, guid: 15c278d5156bae1489e9a38ad279bee2,
93849384
type: 3}
@@ -9553,31 +9553,31 @@ PrefabInstance:
95539553
objectReference: {fileID: 0}
95549554
m_RemovedComponents: []
95559555
m_SourcePrefab: {fileID: 100100000, guid: 9e81924d28cd0d849a13e5abce816d3a, type: 3}
9556-
--- !u!224 &3110759810348992417 stripped
9556+
--- !u!224 &2897568975779925135 stripped
95579557
RectTransform:
95589558
m_CorrespondingSourceObject: {fileID: 224502893949471668, guid: 9e81924d28cd0d849a13e5abce816d3a,
95599559
type: 3}
95609560
m_PrefabInstance: {fileID: 2897568975779925013}
95619561
m_PrefabAsset: {fileID: 0}
9562-
--- !u!1 &2896031059644693069 stripped
9562+
--- !u!1 &2897568975779925080 stripped
95639563
GameObject:
95649564
m_CorrespondingSourceObject: {fileID: 1969525990930008, guid: 9e81924d28cd0d849a13e5abce816d3a,
95659565
type: 3}
95669566
m_PrefabInstance: {fileID: 2897568975779925013}
95679567
m_PrefabAsset: {fileID: 0}
9568-
--- !u!114 &6789253931344208075 stripped
9568+
--- !u!114 &2897568975779925216 stripped
95699569
MonoBehaviour:
95709570
m_CorrespondingSourceObject: {fileID: 8506875127483083998, guid: 9e81924d28cd0d849a13e5abce816d3a,
95719571
type: 3}
95729572
m_PrefabInstance: {fileID: 2897568975779925013}
95739573
m_PrefabAsset: {fileID: 0}
9574-
m_GameObject: {fileID: 2896031059644693069}
9574+
m_GameObject: {fileID: 2897568975779925080}
95759575
m_Enabled: 1
95769576
m_EditorHideFlags: 0
95779577
m_Script: {fileID: 11500000, guid: e62d33c83c20a154a95029aefc30368d, type: 3}
95789578
m_Name:
95799579
m_EditorClassIdentifier:
9580-
--- !u!224 &4280540402044010303 stripped
9580+
--- !u!224 &2897568975779925182 stripped
95819581
RectTransform:
95829582
m_CorrespondingSourceObject: {fileID: 1392091059206779690, guid: 9e81924d28cd0d849a13e5abce816d3a,
95839583
type: 3}
@@ -9710,31 +9710,31 @@ PrefabInstance:
97109710
objectReference: {fileID: 0}
97119711
m_RemovedComponents: []
97129712
m_SourcePrefab: {fileID: 100100000, guid: 15c278d5156bae1489e9a38ad279bee2, type: 3}
9713-
--- !u!114 &1941970266495124426 stripped
9713+
--- !u!114 &4835438972542875771 stripped
97149714
MonoBehaviour:
97159715
m_CorrespondingSourceObject: {fileID: 6478900352697465694, guid: 15c278d5156bae1489e9a38ad279bee2,
97169716
type: 3}
97179717
m_PrefabInstance: {fileID: 4835438972542875796}
97189718
m_PrefabAsset: {fileID: 0}
9719-
m_GameObject: {fileID: 4834968701760316578}
9719+
m_GameObject: {fileID: 4835438972542875814}
97209720
m_Enabled: 1
97219721
m_EditorHideFlags: 0
97229722
m_Script: {fileID: 11500000, guid: e62d33c83c20a154a95029aefc30368d, type: 3}
97239723
m_Name:
97249724
m_EditorClassIdentifier:
9725-
--- !u!1 &4834968701760316578 stripped
9725+
--- !u!1 &4835438972542875814 stripped
97269726
GameObject:
97279727
m_CorrespondingSourceObject: {fileID: 1033861776628790, guid: 15c278d5156bae1489e9a38ad279bee2,
97289728
type: 3}
97299729
m_PrefabInstance: {fileID: 4835438972542875796}
97309730
m_PrefabAsset: {fileID: 0}
9731-
--- !u!224 &4612929069887686480 stripped
9731+
--- !u!224 &4835438972542875703 stripped
97329732
RectTransform:
97339733
m_CorrespondingSourceObject: {fileID: 224762906418741188, guid: 15c278d5156bae1489e9a38ad279bee2,
97349734
type: 3}
97359735
m_PrefabInstance: {fileID: 4835438972542875796}
97369736
m_PrefabAsset: {fileID: 0}
9737-
--- !u!224 &4687239340321207026 stripped
9737+
--- !u!224 &4835438972542875672 stripped
97389738
RectTransform:
97399739
m_CorrespondingSourceObject: {fileID: 150454391267887718, guid: 15c278d5156bae1489e9a38ad279bee2,
97409740
type: 3}
@@ -9898,7 +9898,7 @@ PrefabInstance:
98989898
objectReference: {fileID: 0}
98999899
m_RemovedComponents: []
99009900
m_SourcePrefab: {fileID: 100100000, guid: 15c278d5156bae1489e9a38ad279bee2, type: 3}
9901-
--- !u!114 &3798925361076037336 stripped
9901+
--- !u!114 &7877310278013525353 stripped
99029902
MonoBehaviour:
99039903
m_CorrespondingSourceObject: {fileID: 6478900352697465694, guid: 15c278d5156bae1489e9a38ad279bee2,
99049904
type: 3}
@@ -9910,7 +9910,7 @@ MonoBehaviour:
99109910
m_Script: {fileID: 11500000, guid: e62d33c83c20a154a95029aefc30368d, type: 3}
99119911
m_Name:
99129912
m_EditorClassIdentifier:
9913-
--- !u!224 &7948667913022628418 stripped
9913+
--- !u!224 &7877310278013525285 stripped
99149914
RectTransform:
99159915
m_CorrespondingSourceObject: {fileID: 224762906418741188, guid: 15c278d5156bae1489e9a38ad279bee2,
99169916
type: 3}
@@ -10035,7 +10035,7 @@ PrefabInstance:
1003510035
objectReference: {fileID: 0}
1003610036
m_RemovedComponents: []
1003710037
m_SourcePrefab: {fileID: 100100000, guid: 7c12eedbd5f4e9742aecfaac8b2f1d72, type: 3}
10038-
--- !u!224 &6495799047135181285 stripped
10038+
--- !u!224 &7936957113956597187 stripped
1003910039
RectTransform:
1004010040
m_CorrespondingSourceObject: {fileID: 3747006573595346056, guid: 7c12eedbd5f4e9742aecfaac8b2f1d72,
1004110041
type: 3}

0 commit comments

Comments
 (0)