修复bug

SimulationServer/Component/TotalEconomicalComponent.cs

@@ -1,7 +1,7 @@
 using KYFramework;
 
 namespace SimulationServer;
-
+using Define = SimulationServer.Utils.Define;
 public class TotalEconomical
 {
     public string 火灾总面积 ;
@@ -21,22 +21,25 @@ public class TotalEconomicalComponent : Component
     
     public void FillData()
     {
-        double x = 18000;
+        var mission = GetParent<MHRescueMission>();
+        var end = Fire.burnedCalculate(Define.WIND, mission.slope, mission.tn, mission.InitArea);
         
+        double x = end.burnarea/10000;
         double y1 = 0.3096 * Math.Pow(x, 0.4893);
         double y2 = 1004.4520 * Math.Pow(x, 0.2193);
         double y3 = 0.2312 * Math.Pow(y1, 1.1668);
         double deadRoundedInt = Math.Round(y3);
         double injuredRoundedInt = Math.Round(y1-y3);
         double y2RoundedTwoDecimals = Math.Round(y2, 2);
-
-        TotalEconomical.火灾总面积 = 18000.ToString();
+        
+        TotalEconomical.火灾总面积 = end.burnarea.ToString();
         TotalEconomical.火灾死亡人数 = deadRoundedInt.ToString();
         TotalEconomical.火灾总受伤人数 = injuredRoundedInt.ToString();
         TotalEconomical.总获救人员数量 = "-";
         TotalEconomical.火灾死亡总人数 = deadRoundedInt.ToString();
         TotalEconomical.火灾受伤总人数 = injuredRoundedInt.ToString();
         TotalEconomical.总获救财产 = "-";
+        
         TotalEconomical.总损失财产 = y2RoundedTwoDecimals.ToString();
         
     }

SimulationServer/Entity/AircraftMH.cs

@@ -99,8 +99,6 @@ public class AircraftMH : AircraftEntity
                 {
                     T += TurningPoints[i].SegmentFlightTime;
                 }
-                
-                Log.Info(Name + "   " + AircraftIndex  + "    下次洒水时间 " + T);
                 waterInterval += 2;    
             }
         }

SimulationServer/Entity/AircraftSHJ.cs

@@ -15,22 +15,10 @@ public class AircraftSHJ : AircraftEntity
     public override void Start()
     {
         FXJHGenerate.FromStartToMission(FlightPlanEditor,ref TurningPoints);//生成从起点到任务段起点的航路点
-        
-        
-        Log.Info(content.ToJson());
-        
         double resulttime = Cable_slippage.get_result_time_rope(content.H,content.person_number,content.windspeed,content.vis,content.descendspeed).time;//索滑降模型输出的索滑降时间
         FXJHGenerate.SuoHuaJiang(resulttime, FlightPlanEditor,ref TurningPoints);
-        
-        
         FXJHGenerate.FromMissionToEnd(FlightPlanEditor, FXJHGenerate.SuoHuaJiangMissionEndPoint(FlightPlanEditor),ref TurningPoints);
         FXJHGenerate.FXJHTPDiedai(FlightPlanEditor,ref TurningPoints, Velocitys, FuelConsumptions);
-        Log.Info("====================" + resulttime.ToString());
-        foreach (var turningPoint in TurningPoints)
-        {
-            Log.Info(turningPoint.ToJson());
-        }
-
     }
 }
 

SimulationServer/Entity/AircraftXH.cs

@@ -40,9 +40,6 @@ public class AircraftXH : Entity
         
         FXJHGenerate.XunHu(FlightPlanEditor,ref turningPoints);//生成巡航航路点
         FXJHGenerate.FXJHTPDiedai(FlightPlanEditor,ref turningPoints, Velocitys,FuelConsumptions);//生成从任务段终点到结束点的航路点
-        
-        currentLocation = new CurrentLocation();
-       
     }
     public void End()
     {

SimulationServer/Entity/AircraftZC.cs

@@ -23,11 +23,6 @@ public class AircraftZC : AircraftEntity
         FXJHGenerate.FXJHTPDiedai(FlightPlanEditor,ref TurningPoints, Velocitys, FuelConsumptions);
         
         TotalFuelConsumption = TurningPoints[0].RemainingFuel - TurningPoints[^1].RemainingFuel;
-
-        foreach (var point in TurningPoints)
-        {
-            Log.Info(point.ToJson());
-        }
         for (int i = 0; i < SC01.Count + 3; i++)
         {
             time += TurningPoints[i].SegmentFlightTime;

SimulationServer/Entity/XHRescueMission.cs

@@ -49,6 +49,7 @@ public class XHRescueMission : Entity
         End?.Invoke();
         SaveXH();
         ReportXH();
+        
         var readyTime = AircraftXHs.First().TaskReadyTime;
         Task.Delay(TimeSpan.FromSeconds(readyTime)).ContinueWith(t => this.StartAsyncXH());
     }

SimulationServer/Entity/ZCRescueMission.cs

@@ -16,6 +16,7 @@ public class ZCRescueMission : Entity
     {
         AircraftZCs?.ForEach(a => a.Start());
         var readyTime = AircraftZCs.First().TaskReadyTime;
+        Log.Info("侦察时间延迟" + readyTime);
         Task.Delay(TimeSpan.FromSeconds(readyTime)).ContinueWith(t => this.StartAsyncZC());
     }
 }

SimulationServer/EventHandler/CreateTaskEventHandler.cs

@@ -23,7 +23,7 @@ public class CreateMHTaskEventHandler : AEvent<CreateMHTask>
         mission.AddComponent<TotalEconomicalComponent>();
         mission.AddComponent<TotalTaskPerformanceComponent>();
         mission.AddComponent<EquipmentComponent>();
-        
+        mission.MissionId = "灭火任务 " + config.MHTaskConfig.TotalMHId;
         taskSys.MHRescueMissions.Add(mission);
         
         //查询坡度
@@ -115,6 +115,7 @@ public class CreateMHTaskEventHandler : AEvent<CreateMHTask>
                 AircraftSHJ aircraftSHJ = ComponentFactory.Create<AircraftSHJ, FlightPlanEditor,SHJTask>( flightPlanEditor, shjTask);
                 mission.End += aircraftSHJ.End;
                 aircraftSHJ.AircraftId = shjTask.missionInformation.AircraftId[i];
+                aircraftSHJ.TaskReadyTime = shjTask.missionInformation.TakeoffPreparationTime;
                 mission.aircrafts.Add(aircraftSHJ);
                 Log.Info($"创建机型 ： {flightPlanEditor.aircraftparameter.AircraftID}");
             }
@@ -154,6 +155,7 @@ public class CreateZCTaskEventHandler : AEvent<CreateZCTask>
             aircraft.AddComponent<StaticCapacityComponent>();
             aircraft.AddComponent<TaskPerformanceComponent>();
             aircraft.AddComponent<EconomicalComponent>();
+            aircraft.TaskReadyTime = config.ZCTask.missionInformation.TakeoffPreparationTime;
             Log.Info($"创建机型 ： {flightPlanEditor.aircraftparameter.AircraftID}");
             mission.AircraftZCs.Add(aircraft);
         }
@@ -194,6 +196,9 @@ public class CreateXHTaskEventHandler : AEvent<CreateXHTask>
                 config.XHTask.missionInformation.AircraftInfos[i],config.XHTask.missionInformation.AircraftId[i]);
      
             aircraft.TaskReadyTime = config.XHTask.missionInformation.TakeoffPreparationTime;
+            
+            Log.Info($"Name:{config.XHTask.missionInformation.MissionName} AircraftId:{config.XHTask.missionInformation.TakeoffPreparationTime}");
+            
             mission.AircraftXHs.Add(aircraft);
             
             mission.End += aircraft.End;

SimulationServer/Init.cs

@@ -28,9 +28,10 @@ public static class Init
             //Game.Scene.AddComponent<MessageDispatcherComponent>();
             
             //TCP
-            Game.Scene.AddComponent<OpcodeTypeComponent>();
-            Game.Scene.AddComponent<MessageDispatcherComponent>();
-            Game.Scene.AddComponent<ServerComponent, string>(File.ReadAllText("Config/ipconfig.txt"));
+            // Game.Scene.AddComponent<OpcodeTypeComponent>();
+            // Game.Scene.AddComponent<MessageDispatcherComponent>();
+            // Game.Scene.AddComponent<ServerComponent, string>(File.ReadAllText("Config/ipconfig.txt"));
+            
             Game.Scene.AddComponent<SessionComponent>();
 
             // 任务

