From 04c9c9911e177ee91a1403db8ba4d0d3eeebef0d Mon Sep 17 00:00:00 2001 From: Patrice Vignola Date: Mon, 17 Aug 2015 00:03:15 -0400 Subject: [PATCH] - Added the collected souls --- Assets/Prefabs/Canvas.prefab | 80 ++++++++++++++++++++++ Assets/Scenes/Gameplay.unity | 4 -- Assets/Scripts/CollectedSoulsPanel.cs | 15 ++++ Assets/Scripts/CollectedSoulsPanel.cs.meta | 12 ++++ 4 files changed, 107 insertions(+), 4 deletions(-) create mode 100644 Assets/Scripts/CollectedSoulsPanel.cs create mode 100644 Assets/Scripts/CollectedSoulsPanel.cs.meta diff --git a/Assets/Prefabs/Canvas.prefab b/Assets/Prefabs/Canvas.prefab index e61ad0a..0a89408 100644 --- a/Assets/Prefabs/Canvas.prefab +++ b/Assets/Prefabs/Canvas.prefab @@ -352,6 +352,23 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &160936 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22469192} + - 222: {fileID: 22218044} + - 114: {fileID: 11423224} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &161716 GameObject: m_ObjectHideFlags: 1 @@ -565,6 +582,7 @@ GameObject: - 224: {fileID: 22487128} - 222: {fileID: 22264272} - 114: {fileID: 11457732} + - 114: {fileID: 11471198} m_Layer: 5 m_Name: Trending m_TagString: Untagged @@ -747,6 +765,32 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Recent Posts +--- !u!114 &11423224 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 160936} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: --- !u!114 &11424182 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1306,6 +1350,18 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 +--- !u!114 &11471198 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 193382} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be7de77740d97f047b5dfd8057fb8219, type: 3} + m_Name: + m_EditorClassIdentifier: + CollectedSouls: {fileID: 11423224} --- !u!114 &11477926 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1484,6 +1540,12 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 159890} +--- !u!222 &22218044 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 160936} --- !u!222 &22223708 CanvasRenderer: m_ObjectHideFlags: 1 @@ -2105,6 +2167,23 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} +--- !u!224 &22469192 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 160936} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 22487128} + m_RootOrder: 1 + m_AnchorMin: {x: .280000001, y: .110115722} + m_AnchorMax: {x: .720000029, y: .5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} --- !u!224 &22471706 RectTransform: m_ObjectHideFlags: 1 @@ -2242,6 +2321,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 22443456} + - {fileID: 22469192} m_Father: {fileID: 22446096} m_RootOrder: 3 m_AnchorMin: {x: 0, y: .200000003} diff --git a/Assets/Scenes/Gameplay.unity b/Assets/Scenes/Gameplay.unity index 43bd737..46e27d2 100644 --- a/Assets/Scenes/Gameplay.unity +++ b/Assets/Scenes/Gameplay.unity @@ -316,10 +316,6 @@ Prefab: propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22484724, guid: 5c94559626c169f47a446ce0517b8aec, type: 2} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 22484724, guid: 5c94559626c169f47a446ce0517b8aec, type: 2} propertyPath: m_AnchorMax.x value: 0 diff --git a/Assets/Scripts/CollectedSoulsPanel.cs b/Assets/Scripts/CollectedSoulsPanel.cs new file mode 100644 index 0000000..1fafa43 --- /dev/null +++ b/Assets/Scripts/CollectedSoulsPanel.cs @@ -0,0 +1,15 @@ +using UnityEngine; +using System.Collections; +using UnityEngine.UI; +using DeathBook.Model; + +public class CollectedSoulsPanel : MonoBehaviour +{ + public Text CollectedSouls; + + // Update is called once per frame + void Update () + { + CollectedSouls.text = LevelManager.Instance.GameLevel.NumDead.ToString(); + } +} diff --git a/Assets/Scripts/CollectedSoulsPanel.cs.meta b/Assets/Scripts/CollectedSoulsPanel.cs.meta new file mode 100644 index 0000000..c6c50d7 --- /dev/null +++ b/Assets/Scripts/CollectedSoulsPanel.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: be7de77740d97f047b5dfd8057fb8219 +timeCreated: 1439783289 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: