From 9f22c390a7082702a89f46b640a6619dc3b5c4ab Mon Sep 17 00:00:00 2001 From: Petek1234 <149153720+Petek1234@users.noreply.github.com> Date: Sat, 4 May 2024 18:07:50 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BB=D0=B0=D0=B1=D0=B0=201=20=D1=85=D0=B0?= =?UTF-8?q?=D1=80=D0=B4=20=D0=BF=D0=BE=D0=BB=D0=BD=D0=BE=D1=81=D1=82=D1=8C?= =?UTF-8?q?=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectBoatHard/DirectionType.cs | 24 ++ .../ProjectBoatHard/DrawningBoat.cs | 232 ++++++++++++++++++ .../ProjectBoatHard/DrawningEngine.cs | 60 +++++ ProjectBoatHard/ProjectBoatHard/EntityBoat.cs | 59 +++++ .../ProjectBoatHard/Form1.Designer.cs | 39 --- ProjectBoatHard/ProjectBoatHard/Form1.cs | 10 - .../ProjectBoatHard/FormBoat.Designer.cs | 146 +++++++++++ ProjectBoatHard/ProjectBoatHard/FormBoat.cs | 77 ++++++ .../{Form1.resx => FormBoat.resx} | 50 ++-- .../ProjectBoatHard/NumberOfEngine.cs | 20 ++ ProjectBoatHard/ProjectBoatHard/Program.cs | 2 +- .../ProjectBoatHard/ProjectBoatHard.csproj | 11 - .../ProjectMotorBoatHard.csproj | 26 ++ .../Properties/Resources.Designer.cs | 103 ++++++++ .../ProjectBoatHard/Properties/Resources.resx | 133 ++++++++++ .../ProjectBoatHard/Resources/вверх.png | Bin 0 -> 2237 bytes .../ProjectBoatHard/Resources/влево.png | Bin 0 -> 1111 bytes .../ProjectBoatHard/Resources/вниз.png | Bin 0 -> 2301 bytes .../Resources/вправа.png | Bin 0 -> 2256 bytes ...tBoatHard.sln => ProjectMotorBoatHard.sln} | 2 +- 20 files changed, 907 insertions(+), 87 deletions(-) create mode 100644 ProjectBoatHard/ProjectBoatHard/DirectionType.cs create mode 100644 ProjectBoatHard/ProjectBoatHard/DrawningBoat.cs create mode 100644 ProjectBoatHard/ProjectBoatHard/DrawningEngine.cs create mode 100644 ProjectBoatHard/ProjectBoatHard/EntityBoat.cs delete mode 100644 ProjectBoatHard/ProjectBoatHard/Form1.Designer.cs delete mode 100644 ProjectBoatHard/ProjectBoatHard/Form1.cs create mode 100644 ProjectBoatHard/ProjectBoatHard/FormBoat.Designer.cs create mode 100644 ProjectBoatHard/ProjectBoatHard/FormBoat.cs rename ProjectBoatHard/ProjectBoatHard/{Form1.resx => FormBoat.resx} (93%) create mode 100644 ProjectBoatHard/ProjectBoatHard/NumberOfEngine.cs delete mode 100644 ProjectBoatHard/ProjectBoatHard/ProjectBoatHard.csproj create mode 100644 ProjectBoatHard/ProjectBoatHard/ProjectMotorBoatHard.csproj create mode 100644 ProjectBoatHard/ProjectBoatHard/Properties/Resources.Designer.cs create mode 100644 ProjectBoatHard/ProjectBoatHard/Properties/Resources.resx create mode 100644 ProjectBoatHard/ProjectBoatHard/Resources/вверх.png create mode 100644 ProjectBoatHard/ProjectBoatHard/Resources/влево.png create mode 100644 ProjectBoatHard/ProjectBoatHard/Resources/вниз.png create mode 100644 ProjectBoatHard/ProjectBoatHard/Resources/вправа.png rename ProjectBoatHard/{ProjectBoatHard.sln => ProjectMotorBoatHard.sln} (85%) diff --git a/ProjectBoatHard/ProjectBoatHard/DirectionType.cs b/ProjectBoatHard/ProjectBoatHard/DirectionType.cs new file mode 100644 index 0000000..803b489 --- /dev/null +++ b/ProjectBoatHard/ProjectBoatHard/DirectionType.cs @@ -0,0 +1,24 @@ +namespace ProjectBoatHard; + +/// +/// направление перемещения +/// +public enum DirectionType +{ + /// + /// вверх + /// + Up = 1, + /// + /// вниз + /// + Down = 2, + /// + /// влево + /// + Left = 3, + /// + /// вправо + /// + Right = 4 +} \ No newline at end of file diff --git a/ProjectBoatHard/ProjectBoatHard/DrawningBoat.cs b/ProjectBoatHard/ProjectBoatHard/DrawningBoat.cs new file mode 100644 index 0000000..e49a0ed --- /dev/null +++ b/ProjectBoatHard/ProjectBoatHard/DrawningBoat.cs @@ -0,0 +1,232 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using static System.Windows.Forms.LinkLabel; + +namespace ProjectBoatHard; + +/// +/// класс, отвечающий за прорисовку и перемещение объекта-сущности +/// +public class DrawningBoat +{ + /// + /// класс-сущность + /// + public EntityBoat? EntityBoat { get; private set; } + public DrawningEngine? Engine; + + /// + /// ширина окна + /// + private int? _pictureWidth; + + /// + /// высота окна + /// + private int? _pictureHeight; + + /// + /// левая координата прорисовки катера + /// + private int? _startPosX; + + /// + /// верхняя координата прорисовки катера + /// + private int? _startPosY; + + /// + /// ширина прорисовки катера + /// + private int _drawningBoatWidth; + + /// + /// высота прорисовки катера + /// + private int _drawningBoatHeight; + + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес + /// Основной цвет + /// Дополнительный цвет + /// Признак наличия кабины + /// Признак наличия двигателя + + public bool Init(int speed, double weight, Color bodyColor, Color additionalColor, bool kabina, + bool dvigatel, int numberOfEngine, int width, int height) + { + if (weight < _pictureWidth || height < _pictureHeight) + { + return false; + } + + _drawningBoatWidth = 150; + + + _drawningBoatHeight = 80; + + _pictureWidth = width; + _pictureHeight = height; + + EntityBoat = new EntityBoat(); + EntityBoat.Init(speed, weight, bodyColor, additionalColor, kabina, dvigatel); + Engine = new DrawningEngine(); + + return true; + } + + /// + /// Установка границ поля + /// + /// Ширина поля + /// Высота поля + /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах + + /// + /// Установка позиции + /// + /// Координата X + /// Координата Y + public void SetPosition(int x, int y) + { + if (!_pictureHeight.HasValue || !_pictureWidth.HasValue) + { + return; + } + + if (x < 0) + { + x = 0; + } + else if (x + _drawningBoatWidth > _pictureWidth) + { + x = _pictureWidth.Value - _drawningBoatWidth;//корректируем по оси х + } + + if (y < 0)//если новая позиция выше верхней границы формы + { + y = 0; + } + else if (y + _drawningBoatHeight > _pictureHeight)//если новая позиция выходит за границу формы + { + y = _pictureHeight.Value - _drawningBoatHeight;//корректируем по оси у + } + + _startPosX = x; + _startPosY = y; + } + + /// + /// Изменение направления перемещения + /// + /// Направление + /// true - перемещение выполнено, false - перемещение невозможно + public bool MoveTransport(DirectionType direction) + { + if (EntityBoat == null || !_startPosX.HasValue || + !_startPosY.HasValue) + { + return false; + } + switch (direction) + { + //влево + case DirectionType.Left: + if (_startPosX.Value - EntityBoat.Step > 0) + { + _startPosX -= (int)EntityBoat.Step; + } + return true; + + //вверх + case DirectionType.Up: + if (_startPosY.Value - EntityBoat.Step > 0) + { + _startPosY -= (int)EntityBoat.Step; + } + return true; + + // вправо + case DirectionType.Right: + if (_startPosX.Value + EntityBoat.Step + _drawningBoatWidth < _pictureWidth) + { + _startPosX += (int)EntityBoat.Step; + } + return true; + + //вниз + case DirectionType.Down: + if (_startPosY.Value + EntityBoat.Step + _drawningBoatHeight < _pictureHeight) + { + _startPosY += (int)EntityBoat.Step; + } + return true; + + default: + return false; + } + } + + /// + /// Прорисовка объекта + /// + /// + public void DrawTransport(Graphics g) + { + if (EntityBoat == null || !_startPosX.HasValue || + !_startPosY.HasValue) + { + return; + } + + Pen pen = new(Color.Black); + Brush additionalBrush = new SolidBrush(EntityBoat.AdditionalColor); + Brush bodyBrush = new SolidBrush(EntityBoat.BodyColor); + + //корпус + g.FillRectangle(bodyBrush, _startPosX.Value + 5, _startPosY.Value, 75, 40); + g.DrawRectangle(pen, _startPosX.Value + 5, _startPosY.Value, 75, 40); + + //лестница + g.FillRectangle(additionalBrush, _startPosX.Value + 5, _startPosY.Value + 10, 20, 20); + g.DrawRectangle(pen, _startPosX.Value + 5, _startPosY.Value + 10, 20, 20); + + //двигатель + if (EntityBoat.dvigatelBody) + { + g.FillRectangle(additionalBrush, _startPosX.Value, _startPosY.Value + 15, 5, 10); + g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 15, 5, 10); + } + + Engine.DrawEngine(g, _startPosX.Value, _startPosY.Value); + + //корма + Point point1 = new Point(_startPosX.Value + 80, _startPosY.Value); + Point point2 = new Point(_startPosX.Value + 80, _startPosY.Value + 40); + Point point3 = new Point(_startPosX.Value + 120, _startPosY.Value + 20); + Point[] curvePointsKorma = { point1, point2, point3 }; + g.DrawPolygon(pen, curvePointsKorma); + g.FillPolygon(bodyBrush, curvePointsKorma); + + //кабина + if (EntityBoat.kabinaBody) + { + Point point4 = new Point(_startPosX.Value + 50, _startPosY.Value + 10); + Point point5 = new Point(_startPosX.Value + 55, _startPosY.Value + 15); + Point point6 = new Point(_startPosX.Value + 55, _startPosY.Value + 25); + Point point7 = new Point(_startPosX.Value + 50, _startPosY.Value + 30); + Point point8 = new Point(_startPosX.Value + 50, _startPosY.Value + 10); + Point[] curvePointsKabina = { point4, point5, point6, point7, point8 }; + g.FillPolygon(additionalBrush, curvePointsKabina); + g.DrawPolygon(pen, curvePointsKabina); + } + + + } +} diff --git a/ProjectBoatHard/ProjectBoatHard/DrawningEngine.cs b/ProjectBoatHard/ProjectBoatHard/DrawningEngine.cs new file mode 100644 index 0000000..995984a --- /dev/null +++ b/ProjectBoatHard/ProjectBoatHard/DrawningEngine.cs @@ -0,0 +1,60 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectBoatHard; + +public class DrawningEngine +{ + public EntityBoat? EntityBoat { get; private set; } + + public NumberOfEngine numberOfEngine; + + public int EngNum + { + set + { + if (value <= 1 || value > 3) + { + numberOfEngine = NumberOfEngine.OneEngine; + } + else if (value == 2) + { + numberOfEngine = NumberOfEngine.TwoEngine; + } + else if (value == 3) + { + numberOfEngine = NumberOfEngine.ThreeEngine; + } + } + } + + public void DrawEngine(Graphics g, int _startPosX, int _startPosY) + { + + Brush bodybrush = new SolidBrush(Color.Black); + + + switch (numberOfEngine) + { + case NumberOfEngine.OneEngine: + g.FillRectangle(bodybrush, _startPosX, _startPosY + 15, 5, 10); + break; + + case NumberOfEngine.TwoEngine: + g.FillRectangle(bodybrush, _startPosX + 15, _startPosY + 40, 18, 6); + g.FillRectangle(bodybrush, _startPosX + 15, _startPosY - 5, 18, 6); + + break; + + case NumberOfEngine.ThreeEngine: + g.FillRectangle(bodybrush, _startPosX, _startPosY + 15, 5, 10); + g.FillRectangle(bodybrush, _startPosX + 15, _startPosY + 40, 18, 6); + g.FillRectangle(bodybrush, _startPosX + 15, _startPosY - 5, 18, 6); + break; + } + } +} diff --git a/ProjectBoatHard/ProjectBoatHard/EntityBoat.cs b/ProjectBoatHard/ProjectBoatHard/EntityBoat.cs new file mode 100644 index 0000000..d9a0c8f --- /dev/null +++ b/ProjectBoatHard/ProjectBoatHard/EntityBoat.cs @@ -0,0 +1,59 @@ +namespace ProjectBoatHard; + +public class EntityBoat +{ + /// + /// скорость + /// + public int Speed { get; private set; } + + /// + /// вес + /// + public double Weight { get; private set; } + + /// + /// Основной цвет + /// + public Color BodyColor { get; private set; } + + /// + /// Дополнительный цвет (для опциональных элементов) + /// + public Color AdditionalColor { get; private set; } + + /// + /// Признак (опция) наличия кабины + /// + public bool kabinaBody { get; private set; } + + /// + /// Признак (опция) наличия двигателя + /// + public bool dvigatelBody { get; private set; } + + /// + /// Шаг перемещения катера + /// + public double Step => Speed * 100 / Weight; + + /// + /// + /// + /// Скорость + /// Вес + /// Основной цвет + /// Дополнительный цвет + /// Признак наличия кабины + /// Признак наличия двигателя + + public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool kabina, bool dvigatel) + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + AdditionalColor = additionalColor; + kabinaBody = kabina; + dvigatelBody = dvigatel; + } +} diff --git a/ProjectBoatHard/ProjectBoatHard/Form1.Designer.cs b/ProjectBoatHard/ProjectBoatHard/Form1.Designer.cs deleted file mode 100644 index 394e759..0000000 --- a/ProjectBoatHard/ProjectBoatHard/Form1.Designer.cs +++ /dev/null @@ -1,39 +0,0 @@ -namespace ProjectBoatHard -{ - partial class Form1 - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); - this.Text = "Form1"; - } - - #endregion - } -} \ No newline at end of file diff --git a/ProjectBoatHard/ProjectBoatHard/Form1.cs b/ProjectBoatHard/ProjectBoatHard/Form1.cs deleted file mode 100644 index bca9b7b..0000000 --- a/ProjectBoatHard/ProjectBoatHard/Form1.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace ProjectBoatHard -{ - public partial class Form1 : Form - { - public Form1() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/ProjectBoatHard/ProjectBoatHard/FormBoat.Designer.cs b/ProjectBoatHard/ProjectBoatHard/FormBoat.Designer.cs new file mode 100644 index 0000000..d0ebbad --- /dev/null +++ b/ProjectBoatHard/ProjectBoatHard/FormBoat.Designer.cs @@ -0,0 +1,146 @@ +namespace ProjectBoatHard +{ + partial class FormBoat + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + pictureBoxBoat = new PictureBox(); + buttonCreate = new Button(); + buttonLeft = new Button(); + buttonUp = new Button(); + buttonDown = new Button(); + buttonRight = new Button(); + numericUpDownBoat = new NumericUpDown(); + ((System.ComponentModel.ISupportInitialize)pictureBoxBoat).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownBoat).BeginInit(); + SuspendLayout(); + // + // pictureBoxBoat + // + pictureBoxBoat.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + pictureBoxBoat.Location = new Point(0, 0); + pictureBoxBoat.Name = "pictureBoxBoat"; + pictureBoxBoat.Size = new Size(669, 394); + pictureBoxBoat.TabIndex = 0; + pictureBoxBoat.TabStop = false; + // + // buttonCreate + // + buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonCreate.Location = new Point(12, 360); + buttonCreate.Name = "buttonCreate"; + buttonCreate.Size = new Size(114, 23); + buttonCreate.TabIndex = 1; + buttonCreate.Text = "Создать"; + buttonCreate.UseVisualStyleBackColor = true; + buttonCreate.Click += ButtonCreateBoat_Click; + // + // buttonLeft + // + buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonLeft.BackgroundImage = ProjectMotorBoatHard.Properties.Resources.влево; + buttonLeft.BackgroundImageLayout = ImageLayout.Stretch; + buttonLeft.Location = new Point(534, 348); + buttonLeft.Name = "buttonLeft"; + buttonLeft.Size = new Size(35, 35); + buttonLeft.TabIndex = 2; + buttonLeft.UseVisualStyleBackColor = true; + buttonLeft.Click += ButtonMove_Click; + // + // buttonUp + // + buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonUp.BackgroundImage = ProjectMotorBoatHard.Properties.Resources.вверх; + buttonUp.BackgroundImageLayout = ImageLayout.Stretch; + buttonUp.Location = new Point(575, 307); + buttonUp.Name = "buttonUp"; + buttonUp.Size = new Size(35, 35); + buttonUp.TabIndex = 3; + buttonUp.UseVisualStyleBackColor = true; + buttonUp.Click += ButtonMove_Click; + // + // buttonDown + // + buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonDown.BackgroundImage = ProjectMotorBoatHard.Properties.Resources.вниз; + buttonDown.BackgroundImageLayout = ImageLayout.Stretch; + buttonDown.Location = new Point(575, 348); + buttonDown.Name = "buttonDown"; + buttonDown.Size = new Size(35, 35); + buttonDown.TabIndex = 4; + buttonDown.UseVisualStyleBackColor = true; + buttonDown.Click += ButtonMove_Click; + // + // buttonRight + // + buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonRight.BackgroundImage = ProjectMotorBoatHard.Properties.Resources.вправа; + buttonRight.BackgroundImageLayout = ImageLayout.Stretch; + buttonRight.Location = new Point(616, 348); + buttonRight.Name = "buttonRight"; + buttonRight.Size = new Size(35, 35); + buttonRight.TabIndex = 5; + buttonRight.UseVisualStyleBackColor = true; + buttonRight.Click += ButtonMove_Click; + // + // numericUpDownBoat + // + numericUpDownBoat.Location = new Point(132, 360); + numericUpDownBoat.Name = "numericUpDownBoat"; + numericUpDownBoat.Size = new Size(114, 23); + numericUpDownBoat.TabIndex = 6; + // + // FormBoat + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(669, 395); + Controls.Add(numericUpDownBoat); + Controls.Add(buttonRight); + Controls.Add(buttonDown); + Controls.Add(buttonUp); + Controls.Add(buttonLeft); + Controls.Add(buttonCreate); + Controls.Add(pictureBoxBoat); + Name = "FormBoat"; + Text = "Моторная Лодка"; + ((System.ComponentModel.ISupportInitialize)pictureBoxBoat).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownBoat).EndInit(); + ResumeLayout(false); + } + + #endregion + + private PictureBox pictureBoxBoat; + private Button buttonCreate; + private Button buttonLeft; + private Button buttonUp; + private Button buttonDown; + private Button buttonRight; + private NumericUpDown numericUpDownBoat; + } +} \ No newline at end of file diff --git a/ProjectBoatHard/ProjectBoatHard/FormBoat.cs b/ProjectBoatHard/ProjectBoatHard/FormBoat.cs new file mode 100644 index 0000000..d679a4c --- /dev/null +++ b/ProjectBoatHard/ProjectBoatHard/FormBoat.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace ProjectBoatHard; + +public partial class FormBoat : Form +{ + private DrawningBoat? _drawningBoat; + + public FormBoat() + { + InitializeComponent(); + } + + private void Draw() + { + if (_drawningBoat == null) + { + return; + } + Bitmap bmp = new(pictureBoxBoat.Width, pictureBoxBoat.Height); + Graphics gr = Graphics.FromImage(bmp); + _drawningBoat.DrawTransport(gr); + pictureBoxBoat.Image = bmp; + } + + private void ButtonCreateBoat_Click(object sender, EventArgs e) + { + Random random = new(); + _drawningBoat = new DrawningBoat(); + _drawningBoat.Init(random.Next(100, 300), random.Next(1000, 3000), + Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), + Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), + Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), random.Next(1, 4) * 2, + pictureBoxBoat.Width, pictureBoxBoat.Height); + + _drawningBoat.SetPosition(random.Next(10, 100), random.Next(10, 100)); + _drawningBoat.Engine.EngNum = (int)numericUpDownBoat.Value; + Draw(); + } + + private void ButtonMove_Click(object sender, EventArgs e) + { + if (_drawningBoat == null) + { + return; + } + string name = ((Button)sender)?.Name ?? string.Empty; + bool result = false; + switch (name) + { + case "buttonUp": + result = _drawningBoat.MoveTransport(DirectionType.Up); + break; + case "buttonDown": + result = _drawningBoat.MoveTransport(DirectionType.Down); + break; + case "buttonLeft": + result = _drawningBoat.MoveTransport(DirectionType.Left); + break; + case "buttonRight": + result = _drawningBoat.MoveTransport(DirectionType.Right); + break; + } + if (result) + { + Draw(); + } + } +} diff --git a/ProjectBoatHard/ProjectBoatHard/Form1.resx b/ProjectBoatHard/ProjectBoatHard/FormBoat.resx similarity index 93% rename from ProjectBoatHard/ProjectBoatHard/Form1.resx rename to ProjectBoatHard/ProjectBoatHard/FormBoat.resx index 1af7de1..af32865 100644 --- a/ProjectBoatHard/ProjectBoatHard/Form1.resx +++ b/ProjectBoatHard/ProjectBoatHard/FormBoat.resx @@ -1,17 +1,17 @@  - diff --git a/ProjectBoatHard/ProjectBoatHard/NumberOfEngine.cs b/ProjectBoatHard/ProjectBoatHard/NumberOfEngine.cs new file mode 100644 index 0000000..bcbcd51 --- /dev/null +++ b/ProjectBoatHard/ProjectBoatHard/NumberOfEngine.cs @@ -0,0 +1,20 @@ +namespace ProjectBoatHard; + +/// +/// Количество катков +/// +public enum NumberOfEngine +{ + /// + /// 1 катка + /// + OneEngine, + /// + /// 2 катков + /// + TwoEngine, + /// + /// 3 катков + /// + ThreeEngine +} diff --git a/ProjectBoatHard/ProjectBoatHard/Program.cs b/ProjectBoatHard/ProjectBoatHard/Program.cs index a86fabc..ed6591b 100644 --- a/ProjectBoatHard/ProjectBoatHard/Program.cs +++ b/ProjectBoatHard/ProjectBoatHard/Program.cs @@ -11,7 +11,7 @@ namespace ProjectBoatHard // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new Form1()); + Application.Run(new FormBoat()); } } } \ No newline at end of file diff --git a/ProjectBoatHard/ProjectBoatHard/ProjectBoatHard.csproj b/ProjectBoatHard/ProjectBoatHard/ProjectBoatHard.csproj deleted file mode 100644 index e1a0735..0000000 --- a/ProjectBoatHard/ProjectBoatHard/ProjectBoatHard.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - WinExe - net7.0-windows - enable - true - enable - - - \ No newline at end of file diff --git a/ProjectBoatHard/ProjectBoatHard/ProjectMotorBoatHard.csproj b/ProjectBoatHard/ProjectBoatHard/ProjectMotorBoatHard.csproj new file mode 100644 index 0000000..244387d --- /dev/null +++ b/ProjectBoatHard/ProjectBoatHard/ProjectMotorBoatHard.csproj @@ -0,0 +1,26 @@ + + + + WinExe + net7.0-windows + enable + true + enable + + + + + True + True + Resources.resx + + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + \ No newline at end of file diff --git a/ProjectBoatHard/ProjectBoatHard/Properties/Resources.Designer.cs b/ProjectBoatHard/ProjectBoatHard/Properties/Resources.Designer.cs new file mode 100644 index 0000000..1864c78 --- /dev/null +++ b/ProjectBoatHard/ProjectBoatHard/Properties/Resources.Designer.cs @@ -0,0 +1,103 @@ +//------------------------------------------------------------------------------ +// +// Этот код создан программой. +// Исполняемая версия:4.0.30319.42000 +// +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. +// +//------------------------------------------------------------------------------ + +namespace ProjectMotorBoatHard.Properties { + using System; + + + /// + /// Класс ресурса со строгой типизацией для поиска локализованных строк и т.д. + /// + // Этот класс создан автоматически классом StronglyTypedResourceBuilder + // с помощью такого средства, как ResGen или Visual Studio. + // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen + // с параметром /str или перестройте свой проект VS. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Возвращает кэшированный экземпляр ResourceManager, использованный этим классом. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ProjectMotorBoatHard.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Перезаписывает свойство CurrentUICulture текущего потока для всех + /// обращений к ресурсу с помощью этого класса ресурса со строгой типизацией. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap вверх { + get { + object obj = ResourceManager.GetObject("вверх", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap влево { + get { + object obj = ResourceManager.GetObject("влево", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap вниз { + get { + object obj = ResourceManager.GetObject("вниз", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap вправа { + get { + object obj = ResourceManager.GetObject("вправа", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + } +} diff --git a/ProjectBoatHard/ProjectBoatHard/Properties/Resources.resx b/ProjectBoatHard/ProjectBoatHard/Properties/Resources.resx new file mode 100644 index 0000000..841ccb7 --- /dev/null +++ b/ProjectBoatHard/ProjectBoatHard/Properties/Resources.resx @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + ..\Resources\вверх.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\влево.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\вниз.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\вправа.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + \ No newline at end of file diff --git a/ProjectBoatHard/ProjectBoatHard/Resources/вверх.png b/ProjectBoatHard/ProjectBoatHard/Resources/вверх.png new file mode 100644 index 0000000000000000000000000000000000000000..50dbe4f12ac2e707d92fac6950a9212b260baacd GIT binary patch literal 2237 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 literal 0 HcmV?d00001 diff --git a/ProjectBoatHard/ProjectBoatHard/Resources/вправа.png b/ProjectBoatHard/ProjectBoatHard/Resources/вправа.png new file mode 100644 index 0000000000000000000000000000000000000000..0d7673a593e5c79fa616f8d63a8e71202ca80959 GIT binary patch literal 2256 zcma)8dpuP879Z8go{{Wf+;OBiwpSu~L`c)k_84PIW)2-B!%5dGDWnX=r+%aHo-~I- zX@;b8!jZ|Nhn(*4DU?Sdk5nV%k&YNS#N0j3=l*@~AHThRYwxvw>$|?c^;^H4>ghpK zC1?|HIGifo&6$PC_lg0n$DVttyEvFoieb@ET*V8WaZFhk;<(=thpWm~`4;pYrsGez z`NrUI8zqXN^o!}nO*kBMlKgx3nX02@Q;rS{3@pEObA%kGTl38O=H_DOmzTb-u*>q{ zyAk2xCQFO52)XUA24HG&W|$T?JNkTTcC3B*v8N{TA-lJd9ddelkSIyRBT4bH3GX;; zP=DqEev*W4=io5ue1``|-+*p(iM7$ELXq{Ovr9F%N)0v8ERtHppnfg`vOnn0ZfkEh z-Otbi8%912)N&*_5aN_hnQ6}40UI@_!?-1z0mbZo}8knY@tlvpI_A3uL38)lW& zHTd}Wc;=7l0@4fKp*^VERuS#tx#jzl=?H|}{A*$6NZiV|c&gMA@L5e%Y5AdAK`9MJ z-N~12ETyB)yRX2kR7hkyr)C7aj4I5xvm5SMZ`K7~CX}AKhJ^x{RbSV@yJ*9ayajv% zDf*T-5QVx~4Ry%(L-ZDPZKPy97BB9TUr41n;QR5&7mi5E)3=CV)+S47Pg9o{bo-a> z4MKC!?a`at0U`HDz2u)N{KuWcOhEU+#OTK=RLnM_Q@`dcJ`-joM6ywRu=%u9lDcw0 z)-y`1O;uK-e4CK(Q+|{r-;*#uC#%?}vdeV1 z4PJ~;0MFB_uyhE@JYwyuSFhaNe?)+jmyNVkhpP}q-~=#n9TXH>fY)nYP0HNIiPwMy zu)_}**c>h7p^#G=E|-~aLPKteXoCQD_58pqh$gwhz2w>1S+1ZIh4f9rF?^(EYby0x zd1Ym`e?9>r1r{pO#Dt->2Ws45tUyA@J*_ZY6)=kbvQ5a$LQ_+GF&aGY4p*29iaqbH zmZzQAS`#g6Wa=MpVU~4tcYD=TRn7FuxG>rzrOZ4puubAPj~IJxn*Da*C-)}Zdc7%d9oK&6p_SdXG^_}jBamL3o z%nIW#FobGgy<8inN-ud^@ZX8XZyStV@FNz>iC^! z&z>ENh%luq;tD*{B6xY`Y$LV66Y5>|-WjW|?%u_r@rt4i%B?QZ1+hKuzT?+5kjZ>c$ zfWx?=)fKG+UUC{8TbSCBpEDOq*IPhHrY1G8#a5aw(z$s_${jrO!|$oocQ;ZKzE0zV zE=ER0ecr=7mScp$vz&>b$wPL1eE;u@eONPJdi;tlxWQmB%I%cCe#ARWkF^&q7fqN` zo`}t`O$q~bDLw%K#}DH!V9jJEY_T*`kzu#rTyoVWkr}ordRW^jOpcsVZ2dhF_1)qk zXL79;;P=z(3k|E! zW1TRP;?n8_(M1)juT99*z{7b861_|sRQhGB3tauEWV>_cx)aG*t9`B7c~en1{4Sd? zj8fF?_Rpm9+wA6wG?wJfrO)bVq2bzrW-`iq>^St55Oq^(8jy z0R9tk(5f?Xf5A183HVh_D)pSkPCRlXHKDP*+)PR50&I2n3g{agj8(NXLV^vj5_9b= zOdi%iqi0zd@02aOg?Z&iU0%b+Sx5NI^dMbgr$as2~K=0bl=Aq$12yVTQ=t z39|PTT<0`~Lx`OBPR5}sVb|f8JY&b+o}Rg6O?7nT_d-KeBsh;Ljs^U~uAN=PCs_^& x^LG*&B}V5yeUxu7cxUi`UgrNbGihB>j(7c6Kev7P literal 0 HcmV?d00001 diff --git a/ProjectBoatHard/ProjectBoatHard.sln b/ProjectBoatHard/ProjectMotorBoatHard.sln similarity index 85% rename from ProjectBoatHard/ProjectBoatHard.sln rename to ProjectBoatHard/ProjectMotorBoatHard.sln index 7bdb842..58bb25d 100644 --- a/ProjectBoatHard/ProjectBoatHard.sln +++ b/ProjectBoatHard/ProjectMotorBoatHard.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.7.34031.279 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectBoatHard", "ProjectBoatHard\ProjectBoatHard.csproj", "{C3AC728D-8799-444D-8D2C-AEB47E9C0403}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjectMotorBoatHard", "ProjectBoatHard\ProjectMotorBoatHard.csproj", "{C3AC728D-8799-444D-8D2C-AEB47E9C0403}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution