diff --git a/AnimationsFileCreator/AnimationsFileCreator.csproj b/AnimationsFileCreator/AnimationsFileCreator.csproj index d344fbe..296b0a7 100644 --- a/AnimationsFileCreator/AnimationsFileCreator.csproj +++ b/AnimationsFileCreator/AnimationsFileCreator.csproj @@ -3,7 +3,6 @@ Exe net6.0 - true diff --git a/AnimationsFileCreator/Program.cs b/AnimationsFileCreator/Program.cs index 9a712a0..0eae948 100644 --- a/AnimationsFileCreator/Program.cs +++ b/AnimationsFileCreator/Program.cs @@ -2,7 +2,6 @@ using Microsoft.Xna.Framework; using Newtonsoft.Json; using System; -using System.Windows.Forms; using System.IO; using System.Linq; using System.Reflection.Metadata; @@ -17,13 +16,7 @@ namespace AnimationsFileCreator Console.WriteLine("Добро пожаловать в костыльную программу по созданию файлов анимации для игры DungerousD"); Console.Write("Введите название текстуры (нажмите enter, чтобы выбрать файл во всплывающем окошке): "); string textureName = Console.ReadLine(); - if (textureName == "") - { - OpenFileDialog dialog = new OpenFileDialog(); - dialog.ShowDialog(); - textureName = dialog.FileName.Split('\\').Last(); - textureName = textureName.Split('.')[0]; - } + Console.WriteLine("Введите количество кадров анимации: "); int framesCount = int.Parse(Console.ReadLine()); Console.WriteLine("Введите длительность кадра в анимации: "); diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs index f1d047a..aa0ad89 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs @@ -93,7 +93,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities { if (a == "DeathFrom" + monsterName) { - AppManager.Instance.ChangeGameState(GameState.Death); + // AppManager.Instance.ChangeGameState(GameState.Death); } }; } @@ -101,10 +101,10 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities } public void Jump() { - if (isOnGround) - { + //if (isOnGround) + //{ velocity.Y = -11; - } + //} // здесь будет анимация } public void Shoot() @@ -127,7 +127,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities foreach (var target in targets) { Zombie targetZombie = (Zombie)target; - targetZombie.TakeDamage(); + // targetZombie.TakeDamage(); } } } @@ -143,7 +143,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities foreach (var target in targets) { Zombie targetZombie = (Zombie)target; - targetZombie.TakeDamage(); + // targetZombie.TakeDamage(); } } } @@ -152,7 +152,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities } public override void Update(GameTime gameTime) { - GraphicsComponent.SetCameraPosition(Pos); + // GraphicsComponent.SetCameraPosition(Pos); if (!isAttacked) { Move(gameTime); @@ -207,8 +207,8 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities } if (AppManager.Instance.multiPlayerStatus != MultiPlayerStatus.SinglePlayer) { - NetworkTask task = new NetworkTask(id, Pos); - AppManager.Instance.NetworkTasks.Add(task); + //NetworkTask task = new NetworkTask(id, Pos); + //AppManager.Instance.NetworkTasks.Add(task); } } public void MoveDown()