Skip to content

Commit

Permalink
Fixed Game over screen and finished Game UI
Browse files Browse the repository at this point in the history
  • Loading branch information
@AndresGregB
AndresGregB committed Sep 25, 2017
1 parent 3834074 commit f8d73b9
Show file tree
Hide file tree
Showing 16 changed files with 528 additions and 31 deletions.
Binary file added Assets/Fonts/Crash Scene.ttf
View file
Binary file not shown.
21 changes: 21 additions & 0 deletions Assets/Fonts/Crash Scene.ttf.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions Assets/GameOver.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0.000061035156}
m_SizeDelta: {x: 1158, y: 629}
m_SizeDelta: {x: 1322.9, y: 659.19}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &38674744
MonoBehaviour:
Expand All @@ -162,9 +162,9 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: ca8d1dc40bd1b3140a4a17376404477a, type: 3}
m_Sprite: {fileID: 21300000, guid: 00b2fc4bf96619f4ab66668c3232fc5a, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
Expand Down Expand Up @@ -353,15 +353,15 @@ RectTransform:
m_GameObject: {fileID: 465361954}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2, y: 2, z: 2}
m_LocalScale: {x: 2.7102647, y: 2.7102644, z: 2.7102644}
m_Children:
- {fileID: 376521889}
m_Father: {fileID: 1125481859}
m_RootOrder: 3
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: 12, y: 86}
m_AnchoredPosition: {x: 12, y: 123}
m_SizeDelta: {x: 111, y: 43.4}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &465361956
Expand Down Expand Up @@ -796,18 +796,18 @@ RectTransform:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1148358421}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.94, y: 1.94, z: 1.94}
m_LocalScale: {x: 2.7102647, y: 2.7102644, z: 2.7102644}
m_Children:
- {fileID: 639049927}
m_Father: {fileID: 1125481859}
m_RootOrder: 4
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: 12, y: -9}
m_SizeDelta: {x: 160, y: 30}
m_AnchoredPosition: {x: 12, y: 2}
m_SizeDelta: {x: 111, y: 43.4}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1148358423
MonoBehaviour:
Expand Down Expand Up @@ -1234,16 +1234,16 @@ RectTransform:
m_GameObject: {fileID: 1956828333}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.9117157, y: 1.9117155, z: 1.9117155}
m_LocalScale: {x: 2.7102647, y: 2.7102644, z: 2.7102644}
m_Children:
- {fileID: 295332016}
m_Father: {fileID: 1125481859}
m_RootOrder: 5
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: 12, y: -100}
m_SizeDelta: {x: 160, y: 30}
m_AnchoredPosition: {x: 12, y: -118}
m_SizeDelta: {x: 111, y: 43.4}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1956828335
MonoBehaviour:
Expand Down
122 changes: 107 additions & 15 deletions Assets/Level1.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25594,7 +25594,7 @@ MonoBehaviour:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 118419645}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ff26db721962cdf4a8edcdfa9a767d2a, type: 3}
m_Name:
Expand Down Expand Up @@ -64785,7 +64785,7 @@ Prefab:
type: 2}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: a3d8d86f5872b20408474c9a9d03f69c,
objectReference: {fileID: 21300000, guid: b8f198c29e28c674db662bbaca4e7e8d,
type: 3}
- target: {fileID: 114361896219080332, guid: 5eef4774d8238d24684e771537f41935,
type: 2}
Expand All @@ -64812,22 +64812,22 @@ Prefab:
- target: {fileID: 224251068676936538, guid: 5eef4774d8238d24684e771537f41935,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 121
value: 95
objectReference: {fileID: 0}
- target: {fileID: 224446036976192634, guid: 5eef4774d8238d24684e771537f41935,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 121
value: 95
objectReference: {fileID: 0}
- target: {fileID: 224761037444888550, guid: 5eef4774d8238d24684e771537f41935,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 121
value: 95
objectReference: {fileID: 0}
- target: {fileID: 224846575937847982, guid: 5eef4774d8238d24684e771537f41935,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 121
value: 95
objectReference: {fileID: 0}
- target: {fileID: 224251068676936538, guid: 5eef4774d8238d24684e771537f41935,
type: 2}
Expand Down Expand Up @@ -64919,6 +64919,35 @@ Prefab:
propertyPath: m_SizeDelta.y
value: -296.80002
objectReference: {fileID: 0}
- target: {fileID: 114804628370089174, guid: 5eef4774d8238d24684e771537f41935,
type: 2}
propertyPath: m_FontData.m_Font
value:
objectReference: {fileID: 12800000, guid: 3b5f8c3adfd766c48837a14390d94b43,
type: 3}
- target: {fileID: 114517339767554168, guid: 5eef4774d8238d24684e771537f41935,
type: 2}
propertyPath: m_FontData.m_Font
value:
objectReference: {fileID: 12800000, guid: 3b5f8c3adfd766c48837a14390d94b43,
type: 3}
- target: {fileID: 114115444567811270, guid: 5eef4774d8238d24684e771537f41935,
type: 2}
propertyPath: m_FontData.m_Font
value:
objectReference: {fileID: 12800000, guid: 3b5f8c3adfd766c48837a14390d94b43,
type: 3}
- target: {fileID: 114040855812632144, guid: 5eef4774d8238d24684e771537f41935,
type: 2}
propertyPath: m_FontData.m_Font
value:
objectReference: {fileID: 12800000, guid: 3b5f8c3adfd766c48837a14390d94b43,
type: 3}
- target: {fileID: 114553746100786784, guid: 5eef4774d8238d24684e771537f41935,
type: 2}
propertyPath: m_PreserveAspect
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 5eef4774d8238d24684e771537f41935, type: 2}
m_IsPrefabParent: 0
Expand Down Expand Up @@ -68891,7 +68920,7 @@ Prefab:
type: 2}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: d8081177dc091b949b32f05fb870021b,
objectReference: {fileID: 21300000, guid: 4cacb6244f0723747bb2b3d6b57247ea,
type: 3}
- target: {fileID: 114014195010230492, guid: a0a1587495c015b4bbf80e3f9ef83597,
type: 2}
Expand Down Expand Up @@ -68929,7 +68958,7 @@ Prefab:
type: 2}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: f08e423e7a81fb541a42f2b0802ddbff,
objectReference: {fileID: 21300000, guid: 15bdea630e351b446903059e04f32939,
type: 3}
- target: {fileID: 114727670762304386, guid: a0a1587495c015b4bbf80e3f9ef83597,
type: 2}
Expand All @@ -68950,13 +68979,13 @@ Prefab:
type: 2}
propertyPath: m_SpriteState.m_HighlightedSprite
value:
objectReference: {fileID: 21300000, guid: f08e423e7a81fb541a42f2b0802ddbff,
objectReference: {fileID: 21300000, guid: 15bdea630e351b446903059e04f32939,
type: 3}
- target: {fileID: 114016040162511322, guid: a0a1587495c015b4bbf80e3f9ef83597,
type: 2}
propertyPath: m_SpriteState.m_PressedSprite
value:
objectReference: {fileID: 21300000, guid: fb9cd7e6146343348825fb84f61900a5,
objectReference: {fileID: 21300000, guid: 52417e2bd5313da49a13d441c1f4b9b7,
type: 3}
- target: {fileID: 114871641728679922, guid: a0a1587495c015b4bbf80e3f9ef83597,
type: 2}
Expand Down Expand Up @@ -69029,27 +69058,27 @@ Prefab:
- target: {fileID: 224513031263885874, guid: a0a1587495c015b4bbf80e3f9ef83597,
type: 2}
propertyPath: m_AnchoredPosition.y
value: -145
value: -40.5
objectReference: {fileID: 0}
- target: {fileID: 224138567543498364, guid: a0a1587495c015b4bbf80e3f9ef83597,
type: 2}
propertyPath: m_AnchoredPosition.y
value: -60
value: 44.5
objectReference: {fileID: 0}
- target: {fileID: 224513031263885874, guid: a0a1587495c015b4bbf80e3f9ef83597,
type: 2}
propertyPath: m_AnchoredPosition.x
value: -281
value: 17.6
objectReference: {fileID: 0}
- target: {fileID: 224138567543498364, guid: a0a1587495c015b4bbf80e3f9ef83597,
type: 2}
propertyPath: m_AnchoredPosition.x
value: -281
value: 17.6
objectReference: {fileID: 0}
- target: {fileID: 223546950429130022, guid: a0a1587495c015b4bbf80e3f9ef83597,
type: 2}
propertyPath: m_Enabled
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224138567543498364, guid: a0a1587495c015b4bbf80e3f9ef83597,
type: 2}
Expand Down Expand Up @@ -69081,6 +69110,21 @@ Prefab:
propertyPath: m_LocalScale.z
value: 1.8783778
objectReference: {fileID: 0}
- target: {fileID: 224568628167050032, guid: a0a1587495c015b4bbf80e3f9ef83597,
type: 2}
propertyPath: m_LocalScale.x
value: 1.5192469
objectReference: {fileID: 0}
- target: {fileID: 224568628167050032, guid: a0a1587495c015b4bbf80e3f9ef83597,
type: 2}
propertyPath: m_LocalScale.y
value: 1.5192467
objectReference: {fileID: 0}
- target: {fileID: 224568628167050032, guid: a0a1587495c015b4bbf80e3f9ef83597,
type: 2}
propertyPath: m_LocalScale.z
value: 1.5192467
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: a0a1587495c015b4bbf80e3f9ef83597, type: 2}
m_IsPrefabParent: 0
Expand Down Expand Up @@ -216874,6 +216918,54 @@ Prefab:
propertyPath: m_Color.a
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114206591144238948, guid: a709fff516182f04c8362d14003dab08,
type: 2}
propertyPath: m_FontData.m_Font
value:
objectReference: {fileID: 12800000, guid: 3b5f8c3adfd766c48837a14390d94b43,
type: 3}
- target: {fileID: 114383663321422942, guid: a709fff516182f04c8362d14003dab08,
type: 2}
propertyPath: m_FontData.m_Font
value:
objectReference: {fileID: 12800000, guid: 3b5f8c3adfd766c48837a14390d94b43,
type: 3}
- target: {fileID: 114477094025801996, guid: a709fff516182f04c8362d14003dab08,
type: 2}
propertyPath: m_FontData.m_Font
value:
objectReference: {fileID: 12800000, guid: 3b5f8c3adfd766c48837a14390d94b43,
type: 3}
- target: {fileID: 114630535910431824, guid: a709fff516182f04c8362d14003dab08,
type: 2}
propertyPath: m_FontData.m_Font
value:
objectReference: {fileID: 12800000, guid: 3b5f8c3adfd766c48837a14390d94b43,
type: 3}
- target: {fileID: 114587382772377792, guid: a709fff516182f04c8362d14003dab08,
type: 2}
propertyPath: m_FontData.m_Font
value:
objectReference: {fileID: 12800000, guid: 3b5f8c3adfd766c48837a14390d94b43,
type: 3}
- target: {fileID: 114209089974215670, guid: a709fff516182f04c8362d14003dab08,
type: 2}
propertyPath: m_FontData.m_Font
value:
objectReference: {fileID: 12800000, guid: 3b5f8c3adfd766c48837a14390d94b43,
type: 3}
- target: {fileID: 114834786247558070, guid: a709fff516182f04c8362d14003dab08,
type: 2}
propertyPath: m_FontData.m_Font
value:
objectReference: {fileID: 12800000, guid: 3b5f8c3adfd766c48837a14390d94b43,
type: 3}
- target: {fileID: 114491177342949504, guid: a709fff516182f04c8362d14003dab08,
type: 2}
propertyPath: m_FontData.m_Font
value:
objectReference: {fileID: 12800000, guid: 3b5f8c3adfd766c48837a14390d94b43,
type: 3}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: a709fff516182f04c8362d14003dab08, type: 2}
m_IsPrefabParent: 0
Expand Down
8 changes: 4 additions & 4 deletions Assets/Scripts/GUI/scoreScreenManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ void Start () {
// Update is called once per frame
void Update () {
if (this.gameObject.GetComponent<Canvas> ().enabled == true) {
FinalScore.text = "Score: \t\t\t\t\t\t\t" + MainInterface.getScore ().ToString ();
FinalKillCount.text = "Kills: \t\t\t\t\t\t\t" + MainInterface.getKillCount().ToString();
FinalHighestMult.text = "Highest Multiplier: \t" + MainInterface.getHighestMult ().ToString ();
FinalScore.text = "Score: \t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" + MainInterface.getScore ().ToString ();
FinalKillCount.text = "Kills: \t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" + MainInterface.getKillCount().ToString();
FinalHighestMult.text = "Highest Multiplier: \t\t\t\t\t\t\t\t" + MainInterface.getHighestMult ().ToString ();
int GameTime = (int)Mathf.Floor(MainInterface.getTimeInLevel ());
FinalTime.text = "Time: \t\t\t\t\t\t\t" + Mathf.Floor(GameTime/60).ToString("00") + " : " + (GameTime%60).ToString("00");
FinalTime.text = "Time: \t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" + Mathf.Floor(GameTime/60).ToString("00") + " : " + (GameTime%60).ToString("00");
}
}
}
4 changes: 4 additions & 0 deletions Assets/Scripts/MainMenu/GameOverMenu.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ public void buttonWasClicked()
{
Application.Quit();
}
if (buttonIndex == 2) // Back To Level 1
{
SceneManager.LoadScene("Level1", LoadSceneMode.Single);
}
}

public void buttonOver ()
Expand Down
Binary file added Assets/UI/Ingame_Menu/PAUSE.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit f8d73b9

Please sign in to comment.