From 4addd64297fc268bfe30e6fe2d5c3350441be3e8 Mon Sep 17 00:00:00 2001 From: Unknown <34045228+sommerlilie@users.noreply.github.com> Date: Sun, 22 Apr 2018 10:16:32 +0200 Subject: [PATCH] moreUI --- Assets/Scenes/PauseMenu.unity | 28 ++++++++++++++++-- Assets/Scenes/TitleScene.unity | 4 ++- .../textures/FixedObjects/Rock/Thumbs.db | Bin 0 -> 16384 bytes 3 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 Assets/graphics/textures/FixedObjects/Rock/Thumbs.db diff --git a/Assets/Scenes/PauseMenu.unity b/Assets/Scenes/PauseMenu.unity index d4edab7..ed87004 100644 --- a/Assets/Scenes/PauseMenu.unity +++ b/Assets/Scenes/PauseMenu.unity @@ -446,7 +446,7 @@ GameObject: - component: {fileID: 569304360} - component: {fileID: 569304359} m_Layer: 5 - m_Name: Canvas + m_Name: PauseMenu m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1096,6 +1096,7 @@ GameObject: - component: {fileID: 1974548622} - component: {fileID: 1974548621} - component: {fileID: 1974548620} + - component: {fileID: 1974548623} m_Layer: 5 m_Name: Button m_TagString: Untagged @@ -1160,7 +1161,18 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1974548621} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1974548618} + m_MethodName: + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!114 &1974548621 @@ -1196,3 +1208,15 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1974548618} +--- !u!114 &1974548623 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1974548618} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f52f2b666c1ec64195aad9936df2d4f, type: 3} + m_Name: + m_EditorClassIdentifier: + gameOverPanel: {fileID: 0} diff --git a/Assets/Scenes/TitleScene.unity b/Assets/Scenes/TitleScene.unity index f736d69..a3b6a28 100644 --- a/Assets/Scenes/TitleScene.unity +++ b/Assets/Scenes/TitleScene.unity @@ -278,7 +278,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 198} + m_AnchoredPosition: {x: 0, y: 122} m_SizeDelta: {x: 800, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &863866092 @@ -624,6 +624,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f52f2b666c1ec64195aad9936df2d4f, type: 3} m_Name: m_EditorClassIdentifier: + gameOverPanel: {fileID: 0} --- !u!1 &1586619316 GameObject: m_ObjectHideFlags: 0 @@ -956,3 +957,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f52f2b666c1ec64195aad9936df2d4f, type: 3} m_Name: m_EditorClassIdentifier: + gameOverPanel: {fileID: 0} diff --git a/Assets/graphics/textures/FixedObjects/Rock/Thumbs.db b/Assets/graphics/textures/FixedObjects/Rock/Thumbs.db new file mode 100644 index 0000000000000000000000000000000000000000..5f18f315bbde23c06a2adb13d6783e22e713eb0a GIT binary patch literal 16384 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 OiT-1YMgAKu2l-#F^`5K% literal 0 HcmV?d00001