KittenBox/bullet-hell-jam-2022
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Final gamerjam state #1

Merged
JanGross merged 18 commits from dev into master 2022-04-30 14:38:07 +02:00
Conversation 0 Commits 18 Files Changed 328 +6909 -3
4 changed files with 6909 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fbdbe9c9bb - Show all commits

6899
Assets/Scenes/Main - minz.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Scenes/Main - minz.unity.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 9998199e1f08c8646a2fe7c130f5f696
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2
Assets/Scripts/Game/Pickups/BulletFreezeRemove.cs
View File

@@ -26,7 +26,7 @@ public class BulletFreezeRemove : Pickup
GameObject root = particleSystem.transform.root.gameObject; GameObject root = particleSystem.transform.root.gameObject;
if (!root.GetComponent<Pattern>()) if (!root.GetComponent<Pattern>())
{ {
return; continue;
} }
int particleCount = particleSystem.particleCount; int particleCount = particleSystem.particleCount;

4
Assets/Scripts/Game/Pickups/Extinguisher.cs
View File

@@ -21,7 +21,7 @@ public class Extinguisher : Pickup
for (int i = 0; i < particleCount; i++) for (int i = 0; i < particleCount; i++)
{ {
if (particles[i].remainingLifetime < particleSystem.main.startLifetime.constant * 0.5f) if (particles[i].remainingLifetime < particles[i].startLifetime * 0.95f)
{ {
particles[i].remainingLifetime = 0.0f; particles[i].remainingLifetime = 0.0f;
} }
@@ -37,7 +37,7 @@ public class Extinguisher : Pickup
for (int i = 0; i < count; i+=20) for (int i = 0; i < count; i+=20)
{ {
if (particles[i].remainingLifetime < system.main.startLifetime.constant * 0.5f) if (particles[i].remainingLifetime < particles[i].startLifetime * 0.95f)
{ {
//instantiate freeze particles at the position of the particle //instantiate freeze particles at the position of the particle
Instantiate(extinguishEffect, particles[i].position, Quaternion.identity); Instantiate(extinguishEffect, particles[i].position, Quaternion.identity);