Skip to content

Commit

Permalink
GGJ Candidate, added additional textures
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffalot committed Jan 27, 2019
1 parent 274bf27 commit 9c7280e
Show file tree
Hide file tree
Showing 7 changed files with 256 additions and 12 deletions.
36 changes: 28 additions & 8 deletions Assets/Scenes/LevelSetup3.unity
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RenderSettings:
m_FogDensity: 0.01
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.6226415, g: 0.037306596, b: 0, a: 1}
m_AmbientSkyColor: {r: 0.754717, g: 0.14421304, b: 0.10323961, a: 1}
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1
Expand Down Expand Up @@ -3898,7 +3898,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!1 &91369507
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -11971,22 +11971,22 @@ PrefabInstance:
- target: {fileID: 2351053748353080707, guid: 1d7b90893a3372e4eb6ffda90c320c1e,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2351053748353080705, guid: 1d7b90893a3372e4eb6ffda90c320c1e,
type: 3}
propertyPath: m_LocalPosition.x
value: 13.26
value: 8.59
objectReference: {fileID: 0}
- target: {fileID: 2351053748353080705, guid: 1d7b90893a3372e4eb6ffda90c320c1e,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.21
value: 0.46
objectReference: {fileID: 0}
- target: {fileID: 2351053748353080705, guid: 1d7b90893a3372e4eb6ffda90c320c1e,
type: 3}
propertyPath: m_LocalPosition.z
value: 32.88
value: 34.27
objectReference: {fileID: 0}
- target: {fileID: 2351053748353080705, guid: 1d7b90893a3372e4eb6ffda90c320c1e,
type: 3}
Expand Down Expand Up @@ -12048,6 +12048,16 @@ PrefabInstance:
propertyPath: maxMotorTorque
value: 10000
objectReference: {fileID: 0}
- target: {fileID: 2351053747481904792, guid: 1d7b90893a3372e4eb6ffda90c320c1e,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 07e99956ac737074a828408b1d9f7c57, type: 2}
- target: {fileID: 2351053747481904792, guid: 1d7b90893a3372e4eb6ffda90c320c1e,
type: 3}
propertyPath: m_Materials.Array.data[1]
value:
objectReference: {fileID: 2100072, guid: 7ffd22f14b5deeb4ea3053e2f982200e, type: 3}
- target: {fileID: 2351053748353080719, guid: 1d7b90893a3372e4eb6ffda90c320c1e,
type: 3}
propertyPath: m_Enabled
Expand All @@ -12068,6 +12078,16 @@ PrefabInstance:
propertyPath: m_LocalScale.z
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 2351053747481904794, guid: 1d7b90893a3372e4eb6ffda90c320c1e,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100072, guid: 7ffd22f14b5deeb4ea3053e2f982200e, type: 3}
- target: {fileID: 2351053747481904796, guid: 1d7b90893a3372e4eb6ffda90c320c1e,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100072, guid: 7ffd22f14b5deeb4ea3053e2f982200e, type: 3}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1d7b90893a3372e4eb6ffda90c320c1e, type: 3}
--- !u!1 &465486603
Expand Down Expand Up @@ -23554,8 +23574,8 @@ Light:
m_Enabled: 1
serializedVersion: 8
m_Type: 1
m_Color: {r: 1, g: 0.7801145, b: 0.495283, a: 1}
m_Intensity: 0.56
m_Color: {r: 0.9528302, g: 0.58645785, b: 0.43596476, a: 1}
m_Intensity: 0.77
m_Range: 10
m_SpotAngle: 30
m_CookieSize: 10
Expand Down
75 changes: 75 additions & 0 deletions Assets/Scenes/mainMenu.unity
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ RectTransform:
- {fileID: 1468848311}
- {fileID: 1681204033}
- {fileID: 1912601359}
- {fileID: 1653538924}
m_Father: {fileID: 1297968611}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -5288,6 +5289,80 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1571952615}
m_CullTransparentMesh: 0
--- !u!1 &1653538923
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1653538924}
- component: {fileID: 1653538926}
- component: {fileID: 1653538925}
m_Layer: 5
m_Name: GameOverImage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &1653538924
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1653538923}
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: 508965105}
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: 0.67, y: -6}
m_SizeDelta: {x: 450, y: 1463}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1653538925
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1653538923}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 3b6190859fd9e2d4d9ba1caef1ca2fd6, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!222 &1653538926
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1653538923}
m_CullTransparentMesh: 0
--- !u!1 &1681204032
GameObject:
m_ObjectHideFlags: 0
Expand Down
14 changes: 14 additions & 0 deletions Assets/Scripts/GameSystemController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,20 @@ void Start () {
void Update () {
Text text = (Text)timeCounter.GetComponent<Text>();
text.text = "Counting: " + (int) timeElapsed;

if(timeElapsed > 60f)
{
GameObject.Find("Menu UI").GetComponent<GameOver>().isGameOver = true;
Text gameOverText = (Text)GameObject.Find("GameOverText").GetComponent<Text>();
gameOverText.text = "Out of time!";

GameObject.Find("TimeText").active = false;
GameObject.FindWithTag("GameOverImage").active = true;


}


}

// Update is called once per frame
Expand Down
4 changes: 2 additions & 2 deletions Assets/Textures/Clouds.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Assets/Textures/GameOver.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
132 changes: 132 additions & 0 deletions Assets/Textures/GameOver.png.meta

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

4 changes: 2 additions & 2 deletions Assets/Textures/GetHomeScreen.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 9c7280e

Please sign in to comment.