diff --git a/GGJ17/Assets/Prefab/Psi.prefab b/GGJ17/Assets/Prefab/Psi.prefab index eb19e2b..669b288 100644 Binary files a/GGJ17/Assets/Prefab/Psi.prefab and b/GGJ17/Assets/Prefab/Psi.prefab differ diff --git a/GGJ17/Assets/Prefab/PsiRed.prefab b/GGJ17/Assets/Prefab/PsiRed.prefab index 9df6f7f..9431b1f 100644 Binary files a/GGJ17/Assets/Prefab/PsiRed.prefab and b/GGJ17/Assets/Prefab/PsiRed.prefab differ diff --git a/GGJ17/Assets/Scene/MainScene.unity b/GGJ17/Assets/Scene/MainScene.unity index 2b4143b..63e172c 100644 Binary files a/GGJ17/Assets/Scene/MainScene.unity and b/GGJ17/Assets/Scene/MainScene.unity differ diff --git a/GGJ17/Assets/Script/GameOverScreen/gameOverInput.cs b/GGJ17/Assets/Script/GameOverScreen/gameOverInput.cs index d7c9067..c4dc0e2 100644 --- a/GGJ17/Assets/Script/GameOverScreen/gameOverInput.cs +++ b/GGJ17/Assets/Script/GameOverScreen/gameOverInput.cs @@ -16,11 +16,6 @@ void Start() sceneStartTime = Time.time; } - void Awake() - { - sceneStartTime = Time.time; - } - // Update is called once per frame void Update() { diff --git a/GGJ17/Assets/Script/GameOverScreen/gameOverSpawner.cs b/GGJ17/Assets/Script/GameOverScreen/gameOverSpawner.cs index f5fbad4..1859763 100644 --- a/GGJ17/Assets/Script/GameOverScreen/gameOverSpawner.cs +++ b/GGJ17/Assets/Script/GameOverScreen/gameOverSpawner.cs @@ -8,10 +8,12 @@ public class gameOverSpawner : MonoBehaviour public GameObject psiPrefab; public float spawnDuration; public float waitBetween; + private float sceneStartTime; // Use this for initialization void Start() { + sceneStartTime = Time.time; StartCoroutine(PsiRain(psiPrefab)); } @@ -23,6 +25,6 @@ IEnumerator PsiRain(GameObject prefab) Random.Range(0f, 360f), Random.Range(0f, 360f)))); yield return new WaitForSeconds(waitBetween); - } while (spawnDuration > Time.time); + } while (spawnDuration > Time.time - sceneStartTime); } } diff --git a/GGJ17/Assets/Script/TitleScreen/titleInput.cs b/GGJ17/Assets/Script/TitleScreen/titleInput.cs index 3ce0fa6..7ae110e 100644 --- a/GGJ17/Assets/Script/TitleScreen/titleInput.cs +++ b/GGJ17/Assets/Script/TitleScreen/titleInput.cs @@ -16,11 +16,6 @@ void Start() sceneStartTime = Time.time; } - void Awake() - { - sceneStartTime = Time.time; - } - // Update is called once per frame void Update() { diff --git a/GGJ17/Assets/Script/TitleScreen/titleSpawner.cs b/GGJ17/Assets/Script/TitleScreen/titleSpawner.cs index 442cd39..c6f762d 100644 --- a/GGJ17/Assets/Script/TitleScreen/titleSpawner.cs +++ b/GGJ17/Assets/Script/TitleScreen/titleSpawner.cs @@ -8,10 +8,12 @@ public class titleSpawner : MonoBehaviour public GameObject psiPrefab; public float spawnDuration; public float waitBetween; + private float sceneStartTime; // Use this for initialization void Start() { + sceneStartTime = Time.time; StartCoroutine(PsiRain(psiPrefab)); } @@ -23,6 +25,6 @@ IEnumerator PsiRain(GameObject prefab) Random.Range(0f, 360f), Random.Range(0f, 360f)))); yield return new WaitForSeconds(waitBetween); - } while (spawnDuration > Time.time); + } while (spawnDuration > Time.time - sceneStartTime); } } diff --git a/GGJ17/Assets/Script/WorldControl.meta b/GGJ17/Assets/Script/WorldControl.meta deleted file mode 100644 index a651a32..0000000 --- a/GGJ17/Assets/Script/WorldControl.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 026ecd435f5e8484da51e65011b7b01b -folderAsset: yes -timeCreated: 1485043945 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: