diff --git a/ShipShooter/Assets/Scenes/GameScene.unity b/ShipShooter/Assets/Scenes/GameScene.unity index 7eec008b..060511f4 100644 Binary files a/ShipShooter/Assets/Scenes/GameScene.unity and b/ShipShooter/Assets/Scenes/GameScene.unity differ diff --git a/ShipShooter/Assets/Scenes/ShipLose.unity b/ShipShooter/Assets/Scenes/ShipLose.unity new file mode 100644 index 00000000..c6ce1e53 Binary files /dev/null and b/ShipShooter/Assets/Scenes/ShipLose.unity differ diff --git a/ShipShooter/Assets/Scenes/ShipLose.unity.meta b/ShipShooter/Assets/Scenes/ShipLose.unity.meta new file mode 100644 index 00000000..dd36420f --- /dev/null +++ b/ShipShooter/Assets/Scenes/ShipLose.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d863e1c73ffb0ef4a82e3ec40ab2f103 +timeCreated: 1447116891 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/ShipShooter/Assets/Scenes/ShipMenu.unity b/ShipShooter/Assets/Scenes/ShipMenu.unity new file mode 100644 index 00000000..16ba738f Binary files /dev/null and b/ShipShooter/Assets/Scenes/ShipMenu.unity differ diff --git a/ShipShooter/Assets/Scenes/ShipMenu.unity.meta b/ShipShooter/Assets/Scenes/ShipMenu.unity.meta new file mode 100644 index 00000000..a6ff0bc2 --- /dev/null +++ b/ShipShooter/Assets/Scenes/ShipMenu.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a6f9349b34c22f541851dd408139262c +timeCreated: 1447116873 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/ShipShooter/Assets/Scenes/ShipWin.unity b/ShipShooter/Assets/Scenes/ShipWin.unity new file mode 100644 index 00000000..c6ce1e53 Binary files /dev/null and b/ShipShooter/Assets/Scenes/ShipWin.unity differ diff --git a/ShipShooter/Assets/Scenes/ShipWin.unity.meta b/ShipShooter/Assets/Scenes/ShipWin.unity.meta new file mode 100644 index 00000000..7c5aa152 --- /dev/null +++ b/ShipShooter/Assets/Scenes/ShipWin.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 87ec0692c3ffe0a4f9f04b79772bc1ec +timeCreated: 1447116887 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/ShipShooter/Assets/Scripts/Boundries.cs b/ShipShooter/Assets/Scripts/Boundries.cs new file mode 100644 index 00000000..23f5b774 --- /dev/null +++ b/ShipShooter/Assets/Scripts/Boundries.cs @@ -0,0 +1,25 @@ +using UnityEngine; +using System.Collections; + +public class Boundries : MonoBehaviour +{ + void OnCollisionEnter(Collision collision) + { + if (collision.gameObject.CompareTag("EnemyBullet")) + { + Destroy(collision.gameObject); + + } + + if (collision.gameObject.CompareTag("Enemy")) + { + Destroy(collision.gameObject); + + } + if (collision.gameObject.CompareTag("Bullet")) + { + Destroy(collision.gameObject); + + } + } +} diff --git a/ShipShooter/Assets/Scripts/Boundries.cs.meta b/ShipShooter/Assets/Scripts/Boundries.cs.meta new file mode 100644 index 00000000..92fe0cc9 --- /dev/null +++ b/ShipShooter/Assets/Scripts/Boundries.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 9d14285d45a82d5438c55b502fcd8aee +timeCreated: 1447115632 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ShipShooter/Assets/Scripts/Enemy1.cs b/ShipShooter/Assets/Scripts/Enemy1.cs index d1505597..0793d24b 100644 --- a/ShipShooter/Assets/Scripts/Enemy1.cs +++ b/ShipShooter/Assets/Scripts/Enemy1.cs @@ -7,6 +7,7 @@ public class Enemy1 : MonoBehaviour { public Vector3 enemyAngle = new Vector3(0, 90, 270); public float test; + public int testInt; //shooting ----------------------- public GameObject turret; @@ -27,12 +28,13 @@ public class Enemy1 : MonoBehaviour { void Update() { test = gameObject.transform.position.y; - //shooting--------------------------------------------------------------------------------- - posCanon = new Vector3(turret.transform.position.x, turret.transform.position.y - 0.5f, turret.transform.position.z); - if (test % 2 == 0) + testInt = Mathf.RoundToInt(test); + //shooting--------------------------------------------------------------------------------- + posCanon = new Vector3(turret.transform.position.x, turret.transform.position.y - 0.5f, turret.transform.position.z); + if (testInt % 2 == 0) { newBullet = (GameObject)Instantiate(bullet, posCanon, transform.rotation); - iTween.MoveTo(posCanon, new Vector3(posCanon.transform.position.x, posCanon.transform.position.y - 20, 5), 1); + iTween.MoveTo(newBullet, new Vector3(newBullet.transform.position.x, newBullet.transform.position.y - 40, 5), 1); } diff --git a/ShipShooter/Assets/Scripts/PlayerHealth.cs b/ShipShooter/Assets/Scripts/PlayerHealth.cs index e1aff6a6..c29b77bd 100644 --- a/ShipShooter/Assets/Scripts/PlayerHealth.cs +++ b/ShipShooter/Assets/Scripts/PlayerHealth.cs @@ -62,6 +62,10 @@ public class PlayerHealth : MonoBehaviour { } } + if (playerHealth == 0) + { + } + //Start----------------------------------------------------------- void Start() { diff --git a/ShipShooter/Library/CurrentLayout.dwlt b/ShipShooter/Library/CurrentLayout.dwlt index fb78a581..e48bebab 100644 Binary files a/ShipShooter/Library/CurrentLayout.dwlt and b/ShipShooter/Library/CurrentLayout.dwlt differ diff --git a/ShipShooter/Library/EditorUserBuildSettings.asset b/ShipShooter/Library/EditorUserBuildSettings.asset index 46c8185c..8b5276ff 100644 Binary files a/ShipShooter/Library/EditorUserBuildSettings.asset and b/ShipShooter/Library/EditorUserBuildSettings.asset differ diff --git a/ShipShooter/Library/InspectorExpandedItems.asset b/ShipShooter/Library/InspectorExpandedItems.asset index 63d0fb41..c1af6d17 100644 Binary files a/ShipShooter/Library/InspectorExpandedItems.asset and b/ShipShooter/Library/InspectorExpandedItems.asset differ diff --git a/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb b/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb index 058159ac..b452b3c6 100644 Binary files a/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb and b/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb differ diff --git a/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb index f9a733c1..f1aa4c0f 100644 Binary files a/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb and b/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb differ diff --git a/ShipShooter/Library/assetDatabase3 b/ShipShooter/Library/assetDatabase3 index 62a12088..f49e13b7 100644 Binary files a/ShipShooter/Library/assetDatabase3 and b/ShipShooter/Library/assetDatabase3 differ diff --git a/ShipShooter/Library/expandedItems b/ShipShooter/Library/expandedItems index 7e5353bd..038264dc 100644 Binary files a/ShipShooter/Library/expandedItems and b/ShipShooter/Library/expandedItems differ diff --git a/ShipShooter/Library/metadata/00/00000000000000003000000000000000 b/ShipShooter/Library/metadata/00/00000000000000003000000000000000 index f7cb19c0..0ee8c99e 100644 Binary files a/ShipShooter/Library/metadata/00/00000000000000003000000000000000 and b/ShipShooter/Library/metadata/00/00000000000000003000000000000000 differ diff --git a/ShipShooter/Library/metadata/00/00000000000000004000000000000000 b/ShipShooter/Library/metadata/00/00000000000000004000000000000000 index 11761eaf..3b46ef8d 100644 Binary files a/ShipShooter/Library/metadata/00/00000000000000004000000000000000 and b/ShipShooter/Library/metadata/00/00000000000000004000000000000000 differ diff --git a/ShipShooter/Library/metadata/00/0000000000000000b000000000000000 b/ShipShooter/Library/metadata/00/0000000000000000b000000000000000 index b17320d3..4ffa2102 100644 Binary files a/ShipShooter/Library/metadata/00/0000000000000000b000000000000000 and b/ShipShooter/Library/metadata/00/0000000000000000b000000000000000 differ diff --git a/ShipShooter/Library/metadata/3d/3d6f92a605a842645b772002f4f174a9 b/ShipShooter/Library/metadata/3d/3d6f92a605a842645b772002f4f174a9 index 1d5fd66e..780b3993 100644 Binary files a/ShipShooter/Library/metadata/3d/3d6f92a605a842645b772002f4f174a9 and b/ShipShooter/Library/metadata/3d/3d6f92a605a842645b772002f4f174a9 differ diff --git a/ShipShooter/Library/metadata/87/87ec0692c3ffe0a4f9f04b79772bc1ec b/ShipShooter/Library/metadata/87/87ec0692c3ffe0a4f9f04b79772bc1ec new file mode 100644 index 00000000..cac23d16 Binary files /dev/null and b/ShipShooter/Library/metadata/87/87ec0692c3ffe0a4f9f04b79772bc1ec differ diff --git a/ShipShooter/Library/metadata/87/87ec0692c3ffe0a4f9f04b79772bc1ec.info b/ShipShooter/Library/metadata/87/87ec0692c3ffe0a4f9f04b79772bc1ec.info new file mode 100644 index 00000000..199fbacf Binary files /dev/null and b/ShipShooter/Library/metadata/87/87ec0692c3ffe0a4f9f04b79772bc1ec.info differ diff --git a/ShipShooter/Library/metadata/9d/9d14285d45a82d5438c55b502fcd8aee b/ShipShooter/Library/metadata/9d/9d14285d45a82d5438c55b502fcd8aee new file mode 100644 index 00000000..a6464e22 Binary files /dev/null and b/ShipShooter/Library/metadata/9d/9d14285d45a82d5438c55b502fcd8aee differ diff --git a/ShipShooter/Library/metadata/9d/9d14285d45a82d5438c55b502fcd8aee.info b/ShipShooter/Library/metadata/9d/9d14285d45a82d5438c55b502fcd8aee.info new file mode 100644 index 00000000..8e3cfe7f Binary files /dev/null and b/ShipShooter/Library/metadata/9d/9d14285d45a82d5438c55b502fcd8aee.info differ diff --git a/ShipShooter/Library/metadata/a6/a6f9349b34c22f541851dd408139262c b/ShipShooter/Library/metadata/a6/a6f9349b34c22f541851dd408139262c new file mode 100644 index 00000000..78e9000c Binary files /dev/null and b/ShipShooter/Library/metadata/a6/a6f9349b34c22f541851dd408139262c differ diff --git a/ShipShooter/Library/metadata/a6/a6f9349b34c22f541851dd408139262c.info b/ShipShooter/Library/metadata/a6/a6f9349b34c22f541851dd408139262c.info new file mode 100644 index 00000000..2cd0de76 Binary files /dev/null and b/ShipShooter/Library/metadata/a6/a6f9349b34c22f541851dd408139262c.info differ diff --git a/ShipShooter/Library/metadata/b3/b3fbc82f895666d44928830fde115913 b/ShipShooter/Library/metadata/b3/b3fbc82f895666d44928830fde115913 index c9502ef7..f2e5baba 100644 Binary files a/ShipShooter/Library/metadata/b3/b3fbc82f895666d44928830fde115913 and b/ShipShooter/Library/metadata/b3/b3fbc82f895666d44928830fde115913 differ diff --git a/ShipShooter/Library/metadata/d8/d863e1c73ffb0ef4a82e3ec40ab2f103 b/ShipShooter/Library/metadata/d8/d863e1c73ffb0ef4a82e3ec40ab2f103 new file mode 100644 index 00000000..59e04ebf Binary files /dev/null and b/ShipShooter/Library/metadata/d8/d863e1c73ffb0ef4a82e3ec40ab2f103 differ diff --git a/ShipShooter/Library/metadata/d8/d863e1c73ffb0ef4a82e3ec40ab2f103.info b/ShipShooter/Library/metadata/d8/d863e1c73ffb0ef4a82e3ec40ab2f103.info new file mode 100644 index 00000000..5459341d Binary files /dev/null and b/ShipShooter/Library/metadata/d8/d863e1c73ffb0ef4a82e3ec40ab2f103.info differ diff --git a/ShipShooter/ProjectSettings/EditorBuildSettings.asset b/ShipShooter/ProjectSettings/EditorBuildSettings.asset index 99f74cd2..809d55b8 100644 Binary files a/ShipShooter/ProjectSettings/EditorBuildSettings.asset and b/ShipShooter/ProjectSettings/EditorBuildSettings.asset differ diff --git a/ShipShooter/ProjectSettings/TagManager.asset b/ShipShooter/ProjectSettings/TagManager.asset index fb714f3b..d892c43f 100644 Binary files a/ShipShooter/ProjectSettings/TagManager.asset and b/ShipShooter/ProjectSettings/TagManager.asset differ diff --git a/ShipShooter/ShipShooter.CSharp.csproj b/ShipShooter/ShipShooter.CSharp.csproj index 4415fa0d..f58634a2 100644 --- a/ShipShooter/ShipShooter.CSharp.csproj +++ b/ShipShooter/ShipShooter.CSharp.csproj @@ -69,6 +69,7 @@ +