diff --git a/Assets/Prefabs/Asteroid.prefab b/Assets/Prefabs/Asteroid.prefab index dccd30f1c5f14a811935885f85c14da9bc634a25..2ea8ec5b49a61a41999345cc740f7a1ca4fa2c08 100644 Binary files a/Assets/Prefabs/Asteroid.prefab and b/Assets/Prefabs/Asteroid.prefab differ diff --git a/Assets/Scripts/DestroyByContact.cs b/Assets/Scripts/DestroyByContact.cs index a66cff0de9f8f5958b7093b576382bb6e6fb34ae..dfcbcbf8389ffb8b635a11e3a0979e709f12109f 100644 --- a/Assets/Scripts/DestroyByContact.cs +++ b/Assets/Scripts/DestroyByContact.cs @@ -5,6 +5,21 @@ public class DestroyByContact : MonoBehaviour { public GameObject explosion; public GameObject playerExplosion; + public int scoreValue; + private GameController gameController; + + void Start () + { + GameObject gameControllerObject = GameObject.FindWithTag ("GameController"); + if (gameControllerObject != null) + { + gameController = gameControllerObject.GetComponent <GameController>(); + } + if (gameController == null) + { + Debug.Log ("Cannot find 'GameController' script"); + } + } void OnTriggerEnter(Collider other) { @@ -18,6 +33,7 @@ public class DestroyByContact : MonoBehaviour Instantiate(playerExplosion, other.transform.position, other.transform.rotation); //gameController.GameOver (); } + gameController.AddScore (scoreValue); Destroy(other.gameObject); Destroy(gameObject); } diff --git a/Assets/_Scenes/Main.unity b/Assets/_Scenes/Main.unity index 566ea0300ca03e87537c7fbe2094ca2801937876..27dca43cd6045163e5b3993d3cd863dda5e5582d 100644 Binary files a/Assets/_Scenes/Main.unity and b/Assets/_Scenes/Main.unity differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll index 986cd1006054199614e7b0d7cf474c4ba5d3556a..87f768d1e049ff3c92c911c1c1a720357081de90 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll and b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll b/Library/ScriptAssemblies/Assembly-CSharp.dll index 7216767f74adecb4218e9a988c692dbebe95b471..1cb3a101c6a182ae765b440e6ce0fc73a6268e7e 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp.dll and b/Library/ScriptAssemblies/Assembly-CSharp.dll differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp.pdb b/Library/ScriptAssemblies/Assembly-CSharp.pdb index 812f977825d1eb400e755fa1e61b3453c5df16b9..6b4fc26b53c7c32b7a58bb379e072f786ae3ca2b 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp.pdb and b/Library/ScriptAssemblies/Assembly-CSharp.pdb differ diff --git a/Library/StateCache/Hierarchy/e13ca3-d158c5a849ce3aa468.json b/Library/StateCache/Hierarchy/e13ca3-d158c5a849ce3aa468.json new file mode 100644 index 0000000000000000000000000000000000000000..aebf6bcfa9d1c58c79f09fca0f06756a26f90d58 --- /dev/null +++ b/Library/StateCache/Hierarchy/e13ca3-d158c5a849ce3aa468.json @@ -0,0 +1 @@ +{"m_ExpandedPrefabGameObjectFileIDs":[7622379623738204410],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":7622379623738204410,"m_LastClickedInstanceID":0} \ No newline at end of file diff --git a/Library/StateCache/Hierarchy/e13ca3-mainStage.json b/Library/StateCache/Hierarchy/e13ca3-mainStage.json index 965b804a1e8df506a827b7c609f159db14c38e74..1413e859c4b57be311a0cc88bceb8da04175ec6e 100644 --- a/Library/StateCache/Hierarchy/e13ca3-mainStage.json +++ b/Library/StateCache/Hierarchy/e13ca3-mainStage.json @@ -1 +1 @@ -{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-1086],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":-2560} \ No newline at end of file +{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-1086],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":10556} \ No newline at end of file diff --git a/Library/StateCache/SceneView/0e8d04-d158c5a849ce3aa468.json b/Library/StateCache/SceneView/0e8d04-d158c5a849ce3aa468.json new file mode 100644 index 0000000000000000000000000000000000000000..006d0ab883900d2363a0c9312e020ed868627c01 --- /dev/null +++ b/Library/StateCache/SceneView/0e8d04-d158c5a849ce3aa468.json @@ -0,0 +1 @@ +{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":false,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":false,"pivot":{"x":0.0,"y":0.0,"z":8.0},"rotation":{"x":0.31933510303497317,"y":-0.28784000873565676,"z":0.10246795415878296,"w":0.8970360159873962},"size":3.3642685413360597,"orthographic":false} \ No newline at end of file diff --git a/Library/assetDatabase3 b/Library/assetDatabase3 index 5f38c15760bac1011550206b5a961a0e592cbc39..ad23b5c6015454e4db8481333259f0fb81c94df6 100644 Binary files a/Library/assetDatabase3 and b/Library/assetDatabase3 differ diff --git a/Library/metadata/2e/2e09832c6ef66fe419c6f1fe019a7034 b/Library/metadata/2e/2e09832c6ef66fe419c6f1fe019a7034 index 4abb1a3ae6256cdc7a76a55f9b878c197350b059..f49b684bcf9cf2c5d9ef4bb18afadfb33b7e07f0 100644 Binary files a/Library/metadata/2e/2e09832c6ef66fe419c6f1fe019a7034 and b/Library/metadata/2e/2e09832c6ef66fe419c6f1fe019a7034 differ diff --git a/Library/metadata/d1/d158c5a849ce3aa4685ece3e9d19c905 b/Library/metadata/d1/d158c5a849ce3aa4685ece3e9d19c905 index e53dfb48ee8ba55a78019fc86744083376750ef1..503f182604829ef81fa91c5846825f029506e62c 100644 Binary files a/Library/metadata/d1/d158c5a849ce3aa4685ece3e9d19c905 and b/Library/metadata/d1/d158c5a849ce3aa4685ece3e9d19c905 differ diff --git a/Library/shadercompiler-UnityShaderCompiler.exe0.log b/Library/shadercompiler-UnityShaderCompiler.exe0.log index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..72188def2ed75e13a84ada6124c2ab115a10b1f6 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe0.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe0.log @@ -0,0 +1,7 @@ +Base path: C:/Program Files/Unity/Editor/Data +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler