diff --git a/data/defaults.json b/data/defaults.json index 43fc837..6f1b86c 100644 --- a/data/defaults.json +++ b/data/defaults.json @@ -1,5 +1,5 @@ { - "version": "1", + "version": "2", "ammunition": [ { "Id": "inert", diff --git a/src/CounterDrone.Core/Simulation/MunitionEntity.cs b/src/CounterDrone.Core/Simulation/MunitionEntity.cs index 73af8a9..1f6dc25 100644 --- a/src/CounterDrone.Core/Simulation/MunitionEntity.cs +++ b/src/CounterDrone.Core/Simulation/MunitionEntity.cs @@ -29,10 +29,8 @@ namespace CounterDrone.Core.Simulation // 空基投放:继承载机速度 private readonly float _carrierVelX, _carrierVelY, _carrierVelZ; - // 地基:标记是否已超过释放高度(等待下降阶段到达) + // 地基:标记是否已超过释放高度 private bool _hasExceededReleaseAltitude; - private bool _hasArrived; - private float _arrivalTimer; public MunitionEntity(string id, PlatformType launchMode, AerosolType aerosolType, float startX, float startY, float startZ, diff --git a/test/unit/CounterDrone.Core.Tests/FullPipelineTests.cs b/test/unit/CounterDrone.Core.Tests/FullPipelineTests.cs index 9f51264..31cba87 100644 --- a/test/unit/CounterDrone.Core.Tests/FullPipelineTests.cs +++ b/test/unit/CounterDrone.Core.Tests/FullPipelineTests.cs @@ -136,11 +136,9 @@ namespace CounterDrone.Core.Tests { var eng = RunPreset("喷气式拦截-活性材料"); var drone = eng.Drones[0]; - var detail = _scenario.GetTaskDetail(_taskId)!; var launched = eng.Events.Count(e => e.Type == SimEventType.MunitionLaunched); - var report = new ReportGenerator().Generate(detail, eng.Events.ToList(), drone.Status, eng.SimulationTime); - Assert.True(launched > 0, $"No launches. Report:\n{report}"); - Assert.True(drone.Status == DroneStatus.Destroyed, $"Report:\n{report}"); + Assert.True(launched > 0); + Assert.Equal(DroneStatus.Destroyed, drone.Status); VerifyAndExportReport(eng, drone); } // ═══════════════════════════════════════════════ @@ -154,11 +152,8 @@ namespace CounterDrone.Core.Tests Assert.All(eng.Events.Where(e => e.Type == SimEventType.MunitionLaunched), e => Assert.Contains("空基", e.Description)); var drone = eng.Drones[0]; - var launched = eng.Events.Count(e => e.Type == SimEventType.MunitionLaunched); - Assert.True(launched > 0); - var detail = _scenario.GetTaskDetail(_taskId)!; - var report = new ReportGenerator().Generate(detail, eng.Events.ToList(), drone.Status, eng.SimulationTime); - Assert.True(drone.Hp < 0.1f, $"Hp={drone.Hp:F3} status={drone.Status}\nReport:\n{report}"); + Assert.True(eng.Events.Count(e => e.Type == SimEventType.MunitionLaunched) > 0); + Assert.True(drone.Hp < 0.1f); VerifyAndExportReport(eng, drone); }