Merge branch 'fix/stage' into 'staging'
fix: initial stage See merge request !69
Showing
- Assets/Audio/Music/Safehouse.mp3 3 additions, 0 deletionsAssets/Audio/Music/Safehouse.mp3
- Assets/Audio/Music/Safehouse.mp3.meta 23 additions, 0 deletionsAssets/Audio/Music/Safehouse.mp3.meta
- Assets/Scenes/EntranceIntro/EntranceIntro.unity 1 addition, 1 deletionAssets/Scenes/EntranceIntro/EntranceIntro.unity
- Assets/Scenes/InitialStage.unity 7 additions, 2 deletionsAssets/Scenes/InitialStage.unity
- Assets/Scenes/MainMenu.unity 2 additions, 0 deletionsAssets/Scenes/MainMenu.unity
- Assets/Script/Audio/AudioManager.cs 29 additions, 0 deletionsAssets/Script/Audio/AudioManager.cs
- Assets/Script/CutScene1.cs 2 additions, 1 deletionAssets/Script/CutScene1.cs
- Assets/Script/Menu/GameOver.cs 6 additions, 1 deletionAssets/Script/Menu/GameOver.cs
- Assets/Script/Menu/MainMenu.cs 2 additions, 5 deletionsAssets/Script/Menu/MainMenu.cs
- Assets/Script/Menu/PauseMenu.cs 3 additions, 0 deletionsAssets/Script/Menu/PauseMenu.cs
- Assets/Script/Menu/StatisticsMenu.cs 6 additions, 1 deletionAssets/Script/Menu/StatisticsMenu.cs
- Assets/Script/Player/PlayerHealth.cs 1 addition, 0 deletionsAssets/Script/Player/PlayerHealth.cs
- Assets/Script/Player/PlayerInventory.cs 47 additions, 44 deletionsAssets/Script/Player/PlayerInventory.cs
- Assets/Script/SaveLoad/SaveSystem.cs 0 additions, 2 deletionsAssets/Script/SaveLoad/SaveSystem.cs
- Assets/Script/Shop/Shop.cs 2 additions, 2 deletionsAssets/Script/Shop/Shop.cs
- Assets/Script/Stage/Stage.cs 25 additions, 4 deletionsAssets/Script/Stage/Stage.cs
- Assets/Script/Stage/StageManager.cs 9 additions, 4 deletionsAssets/Script/Stage/StageManager.cs
- Assets/Script/Weapon/GunSystem.cs 1 addition, 0 deletionsAssets/Script/Weapon/GunSystem.cs
- Assets/Timeline/EntranceIntro.playable 213 additions, 20 deletionsAssets/Timeline/EntranceIntro.playable
Please register or sign in to comment