Browse Source

陆上搜寻和海上搜救飞机脚本能见度获取改为定值10,修改随机数范围接近真实概率

liyang 7 months ago
parent
commit
25f19fffe6
35 changed files with 13 additions and 13 deletions
  1. BIN
      KYFramework/bin/Debug/net7.0/KYFramework.dll
  2. BIN
      KYFramework/bin/Debug/net7.0/KYFramework.pdb
  3. BIN
      Proto2CS/bin/Debug/net7.0/Proto2CS.dll
  4. BIN
      Proto2CS/bin/Debug/net7.0/Proto2CS.exe
  5. BIN
      Proto2CS/bin/Debug/net7.0/Proto2CS.pdb
  6. 3 3
      SimulationServer/Entity/AircraftLandSJ.cs
  7. 2 2
      SimulationServer/Entity/AircraftSJ.cs
  8. 7 7
      SimulationServer/EventHandler/ServerStartEventHandler.cs
  9. BIN
      SimulationServer/bin/Debug/net7.0/KYFramework.dll
  10. BIN
      SimulationServer/bin/Debug/net7.0/KYFramework.pdb
  11. BIN
      SimulationServer/bin/Debug/net7.0/KYNetwork.dll
  12. BIN
      SimulationServer/bin/Debug/net7.0/KYNetwork.pdb
  13. 1 1
      SimulationServer/bin/Debug/net7.0/Missions/editor_config.json
  14. BIN
      SimulationServer/bin/Debug/net7.0/Reports/LSX/2024-08-28/搜救任务总体指标报告.xls
  15. BIN
      SimulationServer/bin/Debug/net7.0/Reports/LSX/2024-08-28/陆上搜寻任务总体指标报告.xls
  16. BIN
      SimulationServer/bin/Debug/net7.0/Reports/LSX/2024-08-28/陆上搜寻救援任务 陆上搜寻任务1/1-1搜救任务单机指标报告.xls
  17. BIN
      SimulationServer/bin/Debug/net7.0/Reports/LSX/2024-08-28/陆上搜寻救援任务 陆上搜寻任务2/1-1搜救任务单机指标报告.xls
  18. BIN
      SimulationServer/bin/Debug/net7.0/Reports/LSX/2024-08-28/陆上搜寻救援任务 陆上搜寻任务2/1-2搜救任务单机指标报告.xls
  19. BIN
      SimulationServer/bin/Debug/net7.0/Reports/LSX/2024-08-30/搜救任务总体指标报告.xls
  20. BIN
      SimulationServer/bin/Debug/net7.0/Reports/LSX/2024-08-30/陆上搜寻任务总体指标报告.xls
  21. BIN
      SimulationServer/bin/Debug/net7.0/Reports/LSX/2024-08-30/陆上搜寻救援任务 陆上搜寻任务1/1-1搜救任务单机指标报告.xls
  22. BIN
      SimulationServer/bin/Debug/net7.0/Reports/SSJ/2024-08-26/海上搜救任务总体指标报告.xls
  23. BIN
      SimulationServer/bin/Debug/net7.0/Reports/SSJ/2024-08-26/海上搜索救援任务 海上搜救任务1/3-1搜救任务单机指标报告.xls
  24. BIN
      SimulationServer/bin/Debug/net7.0/Reports/SSJ/2024-08-26/海上搜索救援任务 海上搜救任务2/3-2搜救任务单机指标报告.xls
  25. BIN
      SimulationServer/bin/Debug/net7.0/Reports/SSJ/2024-08-26/海上搜索救援任务 海上搜救任务3/4-1搜救任务单机指标报告.xls
  26. BIN
      SimulationServer/bin/Debug/net7.0/Reports/SSJ/2024-08-28/海上搜救任务总体指标报告.xls
  27. BIN
      SimulationServer/bin/Debug/net7.0/Reports/SSJ/2024-08-28/海上搜索救援任务 海上搜救任务1/3-1搜救任务单机指标报告.xls
  28. BIN
      SimulationServer/bin/Debug/net7.0/Reports/SSJ/2024-08-30/搜救任务总体指标报告.xls
  29. BIN
      SimulationServer/bin/Debug/net7.0/Reports/SSJ/2024-08-30/海上搜救任务总体指标报告.xls
  30. BIN
      SimulationServer/bin/Debug/net7.0/Reports/SSJ/2024-08-30/海上搜索救援任务 海上搜救任务1/3-1搜救任务单机指标报告.xls
  31. BIN
      SimulationServer/bin/Debug/net7.0/SimulationCommon.dll
  32. BIN
      SimulationServer/bin/Debug/net7.0/SimulationCommon.pdb
  33. BIN
      SimulationServer/bin/Debug/net7.0/SimulationServer.dll
  34. BIN
      SimulationServer/bin/Debug/net7.0/SimulationServer.exe
  35. BIN
      SimulationServer/bin/Debug/net7.0/SimulationServer.pdb

