kirkorovka_1/PI-13_Kulikova_D.R_Simple
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-13_Kulikova_D.R_LabWork06_Simple #8

Closed
kirkorovka_1 wants to merge 3 commits from LabWork6 into LabWork5
pull from: LabWork6
merge into: kirkorovka_1:LabWork5
Conversation 1 Commits 3 Files Changed 15 +4 -5
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6f06ed0ff6 - Show all commits

7
Project_SelfPropelledArtilleryUnit/Project_SelfPropelledArtilleryUnit/Entity/EntitySAU.cs
View File

@ -28,17 +28,16 @@ public class EntitySAU: BaseSAU
public override string[] GetStringRepresentation()
{
return new[] { nameof(EntitySAU), Speed.ToString(), Weight.ToString(), BodyColor.Name, AdditionalColor.Name, Guns.ToString() };
return new[] { nameof(EntitySAU), Speed.ToString(), Weight.ToString(), BodyColor.Name, AdditionalColor.Name, Tracks.ToString(), Guns.ToString() };
}
public static EntitySAU? CreateEntitySAU(string[] strs)
{
if (strs.Length != 6 || strs[0] != nameof(EntitySAU))
if (strs.Length != 7 || strs[0] != nameof(EntitySAU))
{
return null;
}
return new EntitySAU(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]), Color.FromName(strs[4]),
Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6]));
return new EntitySAU(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]), Color.FromName(strs[4]), Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6]));
}
}

2
Project_SelfPropelledArtilleryUnit/Project_SelfPropelledArtilleryUnit/FormSAUConfig.cs
View File

@ -15,7 +15,7 @@ namespace Project_SelfPropelledArtilleryUnit;
public partial class FormSAUConfig : Form
{
private DrawingBase? _drawingBase;
//нужно заменить на то как это реализовано у вики
private event Action<DrawingBase>? SauDelegate;
public FormSAUConfig()
{