mindfulminun/FebGameJam
1
0
Fork 0
mirror of https://github.com/frizbee19/FebGameJam.git synced 2026-09-11 08:17:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto stash before revert of "Merge remote-tracking branch 'origin/main' into main"

Browse Source
This commit is contained in:
Rizvee
2022-02-26 01:53:09 -06:00
parent e3bfa843e5
commit d49638100e
2 changed files with 12 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scene 1 Assets/SpawnTrigger.cs
+11 -1
View File
@@ -9,6 +9,9 @@ public class SpawnTrigger : Trigger
[SerializeField] Vector2 startPos;
private GameObject clone;
private bool spawned;
[SerializeField] bool respawns = false;
[SerializeField] float respawnTime = 3f;
private float elapsed = 0f;
@@ -21,10 +24,17 @@ public class SpawnTrigger : Trigger
this.gameObject.SetActive(false);
}
public override void Action() {
if(!spawned) {
if(!spawned && !respawns) {
Debug.Log("spawn");
StartCoroutine(SpawnDespawn());
}
else if(respawns) {
if(elapsed < respawnTime) {
elapsed = 0;
StartCoroutine(SpawnDespawn());
}
}
}
// Start is called before the first frame update
UserSettings/EditorUserSettings.asset
+1 -48
View File
@@ -6,58 +6,11 @@ EditorUserSettings:
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedScenePath-0:
<<<<<<< Updated upstream
<<<<<<< HEAD
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663e21edf7302ba2cb33ffe2367f6d7717e1351027
value: 22424703114646680e0b0227036c7c0219001c396c1c23233967083debf42d
flags: 0
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663e21edf7302ba2cb33ffe2367129370bfb25
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663e21edf7302ba2cb33ffe2367129370bfb25
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663536ebe73c2cf1a71aecf13f33722c0ce6281d
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c7c0219001c396c1c23233967083debf42d
flags: 0
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c6f1c17031e253e256624283a097df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c71091503173a242724392c67083debf42d
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c7e0103160822232a2f31633c133af6f9
flags: 0
RecentlyUsedScenePath-9:
value: 22424703114646680e0b0227036c7d15181d116d3f6815332827187df7ee3d2cfb
=======
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663e21edf7302ba2cb33ffe2367129370bfb25
=======
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663932f0eb7414e7f133e5a92f31352d1b
>>>>>>> Stashed changes
flags: 0
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662f36e3ec740fedf53aeda92f31352d1b
flags: 0
<<<<<<< Updated upstream
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c7e0103160822232a2f31633c133af6f9
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c7c0219001c396c1c23233967083debf42d
flags: 0
RecentlyUsedScenePath-9:
value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb
>>>>>>> origin/main
flags: 0
=======
>>>>>>> Stashed changes
vcSharedLogLevel:
value: 0d5e400f0650
flags: 0