diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs index 0122b50..f035c0d 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs @@ -6,18 +6,21 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using DangerousD.GameCore.GameObjects.PlayerDeath; +using Microsoft.Xna.Framework.Input; namespace DangerousD.GameCore.GameObjects.LivingEntities { public class Player : LivingEntity { bool isAlive = true; + public int health; public Player(Vector2 position) : base(position) { Width = 32; Height = 64; - AppManager.Instance.InputManager.MovEventJump += AnimationJump; - + AppManager.Instance.InputManager.MovEventJump += Jump; + AppManager.Instance.InputManager.ShootEvent += Shoot; + } public bool IsAlive { get { return isAlive; } } @@ -43,9 +46,17 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities } isAlive = false; } - public void AnimationJump() + public void Jump() { - velocity.Y = -300; + if (Keyboard.GetState().IsKeyDown(Keys.Escape)) + { + velocity.Y = -300; + } + // здесь будет анимация + } + public void Shoot() + { + } } } diff --git a/DangerousD/GameCore/Managers/SoundManager.cs b/DangerousD/GameCore/Managers/SoundManager.cs index ffa61d2..75758e8 100644 --- a/DangerousD/GameCore/Managers/SoundManager.cs +++ b/DangerousD/GameCore/Managers/SoundManager.cs @@ -19,10 +19,16 @@ namespace DangerousD.GameCore public void LoadSounds() // метод для загрузки звуков из папки { - string[] soundFiles = Directory.GetFiles("../../../Content").Where(x=>x.EndsWith("mp3")).Select(x=>x.Split("\\").Last().Replace(".mp3", "")).ToArray();// папка со звуками там где exe - foreach (var soundFile in soundFiles) + var k = Directory.GetFiles("../../..//Content").Where(x => x.EndsWith("mp3")); + if (k.Count() > 0) { - Sounds.Add(soundFile, AppManager.Instance.Content.Load(soundFile).CreateInstance()); + + string[] soundFiles = k.Select(x => x.Split("\\").Last().Split("/").Last().Replace(".mp3", "")).ToArray();// папка со звуками там где exe + foreach (var soundFile in soundFiles) + { + Sounds.Add(soundFile, AppManager.Instance.Content.Load(soundFile).CreateInstance()); + } + } } @@ -33,7 +39,7 @@ namespace DangerousD.GameCore sound.SoundEffect.IsLooped = false; sound.SoundEffect.Play(); PlayingSounds.Add(sound); - if (AppManager.Instance.multiPlayerStatus == MultiPlayerStatus.Host) + if (AppManager.Instance.multiPlayerStatus != MultiPlayerStatus.Host) { AppManager.Instance.NetworkManager.SendMsg(new Network.NetworkTask(Vector2.Zero, soundName)); } @@ -45,7 +51,7 @@ namespace DangerousD.GameCore sound.SoundEffect.Volume = (float)sound.GetDistance(playerPos) / MaxSoundDistance; sound.SoundEffect.Play(); PlayingSounds.Add(sound); - if (AppManager.Instance.multiPlayerStatus == MultiPlayerStatus.Host) + if (AppManager.Instance.multiPlayerStatus != MultiPlayerStatus.Host) { AppManager.Instance.NetworkManager.SendMsg(new Network.NetworkTask(soundPos, soundName)); }