input fix, but color bug

AdronTech · Jan 22, 2017 · e2e6b67 · e2e6b67
1 parent 57b1b68
commit e2e6b67
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 21 deletions.
diff --git a/GGJ17/Assets/Prefab/Psi.prefab b/GGJ17/Assets/Prefab/Psi.prefab
diff --git a/GGJ17/Assets/Prefab/PsiRed.prefab b/GGJ17/Assets/Prefab/PsiRed.prefab
diff --git a/GGJ17/Assets/Scene/MainScene.unity b/GGJ17/Assets/Scene/MainScene.unity
diff --git 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
@@ -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
@@ -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
@@ -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