完成多次任务

Models/SimulationCommon/AircraftDB.cs

@@ -11,7 +11,8 @@ public class AircraftDB
     public object fxhsl;
     public object fzdzkl;
     public object fpjhyl;
-    
+    public object fjysj;
+    public object fjssj;
     
     public object fzdnz;
     public object fzdwgz;

Models/SimulationCommon/EquationHelper.cs

@@ -44,9 +44,9 @@ namespace MuShiApp
             try
             {
                 x = getx(aircraftPoint, targetPoint, course);
-
+              
                 double V = getVisibility(getCityName(targetPoint.x, targetPoint.y), DateTime.Now.ToString("yyyy-MM-dd HH"));
-
+               
                 System.Random ran = new System.Random();
                 double pt = this.nextDouble(ran, 0.800, 0.999, 8);
 
@@ -108,6 +108,7 @@ namespace MuShiApp
                     m_Args = new List<string> { "city_name", "weather_date" }
                 };
                 string response = m_HttpHelper.Request(cmd, new List<string> { city_name, weather_date });
+
                 R data = JsonConvert.DeserializeObject<R>(response);
                 if (data != null && data.code == 200)
                 {
@@ -164,9 +165,8 @@ namespace MuShiApp
                     m_Args = new List<string> { "lon", "lat" }
                 };
                 string response = m_HttpHelper.Request(cmd, new List<string> { lon.ToString(), lat.ToString() });
-
                 JObject jObject = JObject.Parse(response);
-                cityName = jObject[cityName].ToString().Replace("市", "").Replace("自治区", "");
+                cityName = jObject["cityName"].ToString().Replace("市", "").Replace("自治区", "");
 
             }
             catch (Exception ex)

SimulationServer/Component/EconomicalComponent.cs

@@ -41,7 +41,7 @@ public class EconomicalComponent : Component
         Economical.水库情况 = "自有";
         Economical.阻燃剂用量 = "0";
         Economical.泡沫用量 = "0";
-        Economical.单机总油耗 = GetParent<AircraftMH>().TotalFuelConsumption.ToString();
+        Economical.单机总油耗 = GetParent<AircraftMH>().TotalFuelConsumption.ToString("#0.00");
         Economical.单机机场使用情况 = GetParent<AircraftMH>().Airport;
         Economical.单机导航使用情况 = "0";
     }

SimulationServer/Component/StaticCapacityComponent.cs

@@ -47,8 +47,8 @@ public class StaticCapacityComponent : Component
         var aircraft = GetParent<AircraftMH>();
     
         StaticCapacity.初次出动准备时间 = aircraft.FlightPlanEditor.aircraftparameter.TakeoffPreparationTime.ToString();
-        StaticCapacity.再次补给时间 = 0.ToString();
-        StaticCapacity.任务载荷装载时间 = 0.ToString();
+        StaticCapacity.再次补给时间 = db.fjysj == null ? "0" : db.fjysj.ToString();
+        StaticCapacity.任务载荷装载时间 = db.fjssj == null ? "0" : db.fjssj.ToString();;
         StaticCapacity.舱内载荷 = db.fzdnz == null ? "0" : db.fzdnz.ToString();
         StaticCapacity.外吊挂载荷 = db.fzdwgz == null ? "0" : db.fzdwgz.ToString();
         StaticCapacity.空投精度 = AirdropAccuracy.GetIpForType(db.fConcreateType.ToString()).ToString();

SimulationServer/Component/TaskComponent.cs

@@ -1,15 +1,20 @@
 using KYFramework;
+using SimulationServer.Utils;
 
 namespace SimulationServer;
 
 public class TaskComponent : Component
 {
+    public static Weather Weather;
+    public static int Speed = 1000;
     // 救援任务列表
-    public List<RescueMission> RescueMissions;
+    public List<MHRescueMission> MHRescueMissions;
+    public List<XHRescueMission> XHRescueMissions;
 
     public void Start()
     {
-        RescueMissions?.ForEach(r => r.Start());
+        MHRescueMissions?.ForEach(r => r.Start());
+        XHRescueMissions?.ForEach(r => r.Start());
     }
 }
 
@@ -18,15 +23,7 @@ public class TaskComponentAwakeSystem : AwakeSystem<TaskComponent>
 {
     public override void Awake(TaskComponent self)
     {
-        self.RescueMissions = new List<RescueMission>();
+        self.MHRescueMissions = new List<MHRescueMission>();
+        self.XHRescueMissions = new List<XHRescueMission>();
     }
 }
-
-[ObjectSystem]
-public class TaskComponentUpdateSystem : UpdateSystem<TaskComponent>
-{
-    public override void Update(TaskComponent self)
-    {
-        
-    }
-}

SimulationServer/Component/TaskPerformanceComponent.cs

@@ -36,8 +36,8 @@ public class TaskPerformanceComponent : Component
         var aircraft = GetParent<AircraftMH>();
         
         TaskPerformance.任务准备时间 = aircraft.aircraftparameter.TakeoffPreparationTime.ToString();
-        TaskPerformance.单机入场时间 = aircraft.FirstTime.ToString();
-        TaskPerformance.单机有效任务时长 = aircraft.EffMisTime.ToString();
+        TaskPerformance.单机入场时间 = aircraft.FirstTime.ToString("#0.00");
+        TaskPerformance.单机有效任务时长 = aircraft.EffMisTime.ToString("#0.00");
         TaskPerformance.单机总投送人数 = aircraft.aircraftparameter.MaxPassengerNumber.ToString();
         TaskPerformance.单机总洒水量 = ((double)db.fsslwater * aircraft.waterTimes).ToString();
         TaskPerformance.单机总灭火剂投放量 = "0";

SimulationServer/Component/TotalTaskPerformanceComponent.cs

@@ -1,4 +1,5 @@
 using KYFramework;
+using Define = SimulationServer.Utils.Define;
 
 namespace SimulationServer;
 
@@ -20,14 +21,8 @@ public class TotalTaskPerformanceComponent : Component
     
     public void FillData()
     {
-        var mission = GetParent<RescueMission>();
+        var mission = GetParent<MHRescueMission>();
 
-        double time = 0;
-        foreach (var air in mission.Aircrafts)
-        {
-            time += air.EffMisTime;
-        }
-        
         double x = 18000;
         double y1 = 0.3096 * Math.Pow(x, 0.4893);
         double y2 = 1004.4520 * Math.Pow(x, 0.2193);
@@ -35,13 +30,25 @@ public class TotalTaskPerformanceComponent : Component
         double deadRoundedInt = Math.Round(y3);
         double injuredRoundedInt = Math.Round(y1-y3);
         
-        TotalTaskPerformance.任务响应时间 = mission.Aircrafts.First().TaskResponseTime.ToString();
-        TotalTaskPerformance.总任务耗时 = time.ToString();
+        TotalTaskPerformance.任务响应时间 = mission.Aircrafts.First().TaskResponseTime.ToString("#0.00");
+        TotalTaskPerformance.总任务耗时 = mission.tn.ToString("#0.00");
         TotalTaskPerformance.任务是否成功 = mission.Success ? "成功" : "失败";
-        // TotalTaskPerformance.火场面积变化率 = aircraft.FireAreaChangeRate.ToString();
-        // TotalTaskPerformance.蔓延速度变化率 = aircraft.SpreadSpeedChangeRate.ToString();
-        TotalTaskPerformance.直接灭火面积 = mission.FireGround.countArea.burnarea.ToString();
-        TotalTaskPerformance.过火面积 = 18000.ToString();
+        
+        //终止时刻过火面积
+        var end = Fire.burnedCalculate(Define.WIND, mission.slope, mission.tn, mission.InitArea);
+        TotalTaskPerformance.火场面积变化率 = (end.burnarea/mission.InitArea).ToString("#0.00");
+        
+        //初始时刻过火面积
+        var start = Fire.burnedCalculate(Define.WIND, mission.slope, 10*60, mission.InitArea);
+        
+        //初始时刻过火面积变化（10分钟面积差）/终止时刻过火面积变化（10分钟面积差）；总共算四个面积
+        TotalTaskPerformance.蔓延速度变化率 = (start.burnarea/end.burnarea).ToString("#0.00");
+        
+        //飞机加地面有效洒水面积叠加
+        TotalTaskPerformance.直接灭火面积 = mission.area.ToString("#0.00");
+        
+        TotalTaskPerformance.过火面积 = end.burnarea.ToString("#0.00");
+        
         TotalTaskPerformance.伤亡人数 = (deadRoundedInt + injuredRoundedInt).ToString();
     }
 

SimulationServer/Component/XHTotalTaskPerformanceComponent.cs

@@ -19,7 +19,7 @@ public class XHTotalTaskPerformanceComponent : Component
     
     public void FillData()
     {
-        var aircraft = GetParent<RescueMission>();
+        var aircraft = GetParent<XHRescueMission>();
 
         double time = 0;
         foreach (var ai in aircraft.AircraftXHs)

SimulationServer/Entity/AircraftMH.cs

@@ -1,59 +1,62 @@
 using KYFramework;
 using Model;
 using SimulationServer.Utils;
+using Define = SimulationServer.Utils.Define;
 
 namespace SimulationServer;
 
 public class AircraftMH : Entity ,IAircraft
 {
-    public AircraftParameter aircraftparameter;
     public string TaskName;
+    public AircraftParameter aircraftparameter;
     public string Name; // 飞机名称
     public string Type = "中型直升机"; // 飞机类型
     public double SprinklerArea = 1500; // 飞机速度
     public string NextMissionId; // 下一个任务ID
     public AircraftDB Db;
     public FlightPlanEditor? FlightPlanEditor; // 飞行计划编辑器
-    public TurningPoint[] turningPoints = new TurningPoint[2000];
-    public CurrentLocation currentLocation;
-    public Weather Weather;
-    private FireGround _fireGround;
-    private RescueMission _rescueMission;
     
+    public FireGround fireGround;
+    public MHRescueMission mhRescueMission;
+ 
+    public TurningPoint[] turningPoints = new TurningPoint[2000];
     private int PointNumberIcon = 0;
     public double T { get; set; } // 飞机开始飞到火场 需要多少时间
-
- 
-    // 洒水间隔
-    private int waterInterval = 4; 
+    private int waterInterval = 4;  // 洒水间隔
     public int waterTimes = 1; // 洒水次数
     public double ReadyTime;
     public double EnterTime; // 单机入场时间
     public double EffMisTime;// 单机有效任务时长
     public string Airport;
     public double FirstTime = 0; // 单机入场时间
-    public double slope; // 坡度
-    public double wind; // 有效洒水面积
-    
-    //任务响应时间
-    public double TaskResponseTime;
-    
-    private double area = 0; // 有效洒水面积  需要输出   直接灭火面积 + 地面灭火的面积
+    public double TaskResponseTime; //任务响应时间
     public double TotalFuelConsumption;
 
-    public void Awake()
+    
+    //任务重置
+    public void Reset()
     {
+        T = 0;
         EffMisTime = 0;
         FirstTime = 0;
+        PointNumberIcon = 0;
+   
+        waterTimes = 1;
+        TotalFuelConsumption = 0;
+        TaskResponseTime = 0;
+        waterInterval = 4;
+        
+        
         turningPoints = new TurningPoint[2000];
         for (int i = 0; i < turningPoints.Length; i++)
         {
             turningPoints[i] = new TurningPoint();
         }
-
-        PointNumberIcon = 0;
-        area = 0;
-        waterTimes = 1;
+    }
+    
+    // 任务开始
+    public void Start()
+    {
         turningPoints = FXJHGenerate.FromStartToMission(FlightPlanEditor,turningPoints);//生成从起点到任务段起点的航路点
         
         // 计算出第一次洒水的时间
@@ -71,32 +74,9 @@ public class AircraftMH : Entity ,IAircraft
             TaskResponseTime = T;
         }
         if (FirstTime == 0) FirstTime = T;
-        
-        Log.Info("第一次洒水时间： " + T);
-      
-    }
-    
-    public void Start(FireGround fireGround,RescueMission rescueMission)
-    {
-        this._fireGround = fireGround;
-        _rescueMission = rescueMission;
-        if (Db != null)
-        {
-            Type = Db?.fConcreateType.ToString();
-            SprinklerArea = (double)Db.fpsmj;
-            SprinklerArea = (double)Db?.fpsmj;
-        }
-        // 截取字符串 9°C
-        string temp = Weather.day_temp.Replace("°C", "");
-        var wind_temp = Weather.day_wind_comp.Replace("级", "").Split('-');
-        
-        wind = double.Parse(wind_temp[0]);
-        waterInterval = 4;
-        // Log.Info("风速：" + wind);
-        // Log.Info("Type:" + Type);
-        // Log.Info("SprinklerArea:" + SprinklerArea);
     }
 
+    // 任务结束
     public void End()
     {
         for(int i=0;i<5;i++)
@@ -112,24 +92,25 @@ public class AircraftMH : Entity ,IAircraft
         TotalFuelConsumption = turningPoints[0].RemainingFuel - turningPoints[PointNumberIcon + 3].RemainingFuel;
     }
     
+    // 更新
     public void Update(double time)
     {
-        if (_fireGround.countArea.burnarea > 0) // 灭火完成
+        if (fireGround.countArea.burnarea > 0) // 灭火完成
         {
             if (time > T)
             {
                 // 开始洒水
-                _fireGround.countArea = Fire.burnCalculate(wind, slope, T, _fireGround.countArea.burnarea, T, _rescueMission.tn , _fireGround.countArea.burnarea);
+                fireGround.countArea = Fire.burnCalculate(Define.WIND, mhRescueMission.slope, T, fireGround.countArea.burnarea, T, mhRescueMission.tn , fireGround.countArea.burnarea);
                 var currentArea =  Fire.SprinklerArea(Type, SprinklerArea) ; // 本次有效洒水面积
               
                 // Log.Info("fireGround.countArea.burnarea: " + _fireGround.countArea.burnarea);
                 // Log.Info("currentArea: " + currentArea);
                 
-                _fireGround.countArea.burnarea -= currentArea;
-                area += currentArea; // 有效洒水面积
-                //Log.Info($"任务 {TaskName }  {Name} 洒水{waterTimes} 次  本次有效洒水面积 {currentArea}  用时 {T}  area {area}  burnarea {_fireGround.countArea.burnarea}");
+                fireGround.countArea.burnarea -= currentArea;
+                mhRescueMission.area += currentArea; // 有效洒水面积
+                //Log.Info($"任务 {TaskName }  {Name} 洒水{waterTimes} 次  本次有效洒水面积 {currentArea}  用时 {T}  area {mhRescueMission.area}  burnarea {fireGround.countArea.burnarea}");
                 
-                _rescueMission.tn = T;
+                mhRescueMission.tn = T;
                 PointNumberIcon += 2;
                 waterTimes++;
                 // 计算出下一次洒水的时间
@@ -145,9 +126,6 @@ public class AircraftMH : Entity ,IAircraft
             }
         }
     }
-
-
-  
 }
 
 [ObjectSystem]
@@ -160,7 +138,14 @@ public class AircraftAwakeSystem : AwakeSystem<AircraftMH,FlightPlanEditor>
         
         self.Db = Util.GetAircraftDefine(self.FlightPlanEditor.aircraftparameter.AircraftType,self.FlightPlanEditor.aircraftparameter.AircraftSubType,self.FlightPlanEditor.aircraftparameter.AircraftID);
         
-        self.Awake();
+        if (self.Db != null)
+        {
+            self.Type = self.Db?.fConcreateType.ToString();
+            self.SprinklerArea = (double)self.Db.fpsmj;
+            self.SprinklerArea = (double)self.Db?.fpsmj;
+        }
+        
+        self.Reset();
     }
 }
 

SimulationServer/Entity/AircraftMHWithPersion.cs

@@ -1,6 +1,7 @@
 using KYFramework;
 using Model;
 using SimulationServer.Utils;
+using Define = SimulationServer.Utils.Define;
 
 namespace SimulationServer;
 
@@ -12,12 +13,12 @@ public class AircraftMHWithPersion : Entity ,IAircraft
     public MissionEndPoint missionEndPoint = new MissionEndPoint();
     public int GroundPersonnel;
     public int LandingPersonnel;
-    private RescueMission _rescueMission;
+    public MHRescueMission mhRescueMission;
     // 频率
     public string TaskName;
     public double Frequency = 10 * 60;
-    public Weather Weather;
-    private FireGround _fireGround;
+    public FireGround fireGround;
+ 
     public double T
     {
         get;
@@ -26,37 +27,33 @@ public class AircraftMHWithPersion : Entity ,IAircraft
     
     private int InterventionNumber = 0;
     private double InterventionTime;//介入时间
-    private double area = 0; // 有效洒水面积  需要输出
-    public double slope; // 坡度
     private int waterTimes = 1; // 洒水次数
-    public double wind; // 有效洒水面积
     public double TotalFuelConsumption;
     
     public void End()
     {
-        
+        turningPoints = null;
     }
 
-    public void Awake()
+    public void Reset()
     {
+        T = 0;
+        InterventionTime = 0;
+        TotalFuelConsumption = 0;
+        InterventionNumber = 0;
+        waterTimes = 1;
+        
+        
+        turningPoints = new TurningPoint[2000];
         for (int i = 0; i < turningPoints.Length; i++)
         {
             turningPoints[i] = new TurningPoint();
         }
-
-        waterTimes = 1;
-        turningPoints = FXJHGenerate.FromStartToMission(FlightPlanEditor,turningPoints);//生成从起点到任务段起点的航路点
+       
     }
-    public void Start(FireGround fireGround, RescueMission rescueMission)
+    public void Start()
     {
-        _rescueMission = rescueMission;
-        _fireGround = fireGround;
-        
-        // 截取字符串 9°C
-        string temp = Weather.day_temp.Replace("°C", "");
-        var wind_temp = Weather.day_wind_comp.Replace("级", "").Split('-');
-        
-        wind = double.Parse(wind_temp[0]);
+        turningPoints = FXJHGenerate.FromStartToMission(FlightPlanEditor,turningPoints);//生成从起点到任务段起点的航路点
         
         missionEndPoint.MissionEndPointLatitude = FlightPlanEditor.missionpoint.MissionPointLatitude;
         missionEndPoint.MissionEndPointLongitude = FlightPlanEditor.missionpoint.MissionPointLongitude;
@@ -116,7 +113,7 @@ public class AircraftMHWithPersion : Entity ,IAircraft
     
     public void Update(double time)
     {
-        if (_fireGround.countArea.burnarea > 0) // 灭火完成
+        if (fireGround.countArea.burnarea > 0) // 灭火完成
         {
             //Log.Info(T.ToString());
             if (time > T)
@@ -124,14 +121,14 @@ public class AircraftMHWithPersion : Entity ,IAircraft
                 //Log.Info("洒水之前火场面积：" + _fireGround.countArea.burnarea);
                 //Log.Info("时间差：" + (_rescueMission.tn - T));
                 // 开始洒水
-                _fireGround.countArea = Fire.burnCalculate(wind, slope, T, _fireGround.countArea.burnarea, T, _rescueMission.tn, _fireGround.countArea.burnarea);
+                fireGround.countArea = Fire.burnCalculate(Define.WIND, mhRescueMission.slope, T, fireGround.countArea.burnarea, T, mhRescueMission.tn, fireGround.countArea.burnarea);
                 var currentArea = Fire.groundPersonnelWater(InterventionNumber);
                 //Log.Info("洒水之后火场面积：" + _fireGround.countArea.burnarea);
-                _fireGround.countArea.burnarea -= currentArea;
-                _rescueMission.tn = T;
-                area += currentArea; // 有效洒水面积
+                fireGround.countArea.burnarea -= currentArea;
+                mhRescueMission.tn = T;
+                mhRescueMission.area += currentArea; // 有效洒水面积;
             
-                //Log.Info($"任务 {TaskName} 地面灭火 洒水{waterTimes} 次  本次有效洒水面积 {currentArea}   用时 {T}  area {area} burnarea {_fireGround.countArea.burnarea}");
+                //Log.Info($"任务 {TaskName} 地面灭火 洒水{waterTimes} 次  本次有效洒水面积 {currentArea}   用时 {T}  area {mhRescueMission.area} burnarea {fireGround.countArea.burnarea}");
                 waterTimes++;
                 
                 T +=  Frequency;//飞机开始飞到火场 需要多少时间 t
@@ -147,6 +144,6 @@ public class AircraftMHWithPersionAwakeSystem : AwakeSystem<AircraftMHWithPersio
     public override void Awake(AircraftMHWithPersion self,FlightPlanEditor flightPlanEditor)
     {
         self.FlightPlanEditor = flightPlanEditor;
-       self.Awake();
+        self.Reset();
     }
 }

SimulationServer/Entity/AircraftXH.cs

@@ -29,11 +29,8 @@ public class AircraftXH : Entity
     private double temptime = 0;
     private double probability = 0;
     private double finalProbability = 1.0;
-    
     private bool isSeeFire = false;
-
-    private bool isOver = false;
-
+    public bool isOver = false;
 
     public void Awake()
     {
@@ -62,52 +59,52 @@ public class AircraftXH : Entity
     }
     public void Update()
     {
-        if (isOver)
-        {
-            finalProbability = 1 - finalProbability;
-
-            turningPoints = FXJHGenerate.FromMissionToEnd(FlightPlanEditor, new MissionEndPoint
-            {
-                MissionEndPointLongitude = currentLocation.CurrentLon,
-                MissionEndPointLatitude = currentLocation.CurrentLat,
-                MissionEndPointHeight = currentLocation.CurrentHei
-            }, turningPoints, currentLocation.Currentsegnum);
-            
-            turningPoints = FXJHGenerate.FXJHTPDiedai(FlightPlanEditor, turningPoints, currentLocation.Currentsegnum + 2);
-            isOver = false;
-            return;
-        }
+        // if (isOver)
+        // {
+        //     finalProbability = 1 - finalProbability;
+        //
+        //     turningPoints = FXJHGenerate.FromMissionToEnd(FlightPlanEditor, new MissionEndPoint
+        //     {
+        //         MissionEndPointLongitude = currentLocation.CurrentLon,
+        //         MissionEndPointLatitude = currentLocation.CurrentLat,
+        //         MissionEndPointHeight = currentLocation.CurrentHei
+        //     }, turningPoints, currentLocation.Currentsegnum);
+        //     
+        //     turningPoints = FXJHGenerate.FXJHTPDiedai(FlightPlanEditor, turningPoints, currentLocation.Currentsegnum + 2);
+        //     isOver = false;
+        //     return;
+        // }
         if (!isSeeFire) // 发现火情
         {
             currentLocation = FXJHGenerate.GetCurrentLocation(turningPoints, FlightPlanEditor, temptime);
             double3 aricraftPoint = new double3(currentLocation.CurrentLon,currentLocation.CurrentLat,currentLocation.CurrentHei);
-            
+         
             double3 targetPoint = new double3(FlightPlanEditor.firepoint[0].FirePointLongitude,FlightPlanEditor.firepoint[0].FirePointLatitude, FlightPlanEditor.firepoint[0].FirePointHeight);
             
             probability = helper.getProbability(aricraftPoint,targetPoint,currentLocation.CurrentCourse,"");
-
+           
             finalProbability *= (1 - probability);
             
-            Console.WriteLine($"当前时间：{temptime}，当前位置：{currentLocation.CurrentLon},{currentLocation.CurrentLat},{currentLocation.CurrentHei}，概率：{probability}，最终概率：{finalProbability}，是否看到火点：{isSeeFire}");
-            var randomValue = random.NextDouble();
-
-            if (randomValue < (1 - finalProbability))
-            {
-                isSeeFire = true;
-                isOver = true;
-                Log.Info("发现火情");
-            }
-            else
-            {
-                isSeeFire = false;
-            }
-
-            if (temptime >= 7200)
-            {
-                isOver = true;
-            }
-            
-            temptime++;
+            // Console.WriteLine($"当前时间：{temptime}，当前位置：{currentLocation.CurrentLon},{currentLocation.CurrentLat},{currentLocation.CurrentHei}，概率：{probability}，最终概率：{finalProbability}，是否看到火点：{isSeeFire}");
+            // var randomValue = random.NextDouble();
+            //
+            // if (randomValue < (1 - finalProbability))
+            // {
+            //     isSeeFire = true;
+            //     isOver = true;
+            //     Log.Info("发现火情");
+            // }
+            // else
+            // {
+            //     isSeeFire = false;
+            // }
+            //
+            // if (temptime >= 7200)
+            // {
+            //     isOver = true;
+            // }
+            //
+            // temptime++;
         }
     }
 }

SimulationServer/Entity/RescueMission.cs → SimulationServer/Entity/MHRescueMission.cs

@@ -1,36 +1,32 @@
 using KYFramework;
-using MongoDB.Bson;
 using SimulationServer.Utils;
 
 namespace SimulationServer;
 
-public class RescueMission : Entity
+public class MHRescueMission : Entity
 {
     public string MissionId; // 任务ID
     public bool Success; // 任务是否成功
 
     public double SimTime;
-    // 倍速
-    public double Speed = 1000;
 
     public double InitArea;
-    //执行次数
-    public int ExecuteCount = 2;
     private int currentExecuteCount = 1;
-    
-    public string MissionType; // 任务类型
+    public int ExecutionContext = 3;
     
     // 火场点
     public FireGround FireGround;
+    public double slope;
+    public double area;
 
     public double tn;
+
+    public List<string> successes = new List<string>();
     
     // 救援飞机
     public List<AircraftMH> Aircrafts = new List<AircraftMH>();
     public List<AircraftMHWithPersion> AircraftWithPersions = new List<AircraftMHWithPersion>();
-    public List<AircraftXH> AircraftXHs = new List<AircraftXH>();
     public List<AircraftSHJ> AircraftSHJs = new List<AircraftSHJ>();
-    public List<AircraftZC> AircraftZCs = new List<AircraftZC>();
 
     public bool IsRunning;
     public Action End;
@@ -40,33 +36,32 @@ public class RescueMission : Entity
    Dictionary<string,Dictionary<string,Dictionary<string,List<string>>>> singleReport =
         new Dictionary<string, Dictionary<string, Dictionary<string, List<string>>>>();
    
-   // 巡护的 单机能力
-   // <机型，<sheet,<指标名，值列表>>>
-   Dictionary<string,Dictionary<string,Dictionary<string,List<string>>>> singleXHReport =
-       new Dictionary<string, Dictionary<string, Dictionary<string, List<string>>>>();
     
     // 灭火的 整体能力
     Dictionary<string, Dictionary<string, List<string>>> totalReport =
         new Dictionary<string, Dictionary<string, List<string>>>();
     
-    // 灭火的 整体能力
-    Dictionary<string, Dictionary<string, List<string>>> totalXhReport =
+    Dictionary<string, Dictionary<string, List<string>>> equipReport =
         new Dictionary<string, Dictionary<string, List<string>>>();
 
-    public void Start()
+    public void Reset()
     {
-        IsRunning = true;
         SimTime = 0;
-        Aircrafts?.ForEach(a => a.Start(FireGround, this));
-        AircraftWithPersions?.ForEach(a => a.Start(FireGround,this));
+        area = 0;
         aircrafts.Clear();
         aircrafts.AddRange(Aircrafts);
         aircrafts.AddRange(AircraftWithPersions);
-
-        if (FireGround != null)
-        {
-            FireGround.countArea = new Fire.CountArea() { burnarea = InitArea};
-        }
+        FireGround.countArea = new Fire.CountArea() { burnarea = InitArea};
+        Aircrafts?.ForEach(a => a.Reset());
+        AircraftWithPersions?.ForEach(a => a.Reset());
+        
+    }
+    
+    public void Start()
+    {
+        IsRunning = true;
+        Aircrafts?.ForEach(a => a.Start());
+        AircraftWithPersions?.ForEach(a => a.Start());
         Log.Info($"{MissionId} 任务开始！");
     }
     
@@ -77,53 +72,28 @@ public class RescueMission : Entity
         // 灭火完成 任务结束
         End?.Invoke();
         
-        if(MissionType == "灭火")
+        // SaveMH();
+        // ReportMH();
+
+        if (currentExecuteCount > ExecutionContext)
         {
-            SaveMH();
-            ReportMH();
+            return;
         }
-        else
+        
+        if (currentExecuteCount < ExecutionContext)
         {
-            SaveXH();
-            ReportXH();
+            SaveTotalMH();
         }
         
-        // 输出或保存报告
-        // if(currentExecuteCount <= ExecuteCount)
-        // {
-        //     if(MissionType == "灭火")
-        //     {
-        //         SaveMH();
-        //         Log.Info("保存任务数据");
-        //     }
-        //     else
-        //     {
-        //         SaveXH();
-        //     }
-        // }
-        // else
-        // {
-        //     if(MissionType == "灭火")
-        //     {
-        //         ReportMH();
-        //     }
-        //     else
-        //     {
-        //         ReportXH();
-        //     }
-        //     return;
-        // }
-        
-        
-        // Aircrafts?.ForEach(a => a.Awake());
-        // AircraftWithPersions?.ForEach(a => a.Awake());
-        // AircraftXHs?.ForEach(a => a.Awake());
-        // AircraftSHJs?.ForEach(a => a.Awake());
-        // AircraftZCs?.ForEach(a => a.Awake());
-        //
-        // this.Start();
-        //
-        // currentExecuteCount++;
+        if(currentExecuteCount == ExecutionContext)
+        {
+            SaveMH();
+            SaveTotalMH();
+            ReportMH();
+        }
+        this.Reset();
+        this.Start();
+        currentExecuteCount++;
     }
 
     
@@ -158,7 +128,7 @@ public class RescueMission : Entity
                     singleReport[aircraftMh.Name][kv.Key][kv2.Key].Add(kv2.Value);
                 }
             }
-
+           
             Dictionary<string, Dictionary<string, string>> taskReport = taskPerformance.GetReport();
             foreach (var kv in taskReport)
             {
@@ -182,7 +152,10 @@ public class RescueMission : Entity
                 }
             }
         }
-        
+    }
+
+    public void SaveTotalMH()
+    {
         var totalPerformance = GetComponent<TotalTaskPerformanceComponent>();
         totalPerformance.FillData();
         var totalPerformanceReport = totalPerformance.GetReport();
@@ -193,11 +166,20 @@ public class RescueMission : Entity
             foreach (var kv2 in kv.Value)
             {
                 if (!totalReport[kv.Key].ContainsKey(kv2.Key)) totalReport[kv.Key][kv2.Key] = new List<string>();
-                totalReport[kv.Key][kv2.Key].Add(kv2.Value);
+                
+                if(kv2.Key == "任务成功率")
+                {
+                    successes.Add(kv2.Value);
+                    
+                    totalReport[kv.Key][kv2.Key].Add((getSuccessRate() * 100) + "%");
+                }
+                else
+                {
+                    totalReport[kv.Key][kv2.Key].Add(kv2.Value);
+                }
             }
         }
         
-        
         var TotalEconomical = GetComponent<TotalEconomicalComponent>();
         TotalEconomical.FillData();
         var totalEconomicalReport = TotalEconomical.GetReport();
