海上搜救任务添加自定义执行次数

Models/SimulationCommon/EditorConfig.cs

@@ -107,6 +107,8 @@ public struct CityWeather
 
 public class EditorConfig
 {
+    [JsonProperty("仿真次数")]
+    public int runCounts;
     [JsonProperty("基地信息")]
     public List<Base> bases = new List<Base>();
     [JsonProperty("飞行器信息")]

SimulationServer/Component/TaskComponent.cs

@@ -14,13 +14,13 @@ public class TaskComponent : Component
     public List<SeaSJRescueMission> SeaSJRescueMissions;
 
     public SJAllTotalTaskPerformanceComponent SJAllTotalTaskPerformance = new SJAllTotalTaskPerformanceComponent();
-    public Dictionary<string, Dictionary<string, List<string>>> alltotalReport = new ();
+    public Dictionary<string, Dictionary<string, List<string>>> alltotalReport = new();
 
     public void Start()
     {
         MHRescueMissions?.ForEach(r => r.Reset());
         XHRescueMissions?.ForEach(r => r.Reset());
-        
+
         MHRescueMissions?.ForEach(r => r.Start());
         XHRescueMissions?.ForEach(r => r.Start());
         ZCRescueMissions?.ForEach(r => r.Start());
@@ -32,17 +32,17 @@ public class TaskComponent : Component
         //把totalReport保存到alltotalReport
         foreach (var kv in totalReport)
         {
-            if(!alltotalReport.ContainsKey(kv.Key)) alltotalReport[kv.Key] = new Dictionary<string, List<string>>();
-            
-            
+            if (!alltotalReport.ContainsKey(kv.Key)) alltotalReport[kv.Key] = new Dictionary<string, List<string>>();
+
+
             foreach (var kv2 in kv.Value)
             {
-                if(!alltotalReport[kv.Key].ContainsKey(kv2.Key)) alltotalReport[kv.Key][kv2.Key] = new List<string>();
-                 
+                if (!alltotalReport[kv.Key].ContainsKey(kv2.Key)) alltotalReport[kv.Key][kv2.Key] = new List<string>();
+
                 alltotalReport[kv.Key][kv2.Key].Add(kv2.Value);
             }
         }
-        
+
         // 求一个平均值放到最后一位
         foreach (var kv in alltotalReport)
         {
@@ -51,21 +51,28 @@ public class TaskComponent : Component
                 var sum = 0f;
                 foreach (var value in kv2.Value)
                 {
-                    sum += float.Parse(value);
+                    bool isfloat = float.TryParse(value, out float f);
+                    if (isfloat)
+                        sum += float.Parse(value);
+                    else
+                        sum = -1f;
                 }
-                kv2.Value.Add((sum / kv2.Value.Count).ToString());
+                if (sum != -1f)
+                    kv2.Value.Add((sum / kv2.Value.Count).ToString());
+                else
+                    kv2.Value.Add("");
             }
         }
     }
-    
+
     public void ReportAllSJ()
     {
         string data = DateTime.Now.ToString("yyyy-MM-dd");
         string path = $"Reports/SJ/{data}";
-        if(!Directory.Exists(path)) Directory.CreateDirectory(path);
+        if (!Directory.Exists(path)) Directory.CreateDirectory(path);
 
         string totalPath = $"{path}/{"海上搜救任务总体指标报告"}.xls";
-        DataTableExtensions.SaveToExcel(totalPath, alltotalReport,true);
+        DataTableExtensions.SaveToExcel(totalPath, alltotalReport, true);
     }
 }
 
@@ -86,15 +93,15 @@ public class TaskComponentUpdateSystem : UpdateSystem<TaskComponent>
 {
     public override void Update(TaskComponent self)
     {
-       if(self.SeaSJRescueMissions.Count <= 0) return;
-       
-       if(self.SeaSJRescueMissions.All(m => m.IsOver))
-       {
-           self.SJAllTotalTaskPerformance.FillData(self.SeaSJRescueMissions);
-           var report = self.SJAllTotalTaskPerformance.GetReport();
-           self.SaveSJ(report);
-           self.ReportAllSJ();
-           self.SeaSJRescueMissions.Clear();
-       }
+        if (self.SeaSJRescueMissions.Count <= 0) return;
+
+        if (self.SeaSJRescueMissions.All(m => m.IsOver))
+        {
+            self.SJAllTotalTaskPerformance.FillData(self.SeaSJRescueMissions);
+            var report = self.SJAllTotalTaskPerformance.GetReport();
+            self.SaveSJ(report);
+            self.ReportAllSJ();
+            self.SeaSJRescueMissions.Clear();
+        }
     }
 }