SimulationServer/MessageHandler/C2S_GetReportMessageHandler.cs

@@ -54,6 +54,8 @@ public class C2S_GetReportMessageHandler : AMRpcHandler<C2S_GetReport,S2C_GetRep
             
             response.Reports.Add(end);
         }
+        
+        reply();
         return UniTask.CompletedTask;
     }
 }

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

@@ -1,61 +1,71 @@
 {
   "基地信息": [
     {
-      "基地名称": "根河",
+      "基地名称": "呷拉镇小学临时起降点",
       "基地编号": 1,
-      "基地经度": 121.391666666667,
-      "基地纬度": 50.7016666666667,
-      "基地海拔": 0.0
+      "基地经度": 101.0078446449,
+      "基地纬度": 30.1091351012,
+      "基地海拔": 2749.0
     }
   ],
   "飞行器信息": [
     {
-      "机型": "AC-313A",
-      "飞机编号": "AC-313A-根河-0",
+      "机型": "Ka-32",
+      "飞机编号": "Ka-32-呷拉镇小学临时起降点-0",
       "类型": "飞机",
       "子类型": "直升机",
-      "最大起飞重量": 13800.0,
-      "最大载油量": 3100.0,
-      "最大载客数量": 27.0,
+      "最大起飞重量": 11000.0,
+      "最大载油量": 2511.0,
+      "最大载客数量": 13.0,
       "所属机场ID": 1
     },
     {
-      "机型": "AC-313A",
-      "飞机编号": "AC-313A-根河-1",
+      "机型": "Ka-32",
+      "飞机编号": "Ka-32-呷拉镇小学临时起降点-1",
       "类型": "飞机",
       "子类型": "直升机",
-      "最大起飞重量": 13800.0,
-      "最大载油量": 3100.0,
+      "最大起飞重量": 11000.0,
+      "最大载油量": 2511.0,
+      "最大载客数量": 13.0,
+      "所属机场ID": 1
+    },
+    {
+      "机型": "M-171",
+      "飞机编号": "M-171-呷拉镇小学临时起降点-2",
+      "类型": "飞机",
+      "子类型": "直升机",
+      "最大起飞重量": 13000.0,
+      "最大载油量": 3472.0,
       "最大载客数量": 27.0,
       "所属机场ID": 1
     },
     {
-      "机型": "AC-313A",
-      "飞机编号": "AC-313A-根河-2",
+      "机型": "M-171",
+      "飞机编号": "M-171-呷拉镇小学临时起降点-3",
       "类型": "飞机",
       "子类型": "直升机",
-      "最大起飞重量": 13800.0,
-      "最大载油量": 3100.0,
+      "最大起飞重量": 13000.0,
+      "最大载油量": 3472.0,
       "最大载客数量": 27.0,
       "所属机场ID": 1
     },
     {
-      "机型": "Ka-32",
-      "飞机编号": "Ka-32-根河-3",
+      "机型": "AC-313A",
+      "飞机编号": "AC-313A-呷拉镇小学临时起降点-4",
       "类型": "飞机",
       "子类型": "直升机",
-      "最大起飞重量": 11000.0,
-      "最大载油量": 2511.0,
-      "最大载客数量": 13.0,
+      "最大起飞重量": 13800.0,
+      "最大载油量": 3100.0,
+      "最大载客数量": 27.0,
       "所属机场ID": 1
     },
     {
-      "机型": "M-171",
-      "飞机编号": "M-171-根河-4",
+      "机型": "AC-313A",
+      "飞机编号": "AC-313A-呷拉镇小学临时起降点-5",
       "类型": "飞机",
       "子类型": "直升机",
-      "最大起飞重量": 13000.0,
-      "最大载油量": 3472.0,
+      "最大起飞重量": 13800.0,
+      "最大载油量": 3100.0,
       "最大载客数量": 27.0,
       "所属机场ID": 1
     }
@@ -63,11 +73,19 @@
   "火点": [
     {
       "火点ID": 2,
-      "火点经度": 119.931029684575,
-      "火点纬度": 50.6753415295982,
-      "火点海拔": 849.043177679918,
+      "火点经度": 101.0663516,
+      "火点纬度": 30.08773844,
+      "火点海拔": 3389.0,
+      "初始火场面积": 3000.0,
+      "初始火线长度": 0.0
+    },
+    {
+      "火点ID": 3,
+      "火点经度": 101.1005082,
+      "火点纬度": 30.09084909,
+      "火点海拔": 3031.0,
       "初始火场面积": 3000.0,
-      "初始火线长度": 157259.08132008748
+      "初始火线长度": 0.0
     }
   ],
   "天气信息": {

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

@@ -6,86 +6,117 @@
       "吊桶洒水灭火任务": [
         {
           "任务信息": {
-            "任务名称": "吊桶灭火",
-            "任务ID": "吊桶灭火_1_1",
+            "任务名称": "1号火场吊桶灭火",
+            "任务ID": "1号火场吊桶灭火_1_1",
             "任务主要类型": "航空灭火",
             "任务类型": "吊桶洒水灭火",
-            "开始时间": "2014/09/23 00:00:00",
-            "结束时间": "2014/09/23 00:00:00",
+            "开始时间": "2024/03/22 10:12:00",
+            "结束时间": "2024/03/22 10:12:00",
             "应用机型": [
-              "AC-313A"
+              "Ka-32"
             ],
             "应用飞机编号": [
-              "AC-313A-根河-0"
+              "Ka-32-呷拉镇小学临时起降点-1"
             ],
-            "起飞准备时间": 2.0
+            "起飞准备时间": 100.0
           },
           "取水点": [
             {
-              "任务点经度": 120.401737540055,
-              "任务点纬度": 50.3796118866572,
-              "任务点海拔": 688.0
+              "任务点经度": 101.0162429,
+              "任务点纬度": 30.03400363,
+              "任务点海拔": 2879.0
             }
           ],
           "下一个任务ID": null
         }
       ],
-      "机降灭火任务": [
+      "索滑降灭火任务": [
         {
           "任务信息": {
-            "任务名称": "机降灭火",
-            "任务ID": "机降灭火_1_2",
+            "任务名称": "1号火场索滑降",
+            "任务ID": "1号火场索滑降_1_2",
             "任务主要类型": "航空灭火",
-            "任务类型": "机降灭火",
-            "开始时间": "2014/09/23 00:00:00",
-            "结束时间": "2014/09/23 00:00:00",
+            "任务类型": "索滑降灭火",
+            "开始时间": "2024/03/22 10:12:00",
+            "结束时间": "2024/03/22 10:12:00",
             "应用机型": [
               "AC-313A"
             ],
             "应用飞机编号": [
-              "AC-313A-根河-0"
+              "AC-313A-呷拉镇小学临时起降点-5"
             ],
-            "起飞准备时间": 2.0
+            "起飞准备时间": 100.0
           },
-          "机降人数": 35,
-          "地面部署人数": 0,
-          "机降点": [
+          "索滑降高度": 150.0,
+          "投送人数": 10,
+          "风速": 5.0,
+          "能见度": 5.0,
+          "索滑降速度": 3.0,
+          "索滑降点": [
+            {
+              "任务点经度": 101.052511612746,
+              "任务点纬度": 30.0744745705002,
+              "任务点海拔": 3350.0
+            }
+          ],
+          "下一个任务ID": null
+        }
+      ]
+    },
+    {
+      "总灭火任务编号": 2,
+      "火点ID": 3,
+      "吊桶洒水灭火任务": [
+        {
+          "任务信息": {
+            "任务名称": "2号火场吊桶灭火",
+            "任务ID": "2号火场吊桶灭火_2_1",
+            "任务主要类型": "航空灭火",
+            "任务类型": "吊桶洒水灭火",
+            "开始时间": "2024/03/22 10:12:00",
+            "结束时间": "2024/03/22 10:12:00",
+            "应用机型": [
+              "AC-313A"
+            ],
+            "应用飞机编号": [
+              "AC-313A-呷拉镇小学临时起降点-4"
+            ],
+            "起飞准备时间": 100.0
+          },
+          "取水点": [
             {
-              "任务点经度": 120.209994448322,
-              "任务点纬度": 50.6895517142787,
-              "任务点海拔": 829.713326788634
+              "任务点经度": 101.0162429,
+              "任务点纬度": 30.03400363,
+              "任务点海拔": 2879.0
             }
           ],
           "下一个任务ID": null
         }
       ],
-      "索滑降灭火任务": [
+      "机降灭火任务": [
         {
           "任务信息": {
-            "任务名称": "索滑降任务",
-            "任务ID": "索滑降任务_1_1",
+            "任务名称": "2号火场机降灭火",
+            "任务ID": "2号火场机降灭火_2_1",
             "任务主要类型": "航空灭火",
-            "任务类型": "索滑降灭火",
-            "开始时间": "2014/09/23 00:00:00",
-            "结束时间": "2014/09/23 00:00:00",
+            "任务类型": "机降灭火",
+            "开始时间": "2024/03/22 10:12:00",
+            "结束时间": "2024/03/22 10:12:00",
             "应用机型": [
               "M-171"
             ],
             "应用飞机编号": [
-              "M-171-根河-4"
+              "M-171-呷拉镇小学临时起降点-2"
             ],
-            "起飞准备时间": 2.0
+            "起飞准备时间": 100.0
           },
-          "索滑降高度": 200.0,
-          "投送人数": 10,
-          "风速": 5.0,
-          "能见度": 5.0,
-          "索滑降速度": 3.0,
-          "索滑降点": [
+          "机降人数": 10,
+          "地面部署人数": 10,
+          "机降点": [
             {
-              "任务点经度": 120.209994448322,
-              "任务点纬度": 50.6895517142787,
-              "任务点海拔": 829.713326788634
+              "任务点经度": 101.11225088074,
+              "任务点纬度": 30.090075976816,
+              "任务点海拔": 3001.0
             }
           ],
           "下一个任务ID": null
@@ -96,36 +127,36 @@
   "火场侦查任务": [
     {
       "任务信息": {
-        "任务名称": "火场侦查任务",
-        "任务ID": "火场侦查任务_0_1",
+        "任务名称": "侦查火场1",
+        "任务ID": "侦查火场1_0_1",
         "任务主要类型": "航空灭火",
         "任务类型": "火场侦察",
-        "开始时间": "2014/09/23 00:00:00",
-        "结束时间": "2014/09/23 00:00:00",
+        "开始时间": "2024/03/22 10:19:00",
+        "结束时间": "2024/03/22 10:19:00",
         "应用机型": [
           "Ka-32"
         ],
         "应用飞机编号": [
-          "Ka-32-根河-3"
+          "Ka-32-呷拉镇小学临时起降点-0"
         ],
-        "起飞准备时间": 2.0
+        "起飞准备时间": 60.0
       },
       "矩形侦查区域边界点": [
         [
-          119.836340240545,
-          50.7462755048075
+          101.055388112303,
+          30.0958415698307
         ],
         [
-          120.183952914874,
-          50.7500614750784
+          101.074906686038,
+          30.0957665320794
         ],
         [
-          120.186320215995,
-          50.5630705128614
+          101.075042865549,
+          30.0781346632797
         ],
         [
-          119.843230971184,
-          50.5588208380295
+          101.054522649076,
+          30.0785688535329
         ]
       ],
       "扫描线间距": 300.0,
@@ -136,24 +167,24 @@
       "火点ID": 2,
       "MissionPoints": [
         {
-          "任务点经度": 119.836340240545,
-          "任务点纬度": 50.7462755048075,
-          "任务点海拔": 762.460490911041
+          "任务点经度": 101.055388112303,
+          "任务点纬度": 30.0958415698307,
+          "任务点海拔": 3771.0
         },
         {
-          "任务点经度": 120.183952914874,
-          "任务点纬度": 50.7500614750784,
-          "任务点海拔": 950.22932349409
+          "任务点经度": 101.074906686038,
+          "任务点纬度": 30.0957665320794,
+          "任务点海拔": 3188.0
         },
         {
-          "任务点经度": 120.186320215995,
-          "任务点纬度": 50.5630705128614,
-          "任务点海拔": 739.60844498502
+          "任务点经度": 101.075042865549,
+          "任务点纬度": 30.0781346632797,
+          "任务点海拔": 3139.0
         },
         {
-          "任务点经度": 119.843230971184,
-          "任务点纬度": 50.5588208380295,
-          "任务点海拔": 846.089490891054
+          "任务点经度": 101.054522649076,
+          "任务点纬度": 30.0785688535329,
+          "任务点海拔": 3479.0
         }
       ],
       "下一个任务ID": null