From 46ce1234eed1c2c154e46b3d8cc51c8848ed32e8 Mon Sep 17 00:00:00 2001
From: tian <11429339@qq.com>
Date: Thu, 18 Jun 2026 15:27:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20Unity=20=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=9A=E5=8F=98=E9=87=8F=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=E3=80=81DroneWave.DroneType=20=E4=B8=8D=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E3=80=81nullable=20=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- SimulationBootstrap: scenario 变量名冲突 → sc
- ManagerVerification: DroneWave.DroneType → Target (DroneWave 无此属性)
- ReportManager: string? → 拆为两个重载避免 nullable annotation 警告
---
 src/Unity/Assets/Scripts/Managers/ManagerVerification.cs | 2 +-
 src/Unity/Assets/Scripts/Managers/ReportManager.cs       | 7 ++++++-
 src/Unity/Assets/Scripts/Managers/SimulationBootstrap.cs | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Unity/Assets/Scripts/Managers/ManagerVerification.cs b/src/Unity/Assets/Scripts/Managers/ManagerVerification.cs
index 7a6e740..031839d 100644
--- a/src/Unity/Assets/Scripts/Managers/ManagerVerification.cs
+++ b/src/Unity/Assets/Scripts/Managers/ManagerVerification.cs
@@ -56,7 +56,7 @@ namespace CounterDrone.Unity
             var droneGroup = new DroneWave
             {
                 WaveId = "default",
-                DroneType = detail.Targets[0].DroneType,
+                Target = detail.Targets[0],
                 Route = detail.Routes[0],
                 Waypoints = detail.WaypointGroups["default"],
             };
diff --git a/src/Unity/Assets/Scripts/Managers/ReportManager.cs b/src/Unity/Assets/Scripts/Managers/ReportManager.cs
index be98209..d543fd5 100644
--- a/src/Unity/Assets/Scripts/Managers/ReportManager.cs
+++ b/src/Unity/Assets/Scripts/Managers/ReportManager.cs
@@ -33,12 +33,17 @@ namespace CounterDrone.Unity
         public PagedResult<SimulationReport> Search(string kw, string from, string to, int page, int size)
             => _service.SearchReports(kw, from, to, page, size);
 
-        public string Export(string reportId, string? outputDir = null)
+        public string Export(string reportId, string outputDir)
         {
             var dir = outputDir ?? System.IO.Path.Combine(_paths.GetDataRoot(), "reports");
             return _service.ExportToFile(reportId, dir);
         }
 
+        public string Export(string reportId)
+        {
+            return Export(reportId, System.IO.Path.Combine(_paths.GetDataRoot(), "reports"));
+        }
+
         [ContextMenu("Verify")]
         void Verify()
         {
diff --git a/src/Unity/Assets/Scripts/Managers/SimulationBootstrap.cs b/src/Unity/Assets/Scripts/Managers/SimulationBootstrap.cs
index d3e971d..28eb6e3 100644
--- a/src/Unity/Assets/Scripts/Managers/SimulationBootstrap.cs
+++ b/src/Unity/Assets/Scripts/Managers/SimulationBootstrap.cs
@@ -66,8 +66,8 @@ namespace CounterDrone.Unity
                 // 方式2：用 DefaultData 预设组装自定义想定
                 var defaults = DefaultData.Load(paths);
 
-                var scenario = scenario.CreateScenario("Unity Demo", "");
-                scenarioId = scenario.Id;
+                var sc = scenario.CreateScenario("Unity Demo", "");
+                scenarioId = sc.Id;
 
                 scenario.SaveScene(scenarioId, defaults.Environments.First(w => w.Id == "sunny-calm").ToCombatScene());
                 scenario.SaveTarget(scenarioId, defaults.Drones.First(p => p.Id == "shahed").ToDroneProfile());