SimulationServer/Entity/SeaSJRescueMission.cs

@@ -1,4 +1,5 @@
 using KYFramework;
+using NPOI.SS.Formula.PTG;
 using SimulationServer.Utils;
 
 namespace SimulationServer;
@@ -18,23 +19,58 @@ public class SeaSJRescueMission : Entity
     public Dictionary<string, Dictionary<string, List<string>>> totalReport = new ();
 
     public bool IsOver = false;
+
+    private int currentExecuteCount = 1;
+    public int ExecutionContext = 0;
     public void Start()
     {
         IsRunning = true;
         aircrafts.ForEach(a => a.Start());
         Log.Info($"{MissionId} 任务开始！");
     }
-    
+
+    public void Reset()
+    {
+        SimulationTime = 0;
+        aircrafts?.ForEach(a => a.Reset());
+    }
+
     public void EndMission()
     {
         IsRunning = false;
-        
-        SaveSJ();
-        SaveTotalMH();
-        ReportSJ();
-        IsOver = true;
         Log.Info($"{MissionId} 任务结束！");
 
+        //SaveSJ();
+        //SaveTotalMH();
+        //ReportSJ();
+
+        if (currentExecuteCount > ExecutionContext)
+        {
+            return;
+        }
+
+        if (currentExecuteCount < ExecutionContext)
+        {
+            SaveSJ();
+            //SaveTotalMH();
+        }
+
+        if (currentExecuteCount == ExecutionContext)
+        {
+            SaveSJ();
+            SaveTotalMH();
+            ReportSJ();
+            //this.StartAsyncMH();
+            IsOver = true;
+            return;
+        }
+
+        this.Reset();
+        this.Start();
+        currentExecuteCount++;
+
+
+
         // var readyTime = AircraftXHs.First().TaskReadyTime;
         // Task.Delay(TimeSpan.FromSeconds(readyTime)).ContinueWith(t => this.StartAsyncXH());
     }

SimulationServer/EventHandler/CreateTaskEventHandler.cs

@@ -219,6 +219,7 @@ public class CreateSeaSJEventHandler : AEvent<CreateSeaSJTask>
         SeaSJRescueMission mission = ComponentFactory.Create<SeaSJRescueMission>();
         taskSys.SeaSJRescueMissions.Add(mission);
         mission.MissionId = $"海上搜索救援任务 {config.SeaSJTask.missionInformation.MissionName}";
+        mission.ExecutionContext = config.EditorConfig.runCounts;
         mission.AddComponent<SJTotalTaskPerformanceComponent>();
         for (int i = 0; i < config.SeaSJTask.missionInformation.AircraftInfos.Length; i++)
         {

SimulationServer/EventHandler/ServerStartEventHandler.cs

@@ -36,7 +36,7 @@ public class ServerStartEventHandler : AEvent<ServerStart>
 
         string ec_str = File.ReadAllText("Missions/editor_config.json");
         string tc_str = File.ReadAllText("Missions/task_config.json");
-        Console.WriteLine(tc_str);
+        //Console.WriteLine(tc_str);
         EditorConfig? editorConfig = JsonConvert.DeserializeObject<EditorConfig>(ec_str);
         TaskConfig? taskConfig = JsonConvert.DeserializeObject<TaskConfig>(tc_str);
 
@@ -82,6 +82,7 @@ public class ServerStartEventHandler : AEvent<ServerStart>
             //Console.WriteLine("SearchPayload:" + seaSJTask.SearchPayload);
             //Console.WriteLine("SearchMode:" + seaSJTask.SearchMode);
             //Console.WriteLine("RadarTransmitterPower:" + seaSJTask.RadarTransmitterPower);
+            Console.WriteLine("仿真次数:" + editorConfig.runCounts);
             Game.EventSystem.Publish(new CreateSeaSJTask
             { EditorConfig = editorConfig, SeaSJTask = seaSJTask });
         }

SimulationServer/bin/Debug/net7.0/Missions/editor_config.json

@@ -1,5 +1,5 @@
 {
-    "仿真次数": 100,
+    "仿真次数": 1,
     "想定信息": {
         "想定日期": "2024年6月4日",
         "想定时间": "00时00分00秒"