@@ -210,104 +192,60 @@ public class RescueMission : Entity
                 totalReport[kv.Key][kv2.Key].Add(kv2.Value);
             }
         }
-    }
-
-    public void SaveXH()
-    {
-        foreach (AircraftXH aircraftXh in AircraftXHs)
+        
+        var TotalEquipment = GetComponent<EquipmentComponent>();
+        TotalEquipment.FillData();
+        var totalEquipmentReport = TotalEquipment.GetReport();
+        foreach (var kv in totalEquipmentReport)
         {
-            var staticCapacity = aircraftXh.GetComponent<XHStaticCapacityComponent>();
-            var economical = aircraftXh.GetComponent<XHEconomicalComponent>();
-            
-            staticCapacity.FillData(aircraftXh.Db);
-            economical.FillData(aircraftXh.Db);
-
-            if (!singleReport.ContainsKey(aircraftXh.Type))
-            {
-                singleReport[aircraftXh.Name] = new Dictionary<string, Dictionary<string, List<string>>>();
-            }
-
-
-            // 1次的报告
-            Dictionary<string, Dictionary<string, string>> staticReport = staticCapacity.GetReport();
-            foreach (var kv in staticReport)
-            {
-                if(!singleReport[aircraftXh.Name].ContainsKey(kv.Key)) singleReport[aircraftXh.Name][kv.Key] = new Dictionary<string, List<string>>();
-                foreach (var kv2 in kv.Value)
-                {
-                    if (!singleReport[aircraftXh.Name][kv.Key].ContainsKey(kv2.Key)) singleReport[aircraftXh.Name][kv.Key][kv2.Key] = new List<string>();
-                    singleReport[aircraftXh.Name][kv.Key][kv2.Key].Add(kv2.Value);
-                }
-            }
-            Dictionary<string, Dictionary<string, string>> economicalReport = economical.GetReport();
-            foreach (var kv in economicalReport)
+            if(!equipReport.ContainsKey(kv.Key)) equipReport[kv.Key] = new Dictionary<string, List<string>>();
+            foreach (var kv2 in kv.Value)
             {
-                if(!singleReport[aircraftXh.Name].ContainsKey(kv.Key)) singleReport[aircraftXh.Name][kv.Key] = new Dictionary<string, List<string>>();
-                foreach (var kv2 in kv.Value)
-                {
-                    if (!singleReport[aircraftXh.Name][kv.Key].ContainsKey(kv2.Key)) singleReport[aircraftXh.Name][kv.Key][kv2.Key] = new List<string>();
-                    singleReport[aircraftXh.Name][kv.Key][kv2.Key].Add(kv2.Value);
-                }
+                if (!equipReport[kv.Key].ContainsKey(kv2.Key)) equipReport[kv.Key][kv2.Key] = new List<string>();
+                equipReport[kv.Key][kv2.Key].Add(kv2.Value);
             }
         }
-        
-        var totalPerformance = GetComponent<XHTotalTaskPerformanceComponent>();
-        totalPerformance.FillData();
-        var totalPerformanceReport = totalPerformance.GetReport();
-        foreach (var kv in totalPerformanceReport)
+    }
+    
+    public float getSuccessRate()
+    {
+        int count = 0;
+        foreach (string success in successes)
         {
-            if(!totalXhReport.ContainsKey(kv.Key)) totalXhReport[kv.Key] = new Dictionary<string, List<string>>();
-            foreach (var kv2 in kv.Value)
+            if(success == "成功")
             {
-                if (!totalXhReport[kv.Key].ContainsKey(kv2.Key)) totalXhReport[kv.Key][kv2.Key] = new List<string>();
-                totalXhReport[kv.Key][kv2.Key].Add(kv2.Value);
+                count++;
             }
         }
-    }
-
 
+        return count / successes.Count;
+    }
 
     public void ReportMH()
     {
         string data = DateTime.Now.ToString("yyyy-MM-dd");
-        
         string path = $"Reports/MH/{data}/{MissionId}";
-        
         if(!Directory.Exists(path)) Directory.CreateDirectory(path);
-       
         foreach (var kv in singleReport)
         {
             string filePath = $"{path}/{kv.Key}灭火任务单机指标报告.xls";
             DataTableExtensions.SaveToExcel(filePath, kv.Value);
         }
         string totalPath = $"{path}/{"灭火任务总体指标报告"}.xls";
-        // TODO 算出 成功率
-        
         DataTableExtensions.SaveToExcel(totalPath, totalReport);
-    }
-    
-    public void ReportXH()
-    {
-        string data = DateTime.Now.ToString("yyyy-MM-dd");
-        string path = $"Reports/XH/{data}/{MissionId}";
-        if(!Directory.Exists(path)) Directory.CreateDirectory(path);
-        foreach (var kv in singleReport)
-        {
-            string filePath = $"{path}/{kv.Key}巡护任务单机指标报告.xls";
-            DataTableExtensions.SaveToExcel(filePath, kv.Value);
-        }
-        string totalPath = $"{path}/{"巡护任务总体指标报告"}.xls";
-        DataTableExtensions.SaveToExcel(totalPath, totalXhReport);
+        
+        string equicPath = $"{path}/{"装备体系评估报告"}.xls";
+        DataTableExtensions.SaveToExcel(equicPath, equipReport);
     }
 }
 
 [ObjectSystem]
-public class RescueMissionUpdateSystem : UpdateSystem<RescueMission>
+public class RescueMissionUpdateSystem : UpdateSystem<MHRescueMission>
 {
-    public override void Update(RescueMission self)
+    public override void Update(MHRescueMission self)
     {
         if(!self.IsRunning) return;
-        if(self.FireGround == null) return;
+        
         if (self.FireGround.countArea.burnarea <= 0)
         {
             self.Success = true;
@@ -317,8 +255,6 @@ public class RescueMissionUpdateSystem : UpdateSystem<RescueMission>
         
         self.aircrafts.Sort((a, b) => a.T.CompareTo(b.T));
         self.aircrafts.ForEach(a => a.Update(self.SimTime));
-      
-        self.AircraftXHs?.ForEach(a => a.Update());
-        self.SimTime += 1 * self.Speed;
+        self.SimTime += 1 * TaskComponent.Speed;
     }
 }

SimulationServer/Entity/XHRescueMission.cs

@@ -0,0 +1,162 @@
+using KYFramework;
+using MongoDB.Bson;
+using SimulationServer.Utils;
+
+namespace SimulationServer;
+
+public class XHRescueMission : Entity
+{
+    public string MissionId; // 任务ID
+    public bool Success; // 任务是否成功
+
+    // 火场点
+    public FireGround FireGround;
+
+    public double tn;
+    
+    public List<AircraftXH> AircraftXHs = new List<AircraftXH>();
+
+    public bool IsRunning;
+    public Action End;
+  
+   
+   // 巡护的 单机能力
+   // <机型，<sheet,<指标名，值列表>>>
+   Dictionary<string,Dictionary<string,Dictionary<string,List<string>>>> singleReport =
+       new Dictionary<string, Dictionary<string, Dictionary<string, List<string>>>>();
+    
+    
+    // 灭火的 整体能力
+    Dictionary<string, Dictionary<string, List<string>>> totalXhReport =
+        new Dictionary<string, Dictionary<string, List<string>>>();
+
+    Dictionary<string, Dictionary<string, List<string>>> equipReport =
+        new Dictionary<string, Dictionary<string, List<string>>>();
+
+    public void Reset()
+    {
+        
+    }
+    
+    public void Start()
+    {
+        IsRunning = true;
+        Log.Info($"{MissionId} 任务开始！");
+    }
+    
+    public void EndMission()
+    {
+        IsRunning = false;
+        Log.Info($"{MissionId} 任务结束！");
+        // 灭火完成 任务结束
+        End?.Invoke();
+
+        SaveXH();
+        ReportXH();
+    }
+
+    
+
+    public void SaveXH()
+    {
+        foreach (AircraftXH aircraftXh in AircraftXHs)
+        {
+            var staticCapacity = aircraftXh.GetComponent<XHStaticCapacityComponent>();
+            var economical = aircraftXh.GetComponent<XHEconomicalComponent>();
+            
+            staticCapacity.FillData(aircraftXh.Db);
+            economical.FillData(aircraftXh.Db);
+
+            if (!singleReport.ContainsKey(aircraftXh.Type))
+            {
+                singleReport[aircraftXh.Name] = new Dictionary<string, Dictionary<string, List<string>>>();
+            }
+
+
+            // 1次的报告
+            Dictionary<string, Dictionary<string, string>> staticReport = staticCapacity.GetReport();
+            foreach (var kv in staticReport)
+            {
+                if(!singleReport[aircraftXh.Name].ContainsKey(kv.Key)) singleReport[aircraftXh.Name][kv.Key] = new Dictionary<string, List<string>>();
+                foreach (var kv2 in kv.Value)
+                {
+                    if (!singleReport[aircraftXh.Name][kv.Key].ContainsKey(kv2.Key)) singleReport[aircraftXh.Name][kv.Key][kv2.Key] = new List<string>();
+                    singleReport[aircraftXh.Name][kv.Key][kv2.Key].Add(kv2.Value);
+                }
+            }
+            Dictionary<string, Dictionary<string, string>> economicalReport = economical.GetReport();
+            foreach (var kv in economicalReport)
+            {
+                if(!singleReport[aircraftXh.Name].ContainsKey(kv.Key)) singleReport[aircraftXh.Name][kv.Key] = new Dictionary<string, List<string>>();
+                foreach (var kv2 in kv.Value)
+                {
+                    if (!singleReport[aircraftXh.Name][kv.Key].ContainsKey(kv2.Key)) singleReport[aircraftXh.Name][kv.Key][kv2.Key] = new List<string>();
+                    singleReport[aircraftXh.Name][kv.Key][kv2.Key].Add(kv2.Value);
+                }
+            }
+        }
+        
+        var totalPerformance = GetComponent<XHTotalTaskPerformanceComponent>();
+        totalPerformance.FillData();
+        var totalPerformanceReport = totalPerformance.GetReport();
+        foreach (var kv in totalPerformanceReport)
+        {
+            if(!totalXhReport.ContainsKey(kv.Key)) totalXhReport[kv.Key] = new Dictionary<string, List<string>>();
+            foreach (var kv2 in kv.Value)
+            {
+                if (!totalXhReport[kv.Key].ContainsKey(kv2.Key)) totalXhReport[kv.Key][kv2.Key] = new List<string>();
+                totalXhReport[kv.Key][kv2.Key].Add(kv2.Value);
+            }
+        }
+        
+        var TotalEquipment = GetComponent<EquipmentComponent>();
+        TotalEquipment.FillData();
+        var totalEquipmentReport = TotalEquipment.GetReport();
+        foreach (var kv in totalEquipmentReport)
+        {
+            if(!equipReport.ContainsKey(kv.Key)) equipReport[kv.Key] = new Dictionary<string, List<string>>();
+            foreach (var kv2 in kv.Value)
+            {
+                if (!equipReport[kv.Key].ContainsKey(kv2.Key)) equipReport[kv.Key][kv2.Key] = new List<string>();
+                equipReport[kv.Key][kv2.Key].Add(kv2.Value);
+            }
+        }
+    }
+
+    public void ReportXH()
+    {
+        string data = DateTime.Now.ToString("yyyy-MM-dd");
+        string path = $"Reports/XH/{data}/{MissionId}";
+        if(!Directory.Exists(path)) Directory.CreateDirectory(path);
+        foreach (var kv in singleReport)
+        {
+            string filePath = $"{path}/{kv.Key}巡护任务单机指标报告.xls";
+            DataTableExtensions.SaveToExcel(filePath, kv.Value);
+        }
+        string totalPath = $"{path}/{"巡护任务总体指标报告"}.xls";
+        DataTableExtensions.SaveToExcel(totalPath, totalXhReport);
+        
+        string equicPath = $"{path}/{"装备体系评估报告"}.xls";
+        DataTableExtensions.SaveToExcel(equicPath, equipReport);
+    }
+}
+
+[ObjectSystem]
+public class XHRescueMissionUpdateSystem : UpdateSystem<XHRescueMission>
+{
+    public override void Update(XHRescueMission self)
+    {
+        if(!self.IsRunning) return;
+        
+        self.AircraftXHs?.ForEach(a => a.Update());
+        
+        foreach (var aircraftXh in self.AircraftXHs)
+        {
+            if(aircraftXh.isOver)
+            {
+                self.EndMission();
+                self.IsRunning = false;
+            }
+        }
+    }
+}

SimulationServer/EventHandler/ServerStartEventHandler.cs

@@ -1,9 +1,10 @@
 using Cysharp.Threading.Tasks;
 using KYFramework;
 using Model;
-using MongoDB.Bson;
 using Newtonsoft.Json;
 using SimulationServer.Utils;
+using SimulationSingleServer.Utils;
+using Define = SimulationServer.Utils.Define;
 
 namespace SimulationServer;
 
@@ -14,6 +15,8 @@ public class ServerStartEventHandler : AEvent<ServerStart>
     {
         Log.Info("服务器启动完成！");
         var taskSys = Game.Scene.GetComponent<TaskComponent>();
+
+        HttpInterface.serverIp = File.ReadAllText("dbIp.txt");
         // 读取任务配置文件
         string ec_path = "Missions/editor_config.json";
         string tc_path = "Missions/task_config.json";
@@ -24,7 +27,7 @@ public class ServerStartEventHandler : AEvent<ServerStart>
         }
         
         if (!File.Exists(tc_path))
-        {
+        { 
             Log.Error("task_config.json文件不存在！");
             return UniTask.CompletedTask;
         }
@@ -39,22 +42,26 @@ public class ServerStartEventHandler : AEvent<ServerStart>
             Log.Error("配置文件解析失败！");
             return UniTask.CompletedTask;
         }
-      
         //Weather weather = Util.GetWeather("内蒙古", "根河", DateTime.Now.ToString("2024-05-10"));
-        Weather weather = new Weather();
-
+        TaskComponent.Weather = new Weather(); 
+        var temp = TaskComponent.Weather.day_temp.Replace("°C", "");
+        Define.TEMPERATURE = double.Parse(temp);
+        var wind_temp = TaskComponent.Weather.day_wind_comp.Replace("级", "").Split('-');
+        Define.WIND = double.Parse(wind_temp[0]);
+        
+        
         foreach (MHTaskConfig mHTaskConfig in taskConfig.mHTaskConfigs)
         {
-            RescueMission mission = ComponentFactory.Create<RescueMission>();
+            MHRescueMission mission = ComponentFactory.Create<MHRescueMission>();
 
             mission.AddComponent<TotalTaskPerformanceComponent>();
             mission.AddComponent<TotalEconomicalComponent>();
             mission.AddComponent<EquipmentComponent>();
-            taskSys.RescueMissions.Add(mission);
+            
+            taskSys.MHRescueMissions.Add(mission);
             mission.MissionId = $"灭火任务 {mHTaskConfig.TotalMHId}";
-            mission.MissionType = "灭火";
             Log.Info($"创建任务 ： {mHTaskConfig.TotalMHId}");
-            double slope = Util.GetSlope(editorConfig.firePoints[mHTaskConfig.FirePointId - 1].FirePointLongitude,
+            mission.slope = Util.GetSlope(editorConfig.firePoints[mHTaskConfig.FirePointId - 1].FirePointLongitude,
                 editorConfig.firePoints[mHTaskConfig.FirePointId - 1].FirePointLatitude, 30);
             FireGround fireGround = ComponentFactory.Create<FireGround>();
             mission.FireGround = fireGround;
@@ -85,12 +92,12 @@ public class ServerStartEventHandler : AEvent<ServerStart>
                     AircraftMH aircraft = ComponentFactory.Create<AircraftMH, FlightPlanEditor>( flightPlanEditor);
                     aircraft.Name = mhTask.missionInformation.AircraftInfos[i];
                     aircraft.NextMissionId = mhTask.NextTaskId;
+                    aircraft.fireGround = fireGround;
+                    aircraft.mhRescueMission = mission;
                     mission.Aircrafts.Add(aircraft);
                     aircraft.aircraftparameter = flightPlanEditor.aircraftparameter;
                     aircraft.Airport = flightPlanEditor.originbase.BaseName;
-                    aircraft.Weather = weather;
                     aircraft.TaskName = mhTask.missionInformation.MissionName;
-                    aircraft.slope = slope;
                     mission.End += aircraft.End;
                     aircraft.AddComponent<StaticCapacityComponent>();
                     aircraft.AddComponent<TaskPerformanceComponent>();
@@ -119,14 +126,14 @@ public class ServerStartEventHandler : AEvent<ServerStart>
                     flightPlanEditor.cityweather = editorConfig.cityWeather;
                     
                     AircraftMHWithPersion aircraftWithPerson = ComponentFactory.Create<AircraftMHWithPersion, FlightPlanEditor>( flightPlanEditor);
-                    aircraftWithPerson.Weather = weather;
                     mission.End += aircraftWithPerson.End;
+                    aircraftWithPerson.fireGround = fireGround;
+                    aircraftWithPerson.mhRescueMission = mission;
                     aircraftWithPerson.GroundPersonnel = (int)dmmhTask.GroundPersonnel;
                     aircraftWithPerson.LandingPersonnel = (int)dmmhTask.LandingPersonnel;
                     aircraftWithPerson.NextMissionId = dmmhTask.NextTaskId;
                     aircraftWithPerson.TaskName = dmmhTask.missionInformation.MissionName;
                     mission.AircraftWithPersions.Add(aircraftWithPerson);
-                   
                     Log.Info($"创建机型 ： {flightPlanEditor.aircraftparameter.AircraftID}");
                 }
             }
@@ -158,92 +165,93 @@ public class ServerStartEventHandler : AEvent<ServerStart>
         }
 
 
