[Fix] Resolve Conflict
Showing
- Assets/Animation/GameOverClip.anim 985 additions, 157 deletionsAssets/Animation/GameOverClip.anim
- Assets/InputManager.meta 8 additions, 0 deletionsAssets/InputManager.meta
- Assets/InputManager/InputManager.preset 1343 additions, 0 deletionsAssets/InputManager/InputManager.preset
- Assets/InputManager/InputManager.preset.meta 8 additions, 0 deletionsAssets/InputManager/InputManager.preset.meta
- Assets/Prefabs/Weapons/Shotgun.prefab 39 additions, 8 deletionsAssets/Prefabs/Weapons/Shotgun.prefab
- Assets/Scenes/Level01.unity 439 additions, 12 deletionsAssets/Scenes/Level01.unity
- Assets/Scenes/MainMenu.unity 1180 additions, 36 deletionsAssets/Scenes/MainMenu.unity
- Assets/Scripts/Cheats/Cheats.cs 2 additions, 2 deletionsAssets/Scripts/Cheats/Cheats.cs
- Assets/Scripts/Global/Statistics.cs 21 additions, 0 deletionsAssets/Scripts/Global/Statistics.cs
- Assets/Scripts/Managers/LevelManager.cs 86 additions, 36 deletionsAssets/Scripts/Managers/LevelManager.cs
- Assets/Scripts/Managers/PetManager.cs 3 additions, 0 deletionsAssets/Scripts/Managers/PetManager.cs
- Assets/Scripts/Managers/ScoreManager.cs 2 additions, 10 deletionsAssets/Scripts/Managers/ScoreManager.cs
- Assets/Scripts/Managers/StatsManager.cs 51 additions, 0 deletionsAssets/Scripts/Managers/StatsManager.cs
- Assets/Scripts/Orbs/DamageOrb.cs 5 additions, 0 deletionsAssets/Scripts/Orbs/DamageOrb.cs
- Assets/Scripts/Orbs/HealOrb.cs 5 additions, 0 deletionsAssets/Scripts/Orbs/HealOrb.cs
- Assets/Scripts/Orbs/SpeedOrb.cs 5 additions, 0 deletionsAssets/Scripts/Orbs/SpeedOrb.cs
- Assets/Scripts/Player/PlayerCoin.cs 25 additions, 0 deletionsAssets/Scripts/Player/PlayerCoin.cs
- Assets/Scripts/Player/PlayerCoin.cs.meta 11 additions, 0 deletionsAssets/Scripts/Player/PlayerCoin.cs.meta
- Assets/Scripts/Player/PlayerMovement.cs 35 additions, 4 deletionsAssets/Scripts/Player/PlayerMovement.cs
- Assets/Scripts/ShopKeeper/CollisionDetection.cs 2 additions, 1 deletionAssets/Scripts/ShopKeeper/CollisionDetection.cs
Please register or sign in to comment