зафиксировать всё
This commit is contained in:
parent
2f8114f6f8
commit
bd494d4f70
@ -11,16 +11,12 @@ namespace ProjectBoat_bae.Entities
|
|||||||
public Color AdditionalColor { get; private set; }
|
public Color AdditionalColor { get; private set; }
|
||||||
public bool Body { get; private set; }
|
public bool Body { get; private set; }
|
||||||
public bool Wing { get; private set; }
|
public bool Wing { get; private set; }
|
||||||
//public bool SportLine { get; private set; }
|
|
||||||
public EntityMotorBoat(int speed, double weight, Color bodyColor, Color
|
public EntityMotorBoat(int speed, double weight, Color bodyColor, Color
|
||||||
additionalColor, bool body, bool wing
|
additionalColor, bool body, bool wing) : base(speed, weight, bodyColor)
|
||||||
//, bool sportLine
|
|
||||||
) : base(speed, weight, bodyColor)
|
|
||||||
{
|
{
|
||||||
AdditionalColor = additionalColor;
|
AdditionalColor = additionalColor;
|
||||||
Body = body;
|
Body = body;
|
||||||
Wing = wing;
|
Wing = wing;
|
||||||
//SportLine = sportLine;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -50,7 +50,6 @@
|
|||||||
pictureBox1.SizeMode = PictureBoxSizeMode.AutoSize;
|
pictureBox1.SizeMode = PictureBoxSizeMode.AutoSize;
|
||||||
pictureBox1.TabIndex = 0;
|
pictureBox1.TabIndex = 0;
|
||||||
pictureBox1.TabStop = false;
|
pictureBox1.TabStop = false;
|
||||||
pictureBox1.Click += pictureBox1_Click;
|
|
||||||
//
|
//
|
||||||
// button_bottom
|
// button_bottom
|
||||||
//
|
//
|
||||||
@ -144,7 +143,6 @@
|
|||||||
comboBoxStrategy.Name = "comboBoxStrategy";
|
comboBoxStrategy.Name = "comboBoxStrategy";
|
||||||
comboBoxStrategy.Size = new Size(182, 33);
|
comboBoxStrategy.Size = new Size(182, 33);
|
||||||
comboBoxStrategy.TabIndex = 9;
|
comboBoxStrategy.TabIndex = 9;
|
||||||
comboBoxStrategy.SelectedIndexChanged += comboBoxStrategy_SelectedIndexChanged;
|
|
||||||
//
|
//
|
||||||
// FormBoat
|
// FormBoat
|
||||||
//
|
//
|
||||||
@ -162,7 +160,6 @@
|
|||||||
Controls.Add(pictureBox1);
|
Controls.Add(pictureBox1);
|
||||||
Name = "FormBoat";
|
Name = "FormBoat";
|
||||||
Text = "Form1";
|
Text = "Form1";
|
||||||
Load += Form1_Load;
|
|
||||||
((System.ComponentModel.ISupportInitialize)pictureBox1).EndInit();
|
((System.ComponentModel.ISupportInitialize)pictureBox1).EndInit();
|
||||||
ResumeLayout(false);
|
ResumeLayout(false);
|
||||||
PerformLayout();
|
PerformLayout();
|
||||||
|
@ -120,22 +120,5 @@ namespace ProjectBoat_bae
|
|||||||
_abstractStrategy = null;
|
_abstractStrategy = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Form1_Load(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
private void pictureBox1_Click(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
private void button_top_Click(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
private void comboBoxStrategy_SelectedIndexChanged(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -23,7 +23,6 @@ namespace ProjectBoat_bae.MovementStrategy
|
|||||||
// Статус перемещения
|
// Статус перемещения
|
||||||
public Status GetStatus() { return _state; }
|
public Status GetStatus() { return _state; }
|
||||||
|
|
||||||
|
|
||||||
public void SetData(IMoveableObject moveableObject, int width, int
|
public void SetData(IMoveableObject moveableObject, int width, int
|
||||||
height)
|
height)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user