-        foreach (ZCTask zcTask in taskConfig.zCTask)
-        {
-            RescueMission mission = ComponentFactory.Create<RescueMission>();
-            taskSys.RescueMissions.Add(mission);
-            //mission.MissionId = zcTask.TotalZCId;
-            mission.MissionId = $"侦擦任务 {zcTask.missionInformation.MissionId}";
-            FireGround fireGround = ComponentFactory.Create<FireGround>();
-            fireGround.countArea.burnarea = editorConfig.firePoints[zcTask.FirePointId - 1].InitialArea;
-            fireGround.FirePoint = new DVector
-            {
-                Latitude = editorConfig.firePoints[zcTask.FirePointId - 1].FirePointLatitude,
-                Longitude = editorConfig.firePoints[zcTask.FirePointId - 1].FirePointLongitude,
-                Altitude = editorConfig.firePoints[zcTask.FirePointId - 1].FirePointHeight
-            };
-            mission.InitArea = editorConfig.firePoints[zcTask.FirePointId - 1].InitialArea;
-            if(zcTask.missionInformation.AircraftInfos == null) continue;
-            for (int i = 0; i < zcTask.missionInformation.AircraftInfos.Length; i++)
-            {
-                FlightPlanEditor? flightPlanEditor = new FlightPlanEditor();
-
-                flightPlanEditor.aircraftparameter =
-                    editorConfig.aircraftParameters.Find(
-                        a => a.AircraftID == zcTask.missionInformation.AircraftInfos[i]);
-                flightPlanEditor.firepoint = new FirePoint[1];
-                flightPlanEditor.firepoint[0] = editorConfig.firePoints[zcTask.FirePointId - 1];
-                flightPlanEditor.missionpoint = zcTask.MissionPoints[0];
-                flightPlanEditor.originbase =
-                    editorConfig.bases.Find(b => b.BaseId == flightPlanEditor.aircraftparameter.AirportId);
-                flightPlanEditor.climbsegment = editorConfig.climbSegment;
-                flightPlanEditor.descentsegment = editorConfig.descentSegment;
-                flightPlanEditor.cruisesegment = editorConfig.cruiseSegment;
-                flightPlanEditor.cityweather = editorConfig.cityWeather;
+        // foreach (ZCTask zcTask in taskConfig.zCTask)
+        // {
+        //     MHRescueMission mission = ComponentFactory.Create<MHRescueMission>();
+        //     taskSys.RescueMissions.Add(mission);
+        //     //mission.MissionId = zcTask.TotalZCId;
+        //     mission.MissionId = $"侦擦任务 {zcTask.missionInformation.MissionId}";
+        //     FireGround fireGround = ComponentFactory.Create<FireGround>();
+        //     fireGround.countArea.burnarea = editorConfig.firePoints[zcTask.FirePointId - 1].InitialArea;
+        //     fireGround.FirePoint = new DVector
+        //     {
+        //         Latitude = editorConfig.firePoints[zcTask.FirePointId - 1].FirePointLatitude,
+        //         Longitude = editorConfig.firePoints[zcTask.FirePointId - 1].FirePointLongitude,
+        //         Altitude = editorConfig.firePoints[zcTask.FirePointId - 1].FirePointHeight
+        //     };
+        //     mission.InitArea = editorConfig.firePoints[zcTask.FirePointId - 1].InitialArea;
+        //     if(zcTask.missionInformation.AircraftInfos == null) continue;
+        //     for (int i = 0; i < zcTask.missionInformation.AircraftInfos.Length; i++)
+        //     {
+        //         FlightPlanEditor? flightPlanEditor = new FlightPlanEditor();
+        //
+        //         flightPlanEditor.aircraftparameter =
+        //             editorConfig.aircraftParameters.Find(
+        //                 a => a.AircraftID == zcTask.missionInformation.AircraftInfos[i]);
+        //         flightPlanEditor.firepoint = new FirePoint[1];
+        //         flightPlanEditor.firepoint[0] = editorConfig.firePoints[zcTask.FirePointId - 1];
+        //         flightPlanEditor.missionpoint = zcTask.MissionPoints[0];
+        //         flightPlanEditor.originbase =
+        //             editorConfig.bases.Find(b => b.BaseId == flightPlanEditor.aircraftparameter.AirportId);
+        //         flightPlanEditor.climbsegment = editorConfig.climbSegment;
+        //         flightPlanEditor.descentsegment = editorConfig.descentSegment;
+        //         flightPlanEditor.cruisesegment = editorConfig.cruiseSegment;
+        //         flightPlanEditor.cityweather = editorConfig.cityWeather;
+        //
+        //         AircraftZC aircraft = ComponentFactory.Create<AircraftZC, FlightPlanEditor,ZCTask>( flightPlanEditor, zcTask);
+        //         //aircraft.Name = zcTask.missionInformation.AircraftInfos[i];
+        //         //aircraft.NextMissionId = zcTask.NextTaskId;
+        //         mission.End += aircraft.End;
+        //         mission.AircraftZCs.Add(aircraft);
+        //     }
+        // }
 
-                AircraftZC aircraft = ComponentFactory.Create<AircraftZC, FlightPlanEditor,ZCTask>( flightPlanEditor, zcTask);
-                //aircraft.Name = zcTask.missionInformation.AircraftInfos[i];
-                //aircraft.NextMissionId = zcTask.NextTaskId;
-                mission.End += aircraft.End;
-                mission.AircraftZCs.Add(aircraft);
-            }
-        }
-
-        foreach (XHTask xhTask in taskConfig.xHTask)
-        {
-            if(xhTask.MissionPoints == null) continue;
-            RescueMission mission = ComponentFactory.Create<RescueMission>();
-            mission.AddComponent<XHEconomicalComponent>();
-            mission.AddComponent<XHTotalTaskPerformanceComponent>();
-            mission.MissionId = $"巡护任务 {xhTask.missionInformation.MissionId}";
-            taskSys.RescueMissions.Add(mission);
-            FireGround fireGround = ComponentFactory.Create<FireGround>();
-            mission.FireGround = fireGround;
-            mission.InitArea = editorConfig.firePoints[xhTask.FirePointId - 1].InitialArea;
-            fireGround.FirePoint = new DVector
-            {
-                Latitude = editorConfig.firePoints[xhTask.FirePointId - 1].FirePointLatitude,
-                Longitude = editorConfig.firePoints[xhTask.FirePointId - 1].FirePointLongitude,
-                Altitude = editorConfig.firePoints[xhTask.FirePointId - 1].FirePointHeight
-            };
-            if(xhTask.missionInformation.AircraftInfos == null) continue;
-            for (int i = 0; i < xhTask.missionInformation.AircraftInfos.Length; i++)
-            {
-                
-                FlightPlanEditor? flightPlanEditor = new FlightPlanEditor();
-                flightPlanEditor.aircraftparameter = editorConfig.aircraftParameters.Find(a =>
-                    a.AircraftID == xhTask.missionInformation.AircraftInfos[i]);
-                flightPlanEditor.firepoint = new FirePoint[1];
-                flightPlanEditor.firepoint[0] = editorConfig.firePoints[xhTask.FirePointId - 1];
-                flightPlanEditor.missionpoint = xhTask.MissionPoints[0];
-                flightPlanEditor.originbase =
-                    editorConfig.bases.Find(b => b.BaseId == flightPlanEditor.aircraftparameter.AirportId);
-                flightPlanEditor.climbsegment = editorConfig.climbSegment;
-                flightPlanEditor.descentsegment = editorConfig.descentSegment;
-                flightPlanEditor.cruisesegment = editorConfig.cruiseSegment;
-                flightPlanEditor.cityweather = editorConfig.cityWeather;
-
-                AircraftXH aircraft = ComponentFactory.Create<AircraftXH, FlightPlanEditor>( flightPlanEditor);
-                //aircraft.Name = zcTask.missionInformation.AircraftInfos[i];
-                //aircraft.NextMissionId = zcTask.NextTaskId;
-                mission.AircraftXHs.Add(aircraft);
-                mission.End += aircraft.End;
-                aircraft.Weather = weather;
-                aircraft.AddComponent<XHStaticCapacityComponent>();
-                aircraft.AddComponent<XHEconomicalComponent>();
-            }
-        }
+        // foreach (XHTask xhTask in taskConfig.xHTask)
+        // {
+        //     XHRescueMission mission = ComponentFactory.Create<XHRescueMission>();
+        //     mission.AddComponent<XHEconomicalComponent>();
+        //     mission.AddComponent<XHTotalTaskPerformanceComponent>();
+        //     mission.AddComponent<EquipmentComponent>();
+        //     
+        //     mission.MissionId = $"巡护任务 {xhTask.missionInformation.MissionId}";
+        //     taskSys.XHRescueMissions.Add(mission);
+        //     FireGround fireGround = ComponentFactory.Create<FireGround>();
+        //     mission.FireGround = fireGround;
+        //     fireGround.FirePoint = new DVector
+        //     {
+        //         Latitude = editorConfig.firePoints[xhTask.FirePointId - 1].FirePointLatitude,
+        //         Longitude = editorConfig.firePoints[xhTask.FirePointId - 1].FirePointLongitude,
+        //         Altitude = editorConfig.firePoints[xhTask.FirePointId - 1].FirePointHeight
+        //     };
+        //     if(xhTask.missionInformation.AircraftInfos == null) continue;
+        //     for (int i = 0; i < xhTask.missionInformation.AircraftInfos.Length; i++)
+        //     {
+        //         
+        //         FlightPlanEditor? flightPlanEditor = new FlightPlanEditor();
+        //         flightPlanEditor.aircraftparameter = editorConfig.aircraftParameters.Find(a =>
+        //             a.AircraftID == xhTask.missionInformation.AircraftInfos[i]);
+        //         flightPlanEditor.firepoint = new FirePoint[1];
+        //         flightPlanEditor.firepoint[0] = editorConfig.firePoints[xhTask.FirePointId - 1];
+        //         flightPlanEditor.airroute = xhTask.airroute;
+        //         //flightPlanEditor.missionpoint = xhTask.MissionPoints[0];
+        //         flightPlanEditor.originbase =
+        //             editorConfig.bases.Find(b => b.BaseId == flightPlanEditor.aircraftparameter.AirportId);
+        //         flightPlanEditor.climbsegment = editorConfig.climbSegment;
+        //         flightPlanEditor.descentsegment = editorConfig.descentSegment;
+        //         flightPlanEditor.cruisesegment = editorConfig.cruiseSegment;
+        //         flightPlanEditor.cityweather = editorConfig.cityWeather;
+        //
+        //         AircraftXH aircraft = ComponentFactory.Create<AircraftXH, FlightPlanEditor>( flightPlanEditor);
+        //         //aircraft.Name = zcTask.missionInformation.AircraftInfos[i];
+        //         //aircraft.NextMissionId = zcTask.NextTaskId;
+        //         mission.AircraftXHs.Add(aircraft);
+        //         mission.End += aircraft.End;
+        //         aircraft.AddComponent<XHStaticCapacityComponent>();
+        //         aircraft.AddComponent<XHEconomicalComponent>();
+        //     }
+        // }
         taskSys.Start();
         return UniTask.CompletedTask;
     }