BIN
KYFramework/bin/Debug/net7.0/KYFramework.dll


BIN
KYFramework/bin/Debug/net7.0/KYFramework.pdb


BIN
Proto2CS/bin/Debug/net7.0/Proto2CS.dll


BIN
Proto2CS/bin/Debug/net7.0/Proto2CS.exe


BIN
Proto2CS/bin/Debug/net7.0/Proto2CS.pdb


+ 3 - 3
SimulationServer/Entity/AircraftLandSJ.cs

@@ -123,7 +123,7 @@ public class AircraftLandSJ : AircraftEntity
             FlightPlanEditor.targetpoint[0].TargetPointHeight);
 
         string cityName = helper.getCityName(targetPoint.x,targetPoint.y);
-        var visibility = helper.getVisibility(cityName, DateTime.Now.ToString("yyyy-MM-dd HH"));
+        var visibility = 10;//helper.getVisibility(cityName, DateTime.Now.ToString("yyyy-MM-dd HH"));
 
         getNCData = new GetNCData();
         getNCData.GetData();
@@ -173,12 +173,12 @@ public class AircraftLandSJ : AircraftEntity
                     probability -= 0.5f;
 
                     probability *= random.NextDouble();
-                    double random1 = random.NextInt64(8000,10000); // 生成随机数比较概率  调整概率使任务成功率降低 至 5%(0.05) 第一个参数越低概率越低
+                    double random1 = random.NextInt64(1000,9200); // 生成随机数比较概率  调整概率使任务成功率降低 至 5%(0.05) 第一个参数越低概率越低
                     random1 /= 10000;
                     probability += (0.5 * random1);
                 }
                 
-                double randomValue = random.NextInt64(9600,10000);  // 生成随机数比较概率  调整概率使任务成功率降低 至 5%(0.05) 第一个参数越高概率越低
+                double randomValue = random.NextInt64(9015,10000);  // 生成随机数比较概率  调整概率使任务成功率降低 至 5%(0.05) 第一个参数越高概率越低
                  randomValue /= 10000;
                  
                  Log.Info(

+ 2 - 2
SimulationServer/Entity/AircraftSJ.cs

@@ -175,7 +175,7 @@ public class AircraftSJ : AircraftEntity
             FlightPlanEditor.targetpoint[0].TargetPointHeight);
 
         string cityName = helper.getCityName(targetPoint.x, targetPoint.y);
-        var vis = helper.getVisibility(cityName, DateTime.Now.ToString("yyyy-MM-dd HH"));
+        var vis = 10; //helper.getVisibility(cityName, DateTime.Now.ToString("yyyy-MM-dd HH"));
 
         getNCData = new GetNCData();
         getNCData.GetData();
@@ -239,7 +239,7 @@ public class AircraftSJ : AircraftEntity
                 // 到搜寻航路点的最后一个点 (?)
                 Log.Info(
                     $"海上任务:{taskContent.missionInformation.MissionName} 机型: {AircraftId} 当前时间:{temptime},当前位置:{currentLocation.CurrentLon},{currentLocation.CurrentLat},{currentLocation.CurrentHei},概率:{probability},是否看到落水人员:{isseePerson}");
-                double randomValue = random.NextInt64(9000, 10000); // 生成随机数比较概率 //0.03 第一个参数越高概率越低
+                double randomValue = random.NextInt64(9015 , 10000); // 生成随机数比较概率 //0.03 第一个参数越高概率越低 8985 0.212 100 9000 0 100 8995 0.14 100 8997 0.25 20 8998 0.3 20
                 randomValue /= 10000;
                 if (randomValue < probability) //  1 - finalProbability
                 {

+ 7 - 7
SimulationServer/EventHandler/ServerStartEventHandler.cs

@@ -107,15 +107,15 @@ public class ServerStartEventHandler : AEvent<ServerStart>
             //Console.WriteLine("仿真次数:" + editorConfig.runCounts);
             Game.EventSystem.Publish(new CreateSeaSJTask
             { EditorConfig = editorConfig, SeaSJTask = seaSJTask });
-           // break;
+            //break;
         }
 
