From 84a57684889099676fedfd2279f8db7e6c3201a4 Mon Sep 17 00:00:00 2001 From: Relintai Date: Tue, 29 May 2018 22:36:39 +0200 Subject: [PATCH] =?UTF-8?q?-Kis=20jav=C3=ADtf=C3=A1sok.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Quiz/Assets/Prefabs/Quiz.prefab | 8 +- Quiz/Assets/Scenes/MainScene.unity | 433 ++++------------------------- 2 files changed, 58 insertions(+), 383 deletions(-) diff --git a/Quiz/Assets/Prefabs/Quiz.prefab b/Quiz/Assets/Prefabs/Quiz.prefab index 399c050..a31aad1 100644 --- a/Quiz/Assets/Prefabs/Quiz.prefab +++ b/Quiz/Assets/Prefabs/Quiz.prefab @@ -1240,7 +1240,7 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: 0 + m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} m_isLinkedTextComponent: 0 m_isTextTruncated: 0 @@ -4129,9 +4129,9 @@ MonoBehaviour: m_MinWidth: -1 m_MinHeight: -1 m_PreferredWidth: -1 - m_PreferredHeight: 200 + m_PreferredHeight: -1 m_FlexibleWidth: -1 - m_FlexibleHeight: -1 + m_FlexibleHeight: 8000 m_LayoutPriority: 1 --- !u!114 &114510797424561538 MonoBehaviour: @@ -4958,7 +4958,7 @@ MonoBehaviour: m_PreferredWidth: -1 m_PreferredHeight: -1 m_FlexibleWidth: -1 - m_FlexibleHeight: 10000 + m_FlexibleHeight: 2000 m_LayoutPriority: 1 --- !u!114 &114796233749770962 MonoBehaviour: diff --git a/Quiz/Assets/Scenes/MainScene.unity b/Quiz/Assets/Scenes/MainScene.unity index eea5a1a..8738573 100644 --- a/Quiz/Assets/Scenes/MainScene.unity +++ b/Quiz/Assets/Scenes/MainScene.unity @@ -294,12 +294,22 @@ Prefab: propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 114516035810252784, guid: 856e34ca2a0940d4485e8bf7ece07636, + - target: {fileID: 114173062727473642, guid: 856e34ca2a0940d4485e8bf7ece07636, type: 2} propertyPath: m_havePropertiesChanged value: 1 objectReference: {fileID: 0} - - target: {fileID: 114516035810252784, guid: 856e34ca2a0940d4485e8bf7ece07636, + - target: {fileID: 114173062727473642, guid: 856e34ca2a0940d4485e8bf7ece07636, + type: 2} + propertyPath: m_isInputParsingRequired + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114827693395229746, guid: 856e34ca2a0940d4485e8bf7ece07636, + type: 2} + propertyPath: m_havePropertiesChanged + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114827693395229746, guid: 856e34ca2a0940d4485e8bf7ece07636, type: 2} propertyPath: m_isInputParsingRequired value: 1 @@ -314,6 +324,16 @@ Prefab: propertyPath: m_isInputParsingRequired value: 1 objectReference: {fileID: 0} + - target: {fileID: 114476594045200410, guid: 856e34ca2a0940d4485e8bf7ece07636, + type: 2} + propertyPath: m_havePropertiesChanged + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114476594045200410, guid: 856e34ca2a0940d4485e8bf7ece07636, + type: 2} + propertyPath: m_isInputParsingRequired + value: 1 + objectReference: {fileID: 0} - target: {fileID: 114125219064817606, guid: 856e34ca2a0940d4485e8bf7ece07636, type: 2} propertyPath: m_havePropertiesChanged @@ -324,6 +344,36 @@ Prefab: propertyPath: m_isInputParsingRequired value: 1 objectReference: {fileID: 0} + - target: {fileID: 114753993251736394, guid: 856e34ca2a0940d4485e8bf7ece07636, + type: 2} + propertyPath: m_havePropertiesChanged + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114753993251736394, guid: 856e34ca2a0940d4485e8bf7ece07636, + type: 2} + propertyPath: m_isInputParsingRequired + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114164360000452872, guid: 856e34ca2a0940d4485e8bf7ece07636, + type: 2} + propertyPath: m_havePropertiesChanged + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114164360000452872, guid: 856e34ca2a0940d4485e8bf7ece07636, + type: 2} + propertyPath: m_isInputParsingRequired + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114096735093609612, guid: 856e34ca2a0940d4485e8bf7ece07636, + type: 2} + propertyPath: m_havePropertiesChanged + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114096735093609612, guid: 856e34ca2a0940d4485e8bf7ece07636, + type: 2} + propertyPath: m_isInputParsingRequired + value: 1 + objectReference: {fileID: 0} - target: {fileID: 114451661483695722, guid: 856e34ca2a0940d4485e8bf7ece07636, type: 2} propertyPath: m_havePropertiesChanged @@ -344,391 +394,16 @@ Prefab: propertyPath: m_isInputParsingRequired value: 1 objectReference: {fileID: 0} - - target: {fileID: 114096735093609612, guid: 856e34ca2a0940d4485e8bf7ece07636, + - target: {fileID: 114516035810252784, guid: 856e34ca2a0940d4485e8bf7ece07636, type: 2} propertyPath: m_havePropertiesChanged value: 1 objectReference: {fileID: 0} - - target: {fileID: 114096735093609612, guid: 856e34ca2a0940d4485e8bf7ece07636, + - target: {fileID: 114516035810252784, guid: 856e34ca2a0940d4485e8bf7ece07636, type: 2} propertyPath: m_isInputParsingRequired value: 1 objectReference: {fileID: 0} - - target: {fileID: 114173062727473642, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_havePropertiesChanged - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114173062727473642, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_isInputParsingRequired - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114827693395229746, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_havePropertiesChanged - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114827693395229746, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_isInputParsingRequired - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114164360000452872, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_havePropertiesChanged - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114164360000452872, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_isInputParsingRequired - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114476594045200410, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_havePropertiesChanged - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114476594045200410, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_isInputParsingRequired - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114753993251736394, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_havePropertiesChanged - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114753993251736394, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_isInputParsingRequired - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224106335225601898, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224106335225601898, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224106335225601898, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224106335225601898, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224106335225601898, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224106335225601898, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224284955253454526, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224284955253454526, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224284955253454526, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224284955253454526, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224284955253454526, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224235844471873738, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224235844471873738, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224235844471873738, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224235844471873738, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224235844471873738, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224235844471873738, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224184219304057936, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224184219304057936, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224184219304057936, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224184219304057936, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224184219304057936, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224184219304057936, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224836438976007922, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224836438976007922, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224836438976007922, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224836438976007922, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224836438976007922, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224836438976007922, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224252867083368616, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224252867083368616, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224252867083368616, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224252867083368616, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224252867083368616, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224252867083368616, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224333746695899820, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224333746695899820, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224333746695899820, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224333746695899820, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224333746695899820, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224333746695899820, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224853550833776616, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224853550833776616, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224853550833776616, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224853550833776616, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224853550833776616, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224853550833776616, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224133230707058828, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224133230707058828, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224133230707058828, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224133230707058828, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224133230707058828, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224133230707058828, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224656438575154426, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224656438575154426, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224656438575154426, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224656438575154426, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224656438575154426, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224656438575154426, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224387966081393810, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224387966081393810, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224387966081393810, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224387966081393810, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224387966081393810, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224387966081393810, guid: 856e34ca2a0940d4485e8bf7ece07636, - type: 2} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 856e34ca2a0940d4485e8bf7ece07636, type: 2} m_IsPrefabParent: 0