Merge remote-tracking branch 'origin/main'
# Conflicts: # Assets/Scenes/Level02/Level 02.unity
Showing
- Assets/Scenes/Level02/Level 02.unity 319 additions, 233 deletionsAssets/Scenes/Level02/Level 02.unity
- Assets/Scenes/Level04/Level 04.unity 8 additions, 5 deletionsAssets/Scenes/Level04/Level 04.unity
- Assets/Scenes/Menu/Option.unity 170 additions, 15 deletionsAssets/Scenes/Menu/Option.unity
- Assets/Scripts/EnemyR/MobSpawner.cs 1 addition, 1 deletionAssets/Scripts/EnemyR/MobSpawner.cs
- Assets/Scripts/Menu/SoundMenu.cs 35 additions, 0 deletionsAssets/Scripts/Menu/SoundMenu.cs
- Assets/Scripts/Menu/SoundMenu.cs.meta 11 additions, 0 deletionsAssets/Scripts/Menu/SoundMenu.cs.meta
Please register or sign in to comment