From 96155b719ab4fa665fc00706a6df471f5a6f149e Mon Sep 17 00:00:00 2001 From: Gregory Campbell Date: Tue, 9 Jun 2020 22:20:34 -0400 Subject: [PATCH] Added highscores and the display of the highscore at the top of the screen --- Assets/Scenes/Main Scene.unity | 161 +++++++++++++++++++++++++++++ Assets/Scripts/GameScript.cs | 9 ++ Assets/Textures/HighScore.png | Bin 0 -> 3086 bytes Assets/Textures/HighScore.png.meta | 92 +++++++++++++++++ Assets/Textures/HighScore.xcf | Bin 0 -> 21535 bytes Assets/Textures/HighScore.xcf.meta | 7 ++ 6 files changed, 269 insertions(+) create mode 100644 Assets/Textures/HighScore.png create mode 100644 Assets/Textures/HighScore.png.meta create mode 100644 Assets/Textures/HighScore.xcf create mode 100644 Assets/Textures/HighScore.xcf.meta diff --git a/Assets/Scenes/Main Scene.unity b/Assets/Scenes/Main Scene.unity index 6b45a6b..c1030b2 100644 --- a/Assets/Scenes/Main Scene.unity +++ b/Assets/Scenes/Main Scene.unity @@ -202,6 +202,84 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &260103461 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 260103462} + - component: {fileID: 260103464} + - component: {fileID: 260103463} + m_Layer: 5 + m_Name: HighScoreText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &260103462 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 260103461} + 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: 1769056510} + m_RootOrder: 2 + 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: 300, y: 525} + m_SizeDelta: {x: 400, y: 250} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &260103463 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 260103461} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: a32081f970984024b87f4cac03c0c93f, type: 2} + m_FontSize: 0 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 0 +--- !u!222 &260103464 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 260103461} + m_CullTransparentMesh: 0 --- !u!1 &277633851 GameObject: m_ObjectHideFlags: 0 @@ -1031,6 +1109,7 @@ MonoBehaviour: ScoreTitle: {fileID: 610814838} Countdown: {fileID: 838031010} Score: {fileID: 1804874296} + HighScore: {fileID: 260103463} ObjectSprites: - {fileID: 21300000, guid: f86f46202b4377743b719984d5bb8396, type: 3} - {fileID: 21300000, guid: bf9a4d7870709424d95eaad944a6363b, type: 3} @@ -1338,6 +1417,7 @@ RectTransform: m_Children: - {fileID: 838031009} - {fileID: 1804874295} + - {fileID: 260103462} m_Father: {fileID: 0} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1641,6 +1721,87 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 1 m_Constraints: 0 +--- !u!1 &1991649332 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1991649334} + - component: {fileID: 1991649333} + m_Layer: 0 + m_Name: HighScore + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1991649333 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1991649332} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 8ee0f5058d612e2469fb894ea8fbf88c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.12, y: 2.56} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1991649334 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1991649332} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.75, y: 4.25, z: 0} + m_LocalScale: {x: 0.75, y: 0.75, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 15 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2120053446 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GameScript.cs b/Assets/Scripts/GameScript.cs index 80a8792..de2266b 100644 --- a/Assets/Scripts/GameScript.cs +++ b/Assets/Scripts/GameScript.cs @@ -12,6 +12,7 @@ public class GameScript : MonoBehaviour public GameObject ScoreTitle; public Text Countdown; public Text Score; + public Text HighScore; public Sprite[] ObjectSprites; private bool clicked = false; @@ -120,6 +121,12 @@ public class GameScript : MonoBehaviour Score.text = objectsPolished.ToString(); + if(PlayerPrefs.GetInt("HighScore") < objectsPolished) + { + PlayerPrefs.SetInt("HighScore", objectsPolished); + HighScore.text = PlayerPrefs.GetInt("HighScore").ToString(); + } + ScoreTitle.SetActive(true); Object.SetActive(false); @@ -152,6 +159,8 @@ public class GameScript : MonoBehaviour Score.text = null; ScoreTitle.SetActive(false); + HighScore.text = PlayerPrefs.GetInt("HighScore").ToString(); + Object.transform.localScale = new Vector3(1, 1, 1); Object.GetComponent().sprite = null; Destroy(Object.GetComponent()); diff --git a/Assets/Textures/HighScore.png b/Assets/Textures/HighScore.png new file mode 100644 index 0000000000000000000000000000000000000000..b703a2c1c84e443d3b03a5c95e40c597eb8028f3 GIT binary patch literal 3086 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 SlZ7rqKS=m5UJm>D)c*shA#=(A literal 0 HcmV?d00001 diff --git a/Assets/Textures/HighScore.xcf.meta b/Assets/Textures/HighScore.xcf.meta new file mode 100644 index 0000000..2fc6500 --- /dev/null +++ b/Assets/Textures/HighScore.xcf.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1f0d3a2bb1673e64abb2db6b724541ba +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: