From f2bfec681833c33da55fde520723a942f47b05fd Mon Sep 17 00:00:00 2001 From: SAliulov <146759803+SAliulov@users.noreply.github.com> Date: Sat, 20 Apr 2024 21:12:03 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BF=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CollectionGenericObjects/AbstractCompany.cs | 2 +- .../CollectionGenericObjects/BomberHungarService.cs | 4 +++- ProjectAirBomber/ProjectAirBomber/Drawnings/DirectionType.cs | 3 +++ .../ProjectAirBomber/Drawnings/DrawningAirBomber.cs | 2 +- ProjectAirBomber/ProjectAirBomber/Entities/EntityBomber.cs | 2 +- .../ProjectAirBomber/MovementStrategy/MoveToBorder.cs | 3 +++ .../ProjectAirBomber/MovementStrategy/MoveToCenter.cs | 4 ++++ .../MovementStrategy/{MoveableTrans.cs => MoveableBomber.cs} | 2 +- 8 files changed, 17 insertions(+), 5 deletions(-) rename ProjectAirBomber/ProjectAirBomber/MovementStrategy/{MoveableTrans.cs => MoveableBomber.cs} (95%) diff --git a/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/AbstractCompany.cs b/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/AbstractCompany.cs index e93459c..76662de 100644 --- a/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/AbstractCompany.cs +++ b/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/AbstractCompany.cs @@ -28,7 +28,7 @@ public abstract class AbstractCompany protected readonly int _pictureHeight; /// - /// Коллекция поездов + /// Коллекция самолётов /// protected ICollectionGenericObjects? _collection = null; diff --git a/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/BomberHungarService.cs b/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/BomberHungarService.cs index 337add7..d83c69a 100644 --- a/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/BomberHungarService.cs +++ b/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/BomberHungarService.cs @@ -40,7 +40,9 @@ public class BomberHungarService : AbstractCompany } - + /// + /// Установка объекта в Ангар + /// protected override void SetObjectsPosition() { int n = 0; diff --git a/ProjectAirBomber/ProjectAirBomber/Drawnings/DirectionType.cs b/ProjectAirBomber/ProjectAirBomber/Drawnings/DirectionType.cs index df80ecf..fe6dba4 100644 --- a/ProjectAirBomber/ProjectAirBomber/Drawnings/DirectionType.cs +++ b/ProjectAirBomber/ProjectAirBomber/Drawnings/DirectionType.cs @@ -5,6 +5,9 @@ /// public enum DirectionType { + /// + /// Неизвестное направление + /// Unknow = -1, /// /// Вверх diff --git a/ProjectAirBomber/ProjectAirBomber/Drawnings/DrawningAirBomber.cs b/ProjectAirBomber/ProjectAirBomber/Drawnings/DrawningAirBomber.cs index 5d0e8c3..578a8c5 100644 --- a/ProjectAirBomber/ProjectAirBomber/Drawnings/DrawningAirBomber.cs +++ b/ProjectAirBomber/ProjectAirBomber/Drawnings/DrawningAirBomber.cs @@ -21,7 +21,7 @@ public class DrawningAirBomber : DrawningBomber - //TO DO!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + //TO DO! public DrawningAirBomber(int speed, double weight, Color bodyColor, Color additionalColor, bool fuelTanks, bool bombs) : base(200, 160) { EntityBomber = new EntityAirBomber(speed, weight, bodyColor, additionalColor, fuelTanks, bombs); diff --git a/ProjectAirBomber/ProjectAirBomber/Entities/EntityBomber.cs b/ProjectAirBomber/ProjectAirBomber/Entities/EntityBomber.cs index 7d24cca..33745d2 100644 --- a/ProjectAirBomber/ProjectAirBomber/Entities/EntityBomber.cs +++ b/ProjectAirBomber/ProjectAirBomber/Entities/EntityBomber.cs @@ -30,7 +30,7 @@ public class EntityBomber /// Вес бомбардировщика /// Основной цвет /// - /// TO DO?!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + /// TO DO public EntityBomber(int speed, double weight, Color bodyColor) { Speed = speed; diff --git a/ProjectAirBomber/ProjectAirBomber/MovementStrategy/MoveToBorder.cs b/ProjectAirBomber/ProjectAirBomber/MovementStrategy/MoveToBorder.cs index d3c61f8..bc10052 100644 --- a/ProjectAirBomber/ProjectAirBomber/MovementStrategy/MoveToBorder.cs +++ b/ProjectAirBomber/ProjectAirBomber/MovementStrategy/MoveToBorder.cs @@ -2,6 +2,9 @@ namespace ProjectAirBomber.MovementStrategy; +/// +/// Стратегия перемещения объекта в край экрана +/// public class MoveToBorder : AbstractStrategy { protected override bool IsTargetDestinaion() diff --git a/ProjectAirBomber/ProjectAirBomber/MovementStrategy/MoveToCenter.cs b/ProjectAirBomber/ProjectAirBomber/MovementStrategy/MoveToCenter.cs index 6966932..8631220 100644 --- a/ProjectAirBomber/ProjectAirBomber/MovementStrategy/MoveToCenter.cs +++ b/ProjectAirBomber/ProjectAirBomber/MovementStrategy/MoveToCenter.cs @@ -1,6 +1,10 @@  namespace ProjectAirBomber.MovementStrategy; +/// +/// Стратегия перемещения объекта в центр экрана +/// + public class MoveToCenter : AbstractStrategy { protected override bool IsTargetDestinaion() diff --git a/ProjectAirBomber/ProjectAirBomber/MovementStrategy/MoveableTrans.cs b/ProjectAirBomber/ProjectAirBomber/MovementStrategy/MoveableBomber.cs similarity index 95% rename from ProjectAirBomber/ProjectAirBomber/MovementStrategy/MoveableTrans.cs rename to ProjectAirBomber/ProjectAirBomber/MovementStrategy/MoveableBomber.cs index 2349cc7..dd96191 100644 --- a/ProjectAirBomber/ProjectAirBomber/MovementStrategy/MoveableTrans.cs +++ b/ProjectAirBomber/ProjectAirBomber/MovementStrategy/MoveableBomber.cs @@ -5,7 +5,7 @@ namespace ProjectAirBomber.MovementStrategy; public class MoveableBomber : IMoveableObject { /// - /// Поле-объект класса DrawningTrans или его наследника + /// Поле-объект класса DrawningBomber или его наследника /// private readonly DrawningBomber? _bomber = null; ///