From e2dcd925072e5c51f10456c51ea55d398968d60d Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Fri, 24 Oct 2014 16:25:55 +0100 Subject: [PATCH] Fixed scroll position in example scenes. --- Assets/Examples/JumpingPrax/JumpingPrax.unity | 13 +++++++++---- Assets/Examples/TheFacility/TheFacility.unity | 9 +++++---- Assets/Examples/Usfxr/UsfxrAudioExample.unity | 5 +++-- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/Assets/Examples/JumpingPrax/JumpingPrax.unity b/Assets/Examples/JumpingPrax/JumpingPrax.unity index c27ad6fc..d8f71104 100644 --- a/Assets/Examples/JumpingPrax/JumpingPrax.unity +++ b/Assets/Examples/JumpingPrax/JumpingPrax.unity @@ -535,7 +535,7 @@ MonoBehaviour: m_FontStyle: 0 m_BestFit: 1 m_MinSize: 10 - m_MaxSize: 24 + m_MaxSize: 20 m_Alignment: 4 m_RichText: 1 m_HorizontalOverflow: 0 @@ -581,6 +581,7 @@ MonoBehaviour: nameText: Prax nameColor: {r: .257352948, g: .815618575, b: 1, a: 1} profileSprite: {fileID: 21300000, guid: d18d934d212d442ee90406fd28e6eef6, type: 3} + soundEffect: {fileID: 0} notes: --- !u!4 &102763372 Transform: @@ -1050,7 +1051,7 @@ MonoBehaviour: m_FontStyle: 0 m_BestFit: 1 m_MinSize: 10 - m_MaxSize: 24 + m_MaxSize: 20 m_Alignment: 4 m_RichText: 1 m_HorizontalOverflow: 0 @@ -2355,6 +2356,7 @@ MonoBehaviour: nameText: {fileID: 1599807780} storyText: {fileID: 904137537} characterImage: {fileID: 982770894} + characterTypingSound: {fileID: 0} continueImage: {fileID: 2062365600} --- !u!1 &1436669959 GameObject: @@ -2527,7 +2529,7 @@ MonoBehaviour: m_FontStyle: 0 m_BestFit: 1 m_MinSize: 10 - m_MaxSize: 24 + m_MaxSize: 20 m_Alignment: 4 m_RichText: 1 m_HorizontalOverflow: 0 @@ -3017,6 +3019,7 @@ MonoBehaviour: nameText: Prax nameColor: {r: .257352948, g: .815618575, b: 1, a: 1} profileSprite: {fileID: 21300000, guid: f2e901e070fff48cda67e3f446d80e79, type: 3} + soundEffect: {fileID: 0} notes: Prax is in a good mood! --- !u!4 &1844806519 Transform: @@ -3073,6 +3076,7 @@ MonoBehaviour: nameText: Prax nameColor: {r: .257352948, g: .815618575, b: 1, a: 1} profileSprite: {fileID: 21300000, guid: a3850401348404655bd0352054c28683, type: 3} + soundEffect: {fileID: 0} notes: --- !u!1 &1873765285 GameObject: @@ -3733,6 +3737,7 @@ MonoBehaviour: nameText: {fileID: 35344135} storyText: {fileID: 689227474} characterImage: {fileID: 54732630} + characterTypingSound: {fileID: 0} timeoutSlider: {fileID: 1436669961} optionButtons: - {fileID: 1773019754} @@ -3925,7 +3930,7 @@ MonoBehaviour: m_FontStyle: 0 m_BestFit: 1 m_MinSize: 10 - m_MaxSize: 24 + m_MaxSize: 20 m_Alignment: 4 m_RichText: 1 m_HorizontalOverflow: 0 diff --git a/Assets/Examples/TheFacility/TheFacility.unity b/Assets/Examples/TheFacility/TheFacility.unity index 0284b5b1..8a4c071e 100644 --- a/Assets/Examples/TheFacility/TheFacility.unity +++ b/Assets/Examples/TheFacility/TheFacility.unity @@ -1020,6 +1020,7 @@ MonoBehaviour: nameText: {fileID: 0} storyText: {fileID: 1077748666} characterImage: {fileID: 0} + characterTypingSound: {fileID: 0} timeoutSlider: {fileID: 1002527487} optionButtons: - {fileID: 698212756} @@ -2496,7 +2497,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} m_Name: m_EditorClassIdentifier: - scrollPos: {x: -693.539307, y: 135.107895} + scrollPos: {x: -311.701569, y: 165.035736} zoom: .968997777 scrollViewRect: serializedVersion: 2 @@ -2504,9 +2505,8 @@ MonoBehaviour: y: -610.734985 width: 3261.20312 height: 2227.35059 - selectedSequence: {fileID: 1680954148} - selectedCommands: - - {fileID: 1680954166} + selectedSequence: {fileID: 0} + selectedCommands: [] variables: - {fileID: 771014102} - {fileID: 771014103} @@ -4035,6 +4035,7 @@ MonoBehaviour: nameText: {fileID: 0} storyText: {fileID: 1065110604} characterImage: {fileID: 0} + characterTypingSound: {fileID: 0} continueImage: {fileID: 576994359} --- !u!1 &1260488681 GameObject: diff --git a/Assets/Examples/Usfxr/UsfxrAudioExample.unity b/Assets/Examples/Usfxr/UsfxrAudioExample.unity index 079e94e1..034c2c39 100644 --- a/Assets/Examples/Usfxr/UsfxrAudioExample.unity +++ b/Assets/Examples/Usfxr/UsfxrAudioExample.unity @@ -242,7 +242,7 @@ MonoBehaviour: x: -91 y: -438 width: 240 - height: 127 + height: 114 sequenceName: Sound Sequence commandList: - {fileID: 1295658134} @@ -378,7 +378,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} m_Name: m_EditorClassIdentifier: - scrollPos: {x: 158.009644, y: 294.017944} + scrollPos: {x: 517.51593, y: 615.148438} + zoom: 1 scrollViewRect: serializedVersion: 2 x: -547