myondev/MarisaMagicalStudy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

my HEAD hurts and the SFX is TOO LOUD

Browse source
This commit is contained in:
Sylvia 2026-04-26 21:49:57 -07:00
parent a3321d361c
commit d4ebf0ca61
41 changed files with 1465 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Assets/Scripts/Entities/Enemy/Enemy.cs
View file

@ -118,6 +118,7 @@ public class Enemy : Entity
protected override void OnKillEffects()
{
Destroy(gameObject);
OnKill?.Invoke();
foreach (UpgradeDrop drop in possibleDrops)
{
DropUpgrade(drop);

8
Assets/Scripts/Entities/Enemy/EnemySpawner.cs
View file

@ -28,7 +28,8 @@ public class EnemySpawner : MonoBehaviour
public List<Transform> spawnPoints;
public float spawnRate;
[SerializeField] private float currentSpawnTime;
[Header("Boss")]
[Header("Boss")]
private bool bossSpawned = false;
public Enemy bossEnemy;
private Enemy bossEnemyInstance;
public Transform bossSpawnPoint;
@ -54,14 +55,14 @@ public class EnemySpawner : MonoBehaviour
SpawnEnemy(enemiesToSpawn[Random.Range(0, enemiesToSpawn.Length)], spawnPoints[Random.Range(0, spawnPoints.Count)].position);
}
}
else if (!canSpawn && bossEnemy.health < 0)
else if (bossSpawned && !bossEnemyInstance)
{
if (Input.GetKey(KeyCode.E))
{
LevelSwitcher.instance.LoadShop();
}
}
enemyLevel = (int)(Time.time / levelUpIntervals); //figure out the time.time thing because that's not gonna work here
enemyLevel = (int)(Time.time / levelUpIntervals) + 1; //figure out the time.time thing because that's not gonna work here
}
public Enemy SpawnEnemy(Enemy enemy, Vector3 location)
@ -79,6 +80,7 @@ public class EnemySpawner : MonoBehaviour
canSpawn = false;
Enemy.OnDamaged += UpdateBossHealthBar; //this kinda sucks but it technically works??
bossNameText.text = bossEnemyInstance.entityName;
bossSpawned = true;
}
private void UpdateBossHealthBar()