Skip to content

Game Over Screen #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cmullins77 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Game Over Screen #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2c58d6
Merge pull request #1 from cyborg76/master
cmullins77 Apr 3, 2018
a8695d2
Merge remote-tracking branch 'refs/remotes/cyborg76/master'
cmullins77 Apr 10, 2018
6097cb1
Merge remote-tracking branch 'refs/remotes/cyborg76/master'
cmullins77 Apr 12, 2018
24a68c7
Game Over Screen
cmullins77 Apr 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Cyborg/.vs/Cyborg/v15/Server/sqlite3/storage.ide-shm
View file
Open in desktop
Binary file not shown.
Binary file added Cyborg/.vs/Cyborg/v15/Server/sqlite3/storage.ide-wal
View file
Open in desktop
Binary file not shown.
663 changes: 663 additions & 0 deletions Cyborg/Assets/Prefabs/UI/GameOver.prefab
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions Cyborg/Assets/Prefabs/UI/GameOver.prefab.meta
View file
Open in desktop

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

68 changes: 68 additions & 0 deletions Cyborg/Assets/Scenes/Level1.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4182,6 +4182,16 @@ Prefab:
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 114634565215677158, guid: 35245e2c923555c498b7ec7551a69587,
type: 2}
propertyPath: pauseObj
value:
objectReference: {fileID: 2045560037}
- target: {fileID: 114634565215677158, guid: 35245e2c923555c498b7ec7551a69587,
type: 2}
propertyPath: GameOverMenu
value:
objectReference: {fileID: 1982986305}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 35245e2c923555c498b7ec7551a69587, type: 2}
m_IsPrefabParent: 0
Expand Down Expand Up @@ -7673,6 +7683,58 @@ Transform:
m_PrefabParentObject: {fileID: 4327592054137654, guid: b4bc4aae270ad4f4da9394d47f58d985,
type: 2}
m_PrefabInternal: {fileID: 1554852991}
--- !u!1001 &1982986304
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_LocalPosition.x
value: -25.930185
objectReference: {fileID: 0}
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_LocalPosition.y
value: 13.735268
objectReference: {fileID: 0}
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_LocalPosition.z
value: -61.634098
objectReference: {fileID: 0}
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_RootOrder
value: 9
objectReference: {fileID: 0}
- target: {fileID: 114376407169735036, guid: a92775c1d3f6a85479dcd58a35201d58,
type: 2}
propertyPath: level
value: Level1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
m_IsPrefabParent: 0
--- !u!1 &1982986305 stripped
GameObject:
m_PrefabParentObject: {fileID: 1932675586568764, guid: a92775c1d3f6a85479dcd58a35201d58,
type: 2}
m_PrefabInternal: {fileID: 1982986304}
--- !u!1 &1991733235
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -7879,6 +7941,12 @@ Prefab:
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: b765281464cf04848862b277b8000f9a, type: 2}
m_IsPrefabParent: 0
--- !u!114 &2045560037 stripped
MonoBehaviour:
m_PrefabParentObject: {fileID: 114154660379261372, guid: b765281464cf04848862b277b8000f9a,
type: 2}
m_PrefabInternal: {fileID: 2045560036}
m_Script: {fileID: 11500000, guid: 5759794238fd2b34da2133db3ddf007b, type: 3}
--- !u!1 &2062835880
GameObject:
m_ObjectHideFlags: 0
Expand Down
63 changes: 63 additions & 0 deletions Cyborg/Assets/Scenes/Level2.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2201,6 +2201,16 @@ Prefab:
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 114634565215677158, guid: 35245e2c923555c498b7ec7551a69587,
type: 2}
propertyPath: pauseObj
value:
objectReference: {fileID: 892075844}
- target: {fileID: 114634565215677158, guid: 35245e2c923555c498b7ec7551a69587,
type: 2}
propertyPath: GameOverMenu
value:
objectReference: {fileID: 735140076}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 35245e2c923555c498b7ec7551a69587, type: 2}
m_IsPrefabParent: 0
Expand Down Expand Up @@ -2913,6 +2923,11 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 5.100769, y: 5.144947}
m_EdgeRadius: 0
--- !u!1 &735140076 stripped
GameObject:
m_PrefabParentObject: {fileID: 1932675586568764, guid: a92775c1d3f6a85479dcd58a35201d58,
type: 2}
m_PrefabInternal: {fileID: 1109561324}
--- !u!4 &735383741 stripped
Transform:
m_PrefabParentObject: {fileID: 4933016295681400, guid: 318040613f309614ebd39a7c1c8c2caf,
Expand Down Expand Up @@ -3167,6 +3182,12 @@ Transform:
m_Father: {fileID: 1883285702}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &892075844 stripped
MonoBehaviour:
m_PrefabParentObject: {fileID: 114154660379261372, guid: b765281464cf04848862b277b8000f9a,
type: 2}
m_PrefabInternal: {fileID: 582165850}
m_Script: {fileID: 11500000, guid: 5759794238fd2b34da2133db3ddf007b, type: 3}
--- !u!1001 &892139824
Prefab:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -3906,6 +3927,48 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 0.48876396, y: 6.4199777}
m_EdgeRadius: 0
--- !u!1001 &1109561324
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_LocalPosition.x
value: -25.930185
objectReference: {fileID: 0}
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_LocalPosition.y
value: 13.735268
objectReference: {fileID: 0}
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_LocalPosition.z
value: -61.634098
objectReference: {fileID: 0}
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_RootOrder
value: 10
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
m_IsPrefabParent: 0
--- !u!1 &1119679630
GameObject:
m_ObjectHideFlags: 0
Expand Down
68 changes: 68 additions & 0 deletions Cyborg/Assets/Scenes/Level3.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5657,6 +5657,58 @@ Transform:
m_Father: {fileID: 520202652}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &925429133
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_LocalPosition.x
value: -25.930185
objectReference: {fileID: 0}
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_LocalPosition.y
value: 13.735268
objectReference: {fileID: 0}
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_LocalPosition.z
value: -61.634098
objectReference: {fileID: 0}
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_RootOrder
value: 11
objectReference: {fileID: 0}
- target: {fileID: 114376407169735036, guid: a92775c1d3f6a85479dcd58a35201d58,
type: 2}
propertyPath: level
value: Level3
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
m_IsPrefabParent: 0
--- !u!1 &925429134 stripped
GameObject:
m_PrefabParentObject: {fileID: 1932675586568764, guid: a92775c1d3f6a85479dcd58a35201d58,
type: 2}
m_PrefabInternal: {fileID: 925429133}
--- !u!1 &944141596
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -6616,6 +6668,16 @@ Prefab:
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114634565215677158, guid: 35245e2c923555c498b7ec7551a69587,
type: 2}
propertyPath: pauseObj
value:
objectReference: {fileID: 2045560039}
- target: {fileID: 114634565215677158, guid: 35245e2c923555c498b7ec7551a69587,
type: 2}
propertyPath: GameOverMenu
value:
objectReference: {fileID: 925429134}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 35245e2c923555c498b7ec7551a69587, type: 2}
m_IsPrefabParent: 0
Expand Down Expand Up @@ -12254,6 +12316,12 @@ Transform:
m_PrefabParentObject: {fileID: 4316219567855994, guid: b765281464cf04848862b277b8000f9a,
type: 2}
m_PrefabInternal: {fileID: 2045560036}
--- !u!114 &2045560039 stripped
MonoBehaviour:
m_PrefabParentObject: {fileID: 114154660379261372, guid: b765281464cf04848862b277b8000f9a,
type: 2}
m_PrefabInternal: {fileID: 2045560036}
m_Script: {fileID: 11500000, guid: 5759794238fd2b34da2133db3ddf007b, type: 3}
--- !u!1 &2081244331
GameObject:
m_ObjectHideFlags: 0
Expand Down
68 changes: 68 additions & 0 deletions Cyborg/Assets/Scenes/Level4.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,58 @@ Prefab:
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 61b9e2d6fa275494d8591f11dcc72713, type: 2}
m_IsPrefabParent: 0
--- !u!1001 &30749132
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_LocalPosition.x
value: -25.930185
objectReference: {fileID: 0}
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_LocalPosition.y
value: 13.735268
objectReference: {fileID: 0}
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_LocalPosition.z
value: -61.634098
objectReference: {fileID: 0}
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4304058363476122, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
propertyPath: m_RootOrder
value: 9
objectReference: {fileID: 0}
- target: {fileID: 114376407169735036, guid: a92775c1d3f6a85479dcd58a35201d58,
type: 2}
propertyPath: level
value: Level4
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: a92775c1d3f6a85479dcd58a35201d58, type: 2}
m_IsPrefabParent: 0
--- !u!1 &30749133 stripped
GameObject:
m_PrefabParentObject: {fileID: 1932675586568764, guid: a92775c1d3f6a85479dcd58a35201d58,
type: 2}
m_PrefabInternal: {fileID: 30749132}
--- !u!1001 &35076829
Prefab:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -496,6 +548,16 @@ Prefab:
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 114634565215677158, guid: 35245e2c923555c498b7ec7551a69587,
type: 2}
propertyPath: pauseObj
value:
objectReference: {fileID: 1253667449}
- target: {fileID: 114634565215677158, guid: 35245e2c923555c498b7ec7551a69587,
type: 2}
propertyPath: GameOverMenu
value:
objectReference: {fileID: 30749133}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 35245e2c923555c498b7ec7551a69587, type: 2}
m_IsPrefabParent: 0
Expand Down Expand Up @@ -3921,6 +3983,12 @@ Transform:
m_PrefabParentObject: {fileID: 4316219567855994, guid: b765281464cf04848862b277b8000f9a,
type: 2}
m_PrefabInternal: {fileID: 1253667447}
--- !u!114 &1253667449 stripped
MonoBehaviour:
m_PrefabParentObject: {fileID: 114154660379261372, guid: b765281464cf04848862b277b8000f9a,
type: 2}
m_PrefabInternal: {fileID: 1253667447}
m_Script: {fileID: 11500000, guid: 5759794238fd2b34da2133db3ddf007b, type: 3}
--- !u!4 &1263195167 stripped
Transform:
m_PrefabParentObject: {fileID: 4731141121835046, guid: 79715550e8f17fc499fe60aa9d76a8c8,
Expand Down
4 changes: 4 additions & 0 deletions Cyborg/Assets/Script/GameManager/Pause_Game.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ private void Start()
dialogPause = false;
}

public void pauseGame() {
pauseButton = true;
}

// Update is called once per frame
void Update()
{
Expand Down
Loading