-        //foreach (var landSXTask in taskConfig.LandSouXunTasks)
-        //{
-        //    Game.EventSystem.Publish(new CreateLandSXTask
-        //    { EditorConfig = editorConfig, LandSXTask = landSXTask });
-        //    //break;
-        //}
+        foreach (var landSXTask in taskConfig.LandSouXunTasks)
+        {
+            Game.EventSystem.Publish(new CreateLandSXTask
+            { EditorConfig = editorConfig, LandSXTask = landSXTask });
+            //break;
+        }
 
         taskSys.ExecutionContext = editorConfig.runCounts;
         taskSys.Start();

BIN
SimulationServer/bin/Debug/net7.0/KYFramework.dll


BIN
SimulationServer/bin/Debug/net7.0/KYFramework.pdb


BIN
SimulationServer/bin/Debug/net7.0/KYNetwork.dll


BIN
SimulationServer/bin/Debug/net7.0/KYNetwork.pdb


+ 1 - 1
SimulationServer/bin/Debug/net7.0/Missions/editor_config.json

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

BIN
SimulationServer/bin/Debug/net7.0/Reports/LSX/2024-08-28/搜救任务总体指标报告.xls


BIN
SimulationServer/bin/Debug/net7.0/Reports/LSX/2024-08-28/陆上搜寻任务总体指标报告.xls


BIN
SimulationServer/bin/Debug/net7.0/Reports/LSX/2024-08-28/陆上搜寻救援任务 陆上搜寻任务1/1-1搜救任务单机指标报告.xls


BIN
SimulationServer/bin/Debug/net7.0/Reports/LSX/2024-08-28/陆上搜寻救援任务 陆上搜寻任务2/1-1搜救任务单机指标报告.xls


BIN
SimulationServer/bin/Debug/net7.0/Reports/LSX/2024-08-28/陆上搜寻救援任务 陆上搜寻任务2/1-2搜救任务单机指标报告.xls


BIN
SimulationServer/bin/Debug/net7.0/Reports/SSJ/2024-08-26/搜救任务总体指标报告.xls → SimulationServer/bin/Debug/net7.0/Reports/LSX/2024-08-30/搜救任务总体指标报告.xls


BIN
SimulationServer/bin/Debug/net7.0/Reports/LSX/2024-08-30/陆上搜寻任务总体指标报告.xls


BIN
SimulationServer/bin/Debug/net7.0/Reports/LSX/2024-08-30/陆上搜寻救援任务 陆上搜寻任务1/1-1搜救任务单机指标报告.xls


BIN
SimulationServer/bin/Debug/net7.0/Reports/SSJ/2024-08-26/海上搜救任务总体指标报告.xls


BIN
SimulationServer/bin/Debug/net7.0/Reports/SSJ/2024-08-26/海上搜索救援任务 海上搜救任务1/3-1搜救任务单机指标报告.xls


BIN
SimulationServer/bin/Debug/net7.0/Reports/SSJ/2024-08-26/海上搜索救援任务 海上搜救任务2/3-2搜救任务单机指标报告.xls


BIN
SimulationServer/bin/Debug/net7.0/Reports/SSJ/2024-08-26/海上搜索救援任务 海上搜救任务3/4-1搜救任务单机指标报告.xls


BIN
SimulationServer/bin/Debug/net7.0/Reports/SSJ/2024-08-28/海上搜救任务总体指标报告.xls


BIN
SimulationServer/bin/Debug/net7.0/Reports/SSJ/2024-08-28/海上搜索救援任务 海上搜救任务1/3-1搜救任务单机指标报告.xls


BIN
SimulationServer/bin/Debug/net7.0/Reports/SSJ/2024-08-28/搜救任务总体指标报告.xls → SimulationServer/bin/Debug/net7.0/Reports/SSJ/2024-08-30/搜救任务总体指标报告.xls


BIN
SimulationServer/bin/Debug/net7.0/Reports/SSJ/2024-08-30/海上搜救任务总体指标报告.xls


BIN
SimulationServer/bin/Debug/net7.0/Reports/SSJ/2024-08-30/海上搜索救援任务 海上搜救任务1/3-1搜救任务单机指标报告.xls


BIN
SimulationServer/bin/Debug/net7.0/SimulationCommon.dll


BIN
SimulationServer/bin/Debug/net7.0/SimulationCommon.pdb


BIN
SimulationServer/bin/Debug/net7.0/SimulationServer.dll


BIN
SimulationServer/bin/Debug/net7.0/SimulationServer.exe


BIN
SimulationServer/bin/Debug/net7.0/SimulationServer.pdb