+    
 }

SimulationServer/Utils/Define.cs

@@ -0,0 +1,9 @@
+namespace SimulationServer.Utils;
+
+public class Define
+{
+    public static double WIND;
+    public static double SLOPE;
+    //温度
+    public static double TEMPERATURE;
+}

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

@@ -252,34 +252,6 @@
       ],
       "下一个任务ID": ""
     }
-  ],
-  "防火巡护任务": [
-    {
-      "任务信息": {
-        "任务名称": "防火巡护任务1",
-        "任务ID": "XH1",
-        "任务主要类型": "航空灭火",
-        "任务类型": "防火巡护",
-        "开始时间": null,
-        "结束时间": null,
-        "应用机型": [
-          "Ka-32"
-        ],
-        "应用飞机编号": [
-          "1-1"
-        ]
-      },
-      "巡护航线参数": [
-        {
-          "巡护航线名称": "Y605",
-          "巡护航线点经度": 0.0,
-          "巡护航线点纬度": 0.0,
-          "巡护航线点海拔": 0.0
-        }
-      ],
-      "火点ID": 1,
-      "下一个任务ID": ""
-    }
   ]
 
 
@@ -292,5 +264,4 @@
 
 
 
-
 }

SimulationServer/bin/Debug/net7.0/dbIp.txt

@@ -0,0 +1 @@
+10.130.100.5