diff --git a/.gitignore b/.gitignore index 059be1f..5d8d9cb 100644 --- a/.gitignore +++ b/.gitignore @@ -32,4 +32,11 @@ sysinfo.txt # Builds *.apk -*.unitypackage \ No newline at end of file +*.unitypackage +*.prefab +*.meta +*.bin +*.info +*.bakert +*.tar +*.backup diff --git a/singleTap/SingleTap/Assets/Prefabs/Enemy.prefab b/singleTap/SingleTap/Assets/Prefabs/Enemy.prefab deleted file mode 100644 index ffc7d8a..0000000 Binary files a/singleTap/SingleTap/Assets/Prefabs/Enemy.prefab and /dev/null differ diff --git a/singleTap/SingleTap/Assets/Prefabs/Enemy.prefab.meta b/singleTap/SingleTap/Assets/Prefabs/Enemy.prefab.meta deleted file mode 100644 index ba1fb3e..0000000 --- a/singleTap/SingleTap/Assets/Prefabs/Enemy.prefab.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9c3bdc3cf0409b244bd3d018994f45bb -timeCreated: 1471493774 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/singleTap/SingleTap/Assets/Prefabs/EnemyMissile.prefab.meta b/singleTap/SingleTap/Assets/Prefabs/EnemyMissile.prefab.meta deleted file mode 100644 index 32f6a44..0000000 --- a/singleTap/SingleTap/Assets/Prefabs/EnemyMissile.prefab.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2faa0c07c34e0814992d73b936cd5d07 -timeCreated: 1471242540 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/singleTap/SingleTap/Assets/Prefabs/Mover.prefab b/singleTap/SingleTap/Assets/Prefabs/Mover.prefab deleted file mode 100644 index 836ded4..0000000 Binary files a/singleTap/SingleTap/Assets/Prefabs/Mover.prefab and /dev/null differ diff --git a/singleTap/SingleTap/Assets/Prefabs/Mover.prefab.meta b/singleTap/SingleTap/Assets/Prefabs/Mover.prefab.meta deleted file mode 100644 index e76b3af..0000000 --- a/singleTap/SingleTap/Assets/Prefabs/Mover.prefab.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3cce71904fda3cd4a8a338b2cfa6c9bf -timeCreated: 1471493768 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/singleTap/SingleTap/Assets/Prefabs/bullet.prefab.meta b/singleTap/SingleTap/Assets/Prefabs/bullet.prefab.meta deleted file mode 100644 index f69de29..0000000 --- a/singleTap/SingleTap/Assets/Prefabs/bullet.prefab.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 437784b7e6a16fa47b262a7845234e4a -timeCreated: 1470889438 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/singleTap/SingleTap/Assets/Prefabs/explosion 1.prefab b/singleTap/SingleTap/Assets/Prefabs/explosion 1.prefab deleted file mode 100644 index 4fb8b84..0000000 Binary files a/singleTap/SingleTap/Assets/Prefabs/explosion 1.prefab and /dev/null differ diff --git a/singleTap/SingleTap/Assets/Prefabs/explosion 1.prefab.meta b/singleTap/SingleTap/Assets/Prefabs/explosion 1.prefab.meta deleted file mode 100644 index 2befe50..0000000 --- a/singleTap/SingleTap/Assets/Prefabs/explosion 1.prefab.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 61a40ddea037e1442928296063bc82b4 -timeCreated: 1471485417 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/singleTap/SingleTap/Assets/Scripts/EnemyController.cs b/singleTap/SingleTap/Assets/Scripts/EnemyController.cs index 48a65cf..4520d12 100644 --- a/singleTap/SingleTap/Assets/Scripts/EnemyController.cs +++ b/singleTap/SingleTap/Assets/Scripts/EnemyController.cs @@ -41,8 +41,9 @@ public class EnemyController : InteractableObject { GameObject bulletClone = (GameObject)Instantiate(bullet, transform.position, transform.rotation); MissileController bulletScript = bulletClone.GetComponent(); bulletScript.startVelocity = startVelocity; - - bulletScript.targetPos = player.transform.position; + + if (player != null) + bulletScript.targetPos = player.transform.position; bulletScript.target = player; bulletScript.targetRigid = playerRigid; bulletScript.ignoreList = GetComponentsInChildren(); diff --git a/singleTap/SingleTap/Assets/Scripts/MissileController.cs b/singleTap/SingleTap/Assets/Scripts/MissileController.cs index 3a9447e..24f912b 100644 --- a/singleTap/SingleTap/Assets/Scripts/MissileController.cs +++ b/singleTap/SingleTap/Assets/Scripts/MissileController.cs @@ -9,6 +9,8 @@ public class MissileController : MonoBehaviour { public float initVelocity = 5; public float boostCoolDown = 0.3f; public float difficulty = 0.0f; + public int totalBoosts = 2; + public ParticleSystem boostEffect; public GameObject Explosion; @@ -42,20 +44,20 @@ public class MissileController : MonoBehaviour { rigid = GetComponent(); rigid.velocity = startVelocity * initVelocity; - Destroy(gameObject, 1.5f); + Destroy(gameObject, boostCoolDown * totalBoosts + 1); } // Update is called once per frame void FixedUpdate () { - if (Time.time - startTime >= boostCoolDown && reCalibrate < 2) { + if (Time.time - startTime >= boostCoolDown && reCalibrate < totalBoosts) { if (reCalibrate == 0) { - targetPos = target.transform.position; + if (target != null) { + targetPos = target.transform.position; + } } if (target != null) { moveTorwards(target); - } else { - moveTorwards(targetPos); } reCalibrate++; startTime = Time.time; @@ -79,6 +81,9 @@ public class MissileController : MonoBehaviour { } private void moveTorwards(GameObject target) { + if (target == null) + return; + if (targetRigid != null && reCalibrate == 1) { Debug.DrawLine(targetPos, target.transform.position, Color.blue, 0.3f); Vector2 pos = Vector3.Lerp( targetPos,target.transform.position,difficulty); diff --git a/singleTap/SingleTap/Assets/Utility/FPSDisplay.cs b/singleTap/SingleTap/Assets/Utility/FPSDisplay.cs new file mode 100644 index 0000000..5f01a80 --- /dev/null +++ b/singleTap/SingleTap/Assets/Utility/FPSDisplay.cs @@ -0,0 +1,29 @@ +#if UNITY_EDITOR + +using UnityEngine; +using System.Collections; + +public class FPSDisplay : MonoBehaviour { + float deltaTime = 0.0f; + + void Update() { + deltaTime += (Time.deltaTime - deltaTime) * 0.1f; + } + + void OnGUI() { + int w = Screen.width, h = Screen.height; + + GUIStyle style = new GUIStyle(); + + Rect rect = new Rect(0, 0, w, h * 2 / 100); + style.alignment = TextAnchor.UpperLeft; + style.fontSize = h * 2 / 100; + style.normal.textColor = new Color(0.0f, 0.0f, 0.5f, 1.0f); + float msec = deltaTime * 1000.0f; + float fps = 1.0f / deltaTime; + string text = string.Format("{0:0.0} ms ({1:0.} fps)", msec, fps); + GUI.Label(rect, text, style); + } +} + + #endif \ No newline at end of file diff --git a/singleTap/SingleTap/Assets/Prefabs/EnemyMissile.prefab b/singleTap/SingleTap/Assets/_Scenes/Level2.unity similarity index 59% rename from singleTap/SingleTap/Assets/Prefabs/EnemyMissile.prefab rename to singleTap/SingleTap/Assets/_Scenes/Level2.unity index 08c9d7a..1e4e9ef 100644 Binary files a/singleTap/SingleTap/Assets/Prefabs/EnemyMissile.prefab and b/singleTap/SingleTap/Assets/_Scenes/Level2.unity differ diff --git a/singleTap/SingleTap/ProjectSettings/TagManager.asset b/singleTap/SingleTap/ProjectSettings/TagManager.asset index 7286bc9..32917f4 100644 Binary files a/singleTap/SingleTap/ProjectSettings/TagManager.asset and b/singleTap/SingleTap/ProjectSettings/TagManager.asset differ