shaman_stepan/PIbd-11_Chechevitcyn_S.A_AntiAircraftGun_Simple
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Слетевшая 7 лаба готова

Browse Source
This commit is contained in:
Ctepa 2024-05-20 04:55:35 +03:00
parent 72081a1e24
commit beb7bdf552
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AntiAircraftGun/AntiAircraftGun/AntiAircraftGun.csproj
View File

@ -13,11 +13,9 @@
<PackageReference Include="EntityFramework.ru" Version="6.2.0" /> <PackageReference Include="EntityFramework.ru" Version="6.2.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
<PackageReference Include="Serilog" Version="3.1.1" /> <PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" /> <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" /> <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" /> <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
</ItemGroup> </ItemGroup>

7
AntiAircraftGun/AntiAircraftGun/CollectionGenericObjects/AbstractCompany.cs
View File

@ -86,8 +86,11 @@ public abstract class AbstractCompany
SetObjectsPosition(); SetObjectsPosition();
for (int i = 0; i < (_collection?.Count ?? 0); ++i) for (int i = 0; i < (_collection?.Count ?? 0); ++i)
{ {
DrawningGun? obj = _collection?.Get(i); try
obj?.DrawTransport(graphics); {
DrawningGun? obj = _collection?.Get(i);
obj?.DrawTransport(graphics);
}catch(Exception ) { }
} }
return bitmap; return bitmap;
} }

19
AntiAircraftGun/AntiAircraftGun/CollectionGenericObjects/GunSharingService.cs
View File

@ -45,19 +45,22 @@ public class GunSharingService : AbstractCompany
int boarderOffsetY = 10; int boarderOffsetY = 10;
int currentIndex = -1; int currentIndex = -1;
try
for (int j = 0; j < maxCountY; j++)
{ {
for (int i = 0; i < maxCountX; i++) for (int j = 0; j < maxCountY; j++)
{ {
currentIndex++; for (int i = 0; i < maxCountX; i++)
if (_collection.Get(currentIndex) != null)
{ {
currentIndex++;
if (_collection.Get(currentIndex) != null)
{
_collection.Get(currentIndex).SetPictureSize(_pictureWidth, _pictureHeight); _collection.Get(currentIndex).SetPictureSize(_pictureWidth, _pictureHeight);
_collection.Get(currentIndex).SetPosition(boarderOffsetX + i * _placeSizeWidth + i * offsetX, boarderOffsetY + j * _placeSizeHeight); _collection.Get(currentIndex).SetPosition(boarderOffsetX + i * _placeSizeWidth + i * offsetX, boarderOffsetY + j * _placeSizeHeight);
}
} }
} }
} }catch (Exception ) { }
} }
} }