Skip to content

Commit 6200f5e

Browse files
jackbrookesjackbrookes
committed
fix #49 #48 
1 parent 9ff2f47 commit 6200f5e

19 files changed

+1036
-1893
lines changed

‎Assets/Editor/ExportUFXPackage.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ public class ExportUFXPackage : MonoBehaviour
1111
static void ExportPackage()
1212
{
1313
string version;
14-
if (File.Exists("VERSION.txt"))
14+
if (File.Exists("Assets/UXF/VERSION.txt"))
1515
{
16-
version = File.ReadAllText("VERSION.txt");
16+
version = File.ReadAllText("Assets/UXF/VERSION.txt");
1717
}
1818
else
1919
{

‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/MultiSceneExample.unity

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,16 @@ PrefabInstance:
717717
propertyPath: m_SizeDelta.y
718718
value: 0
719719
objectReference: {fileID: 0}
720+
- target: {fileID: 452330032692519568, guid: 0a3b6392f04558844bd340e68ced1ff9,
721+
type: 3}
722+
propertyPath: m_Enabled
723+
value: 1
724+
objectReference: {fileID: 0}
725+
- target: {fileID: 522176396502672016, guid: 0a3b6392f04558844bd340e68ced1ff9,
726+
type: 3}
727+
propertyPath: m_Enabled
728+
value: 0
729+
objectReference: {fileID: 0}
720730
- target: {fileID: 653059108743847710, guid: 0a3b6392f04558844bd340e68ced1ff9,
721731
type: 3}
722732
propertyPath: settingsSearchPattern
@@ -792,6 +802,11 @@ PrefabInstance:
792802
propertyPath: m_SizeDelta.y
793803
value: 0
794804
objectReference: {fileID: 0}
805+
- target: {fileID: 2834388984357925155, guid: 0a3b6392f04558844bd340e68ced1ff9,
806+
type: 3}
807+
propertyPath: m_AnchoredPosition.y
808+
value: 0
809+
objectReference: {fileID: 0}
795810
- target: {fileID: 3110759810348992417, guid: 0a3b6392f04558844bd340e68ced1ff9,
796811
type: 3}
797812
propertyPath: m_AnchorMin.y
@@ -832,6 +847,21 @@ PrefabInstance:
832847
propertyPath: m_SizeDelta.y
833848
value: 0
834849
objectReference: {fileID: 0}
850+
- target: {fileID: 4267567203292169432, guid: 0a3b6392f04558844bd340e68ced1ff9,
851+
type: 3}
852+
propertyPath: m_AnchoredPosition.y
853+
value: 0
854+
objectReference: {fileID: 0}
855+
- target: {fileID: 4554140430638172287, guid: 0a3b6392f04558844bd340e68ced1ff9,
856+
type: 3}
857+
propertyPath: m_SizeDelta.y
858+
value: 0
859+
objectReference: {fileID: 0}
860+
- target: {fileID: 4554140430638172287, guid: 0a3b6392f04558844bd340e68ced1ff9,
861+
type: 3}
862+
propertyPath: m_AnchoredPosition.y
863+
value: -0.0000077188015
864+
objectReference: {fileID: 0}
835865
- target: {fileID: 4612929069887686480, guid: 0a3b6392f04558844bd340e68ced1ff9,
836866
type: 3}
837867
propertyPath: m_AnchorMin.y
@@ -897,6 +927,21 @@ PrefabInstance:
897927
propertyPath: m_SizeDelta.x
898928
value: 0
899929
objectReference: {fileID: 0}
930+
- target: {fileID: 5759822161150739655, guid: 0a3b6392f04558844bd340e68ced1ff9,
931+
type: 3}
932+
propertyPath: m_AnchorMax.x
933+
value: 0
934+
objectReference: {fileID: 0}
935+
- target: {fileID: 5759822161150739655, guid: 0a3b6392f04558844bd340e68ced1ff9,
936+
type: 3}
937+
propertyPath: m_AnchorMax.y
938+
value: 0
939+
objectReference: {fileID: 0}
940+
- target: {fileID: 5759822161150739655, guid: 0a3b6392f04558844bd340e68ced1ff9,
941+
type: 3}
942+
propertyPath: m_AnchorMin.y
943+
value: 0
944+
objectReference: {fileID: 0}
900945
- target: {fileID: 5839306562788395723, guid: 0a3b6392f04558844bd340e68ced1ff9,
901946
type: 3}
902947
propertyPath: m_AnchorMax.x
@@ -907,6 +952,16 @@ PrefabInstance:
907952
propertyPath: m_AnchorMax.y
908953
value: 0
909954
objectReference: {fileID: 0}
955+
- target: {fileID: 5839306562788395723, guid: 0a3b6392f04558844bd340e68ced1ff9,
956+
type: 3}
957+
propertyPath: m_AnchorMin.y
958+
value: 0
959+
objectReference: {fileID: 0}
960+
- target: {fileID: 6080212163759556620, guid: 0a3b6392f04558844bd340e68ced1ff9,
961+
type: 3}
962+
propertyPath: m_Text
963+
value: Enter a new note...
964+
objectReference: {fileID: 0}
910965
- target: {fileID: 7587908648779123904, guid: 0a3b6392f04558844bd340e68ced1ff9,
911966
type: 3}
912967
propertyPath: m_AnchorMin.y
@@ -937,6 +992,46 @@ PrefabInstance:
937992
propertyPath: m_SizeDelta.y
938993
value: 0
939994
objectReference: {fileID: 0}
995+
- target: {fileID: 7724411810939259452, guid: 0a3b6392f04558844bd340e68ced1ff9,
996+
type: 3}
997+
propertyPath: m_IsActive
998+
value: 1
999+
objectReference: {fileID: 0}
1000+
- target: {fileID: 7839017981507438752, guid: 0a3b6392f04558844bd340e68ced1ff9,
1001+
type: 3}
1002+
propertyPath: m_Text
1003+
value:
1004+
objectReference: {fileID: 0}
1005+
- target: {fileID: 7948667913022628418, guid: 0a3b6392f04558844bd340e68ced1ff9,
1006+
type: 3}
1007+
propertyPath: m_AnchorMin.y
1008+
value: 0
1009+
objectReference: {fileID: 0}
1010+
- target: {fileID: 7948667913022628418, guid: 0a3b6392f04558844bd340e68ced1ff9,
1011+
type: 3}
1012+
propertyPath: m_AnchorMax.y
1013+
value: 0
1014+
objectReference: {fileID: 0}
1015+
- target: {fileID: 7948667913022628418, guid: 0a3b6392f04558844bd340e68ced1ff9,
1016+
type: 3}
1017+
propertyPath: m_AnchoredPosition.x
1018+
value: 0
1019+
objectReference: {fileID: 0}
1020+
- target: {fileID: 7948667913022628418, guid: 0a3b6392f04558844bd340e68ced1ff9,
1021+
type: 3}
1022+
propertyPath: m_AnchoredPosition.y
1023+
value: 0
1024+
objectReference: {fileID: 0}
1025+
- target: {fileID: 7948667913022628418, guid: 0a3b6392f04558844bd340e68ced1ff9,
1026+
type: 3}
1027+
propertyPath: m_SizeDelta.x
1028+
value: 0
1029+
objectReference: {fileID: 0}
1030+
- target: {fileID: 7948667913022628418, guid: 0a3b6392f04558844bd340e68ced1ff9,
1031+
type: 3}
1032+
propertyPath: m_SizeDelta.y
1033+
value: 0
1034+
objectReference: {fileID: 0}
9401035
- target: {fileID: 8307715182677704244, guid: 0a3b6392f04558844bd340e68ced1ff9,
9411036
type: 3}
9421037
propertyPath: m_AnchorMax.x
@@ -947,6 +1042,11 @@ PrefabInstance:
9471042
propertyPath: m_AnchorMax.y
9481043
value: 0
9491044
objectReference: {fileID: 0}
1045+
- target: {fileID: 8307715182677704244, guid: 0a3b6392f04558844bd340e68ced1ff9,
1046+
type: 3}
1047+
propertyPath: m_AnchorMin.y
1048+
value: 0
1049+
objectReference: {fileID: 0}
9501050
- target: {fileID: 8563684494448067901, guid: 0a3b6392f04558844bd340e68ced1ff9,
9511051
type: 3}
9521052
propertyPath: m_Text

‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Scripts/Example_MultiSceneExperimentGenerator.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,8 @@ void AddScenesToBuildIndex()
151151
}
152152

153153
UnityEditor.EditorBuildSettings.scenes = scenes.ToArray();
154-
UnityEditor.EditorApplication.isPlaying = false;
155154

156-
Debug.Log("Added scenes to build settings for Multi Scene Example. Try playing again.");
155+
Debug.Log("Added scenes to build settings for Multi Scene Example.");
157156
}
158157
# endif
159158

0 commit comments

Comments
 (0)