2 Комити cadbb248c5 ... 10352684ea

Аутор SHA1 Порука Датум
  zansimple 10352684ea Merge branch 'v1.0' of http://8.140.244.224:10880/zansimple/SimulationServer into v1.0 пре 2 дана
  zansimple ed3a52f3ee 完善代码 пре 2 дана

+ 2 - 2
SimulationServer/Entity/Aircrafts/AircraftJJ.cs

@@ -54,8 +54,8 @@ public class AircraftJJ : AircraftEntity
             }
 
         }
-        // FXJHGenerate.InitializeVelocities(FlightPlanEditor, TurningPoints, ref Velocitys);
-        // FXJHGenerate.InitializeFuelConsumptions(FlightPlanEditor, TurningPoints,ref FuelConsumptions);
+        FXJHGenerate.InitializeVelocities(FlightPlanEditor, TurningPoints, ref Velocitys,Temperature);
+        FXJHGenerate.InitializeFuelConsumptions(FlightPlanEditor, TurningPoints,ref FuelConsumptions,Temperature);
 
         FXJHGenerate.FromMissionToEnd(FlightPlanEditor, missionEndPoint, ref TurningPoints);
         FXJHGenerate.FXJHTPDiedai(FlightPlanEditor, ref TurningPoints, Velocitys, FuelConsumptions); // 更新了 计算油耗的方法

+ 1 - 4
SimulationServer/Entity/Aircrafts/AircraftKTKS.cs

@@ -1,10 +1,7 @@
 using KYFramework;
 using Model;
-using Newtonsoft.Json;
-using Org.BouncyCastle.Utilities;
 using SimulationCommon;
-using SimulationServer.Utils;
-using Define = SimulationServer.Utils.Define;
+
 
 namespace SimulationServer;
 

+ 0 - 3
SimulationServer/Entity/Aircrafts/AircraftMH.cs

@@ -115,8 +115,6 @@ public class AircraftMH : AircraftEntity
     // 更新
     public override void Update(double time)
     {
-        //if(mhTask.GetTime(time)) return; // 判断当前时间是否是在 19:00 - 07:00 之间
-        
         if (time > T)
         {
             var fireGround = mhRescueMission.FireGround;
@@ -158,7 +156,6 @@ public class AircraftMH : AircraftEntity
                 currentArea = Fire.grenadeArea(SingleFireExtinguishingBombLoad,
                     SingleFireExtinguishingBombEffectiveArea);
             }
-        
             
             fireGround.countArea.burnarea -= currentArea ;
             mhRescueMission.area += currentArea; // 有效洒水面积

+ 0 - 4
SimulationServer/Entity/Aircrafts/AircraftYJTX.cs

@@ -22,8 +22,6 @@ public class AircraftYJTX : AircraftEntity
             polyRoute = YJTX.Hover(content.FlyModes[0].MissionPoints,content.FlyModes[0].HoverAngle,content.FlyModes[0].HoverHeight,content.FlyModes[0].IsRealHeight,content.FlyModes[0].EnterDistance);//生成航线
         }
         
-        Log.Info(content.FlyModes[0].Method);
-        
         //FXJHGenerate.InitializeVelocities(FlightPlanEditor, TurningPoints, ref Velocitys,Temperature);
         //FXJHGenerate.InitializeFuelConsumptions(FlightPlanEditor, TurningPoints,ref FuelConsumptions,Temperature);
         
@@ -96,8 +94,6 @@ public class AircraftYJTX : AircraftEntity
             
             TurningPoints.Add(turningPoint);
         }
-       
-        
         FXJHGenerate.FromMissionToEnd(FlightPlanEditor,missionEndPoint,ref TurningPoints);//生成从起点到任务段起点的航路点
         FXJHGenerate.FXJHTPDiedai(FlightPlanEditor,ref TurningPoints, Velocitys, FuelConsumptions);
         FXJHGenerate.CalculateTrueHeading(FlightPlanEditor,ref TurningPoints);