zansimple

aef75eebf5 修复冲突
3ebc4f32d2 解决冲突
8b9136bffc 解决冲突
9706f0e129 解决冲突
48b434773d Merge branch 'main' into v1.0 # Conflicts: # KYFramework/bin/Debug/net7.0/KYFramework.dll # KYFramework/bin/Debug/net7.0/KYFramework.pdb # KYFramework/bin/Debug/net7.0/ThirdParty.dll # KYFramework/bin/Debug/net7.0/ThirdParty.pdb # Models/SimulationCommon/Define.cs # Models/SimulationCommon/EditorConfig.cs # Models/SimulationCommon/FXJHGenenrate.cs # Models/SimulationCommon/TaskConfig.cs # SimulationServer/Component/TaskComponent.cs # SimulationServer/Entity/AircraftEntity.cs # SimulationServer/Entity/Aircrafts/AircraftLandSJ.cs # SimulationServer/Entity/Aircrafts/AircraftSHJ.cs # SimulationServer/Entity/Aircrafts/AircraftSJ.cs # SimulationServer/Entity/Missions/LandSJRescueMission.cs # SimulationServer/Entity/Missions/SeaSJRescueMission.cs # SimulationServer/EventHandler/CreateTaskEventHandler.cs # SimulationServer/EventHandler/ServerStartEventHandler.cs # SimulationServer/bin/Debug/net7.0-windows/KYFramework.pdb # SimulationServer/bin/Debug/net7.0-windows/MathNet.Numerics.dll # SimulationServer/bin/Debug/net7.0-windows/Reports/LSX/2024-08-30/搜救任务总体指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/LSX/2024-08-30/陆上搜寻任务总体指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/LSX/2024-08-30/陆上搜寻救援任务陆上搜寻任务1/1-1搜救任务单机指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/LSX/8000-2/搜救任务总体指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/LSX/8000-2/陆上搜寻任务总体指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/LSX/8000-2/陆上搜寻救援任务陆上搜寻任务1/1-1搜救任务单机指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/LSX/8000-3/搜救任务总体指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/LSX/8000-3/陆上搜寻任务总体指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/LSX/8000-3/陆上搜寻救援任务陆上搜寻任务1/1-1搜救任务单机指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/LSX/8000-4/搜救任务总体指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/LSX/8000-4/陆上搜寻任务总体指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/LSX/8000-4/陆上搜寻救援任务陆上搜寻任务1/1-1搜救任务单机指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/LSX/8000/搜救任务总体指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/LSX/8000/陆上搜寻任务总体指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/LSX/8000/陆上搜寻救援任务陆上搜寻任务1/1-1搜救任务单机指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/SSJ/2024-08-30/搜救任务总体指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/SSJ/2024-08-30/海上搜救任务总体指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/SSJ/2024-08-30/海上搜索救援任务海上搜救任务1/3-1搜救任务单机指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/SSJ/2024-09-11/搜救任务总体指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/SSJ/2024-09-11/海上搜救任务总体指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/SSJ/2024-09-11/海上搜索救援任务海上搜救任务1/3-1搜救任务单机指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/SSJ/9006-1/搜救任务总体指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/SSJ/9006-1/海上搜救任务总体指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/SSJ/9006-1/海上搜索救援任务海上搜救任务1/3-1搜救任务单机指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/SSJ/9006-2/搜救任务总体指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/SSJ/9006-2/海上搜救任务总体指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/SSJ/9006-2/海上搜索救援任务海上搜救任务1/3-1搜救任务单机指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/SSJ/9006-3/搜救任务总体指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/SSJ/9006-3/海上搜救任务总体指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/SSJ/9006-3/海上搜索救援任务海上搜救任务1/3-1搜救任务单机指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/SSJ/9006-4/搜救任务总体指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/SSJ/9006-4/海上搜救任务总体指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/SSJ/9006-4/海上搜索救援任务海上搜救任务1/3-1搜救任务单机指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/SSJ/9006-5/搜救任务总体指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/SSJ/9006-5/海上搜救任务总体指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/SSJ/9006-5/海上搜索救援任务海上搜救任务1/3-1搜救任务单机指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/SSJ/9006/搜救任务总体指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/SSJ/9006/海上搜救任务总体指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Reports/SSJ/9006/海上搜索救援任务海上搜救任务1/3-1搜救任务单机指标报告.xls # SimulationServer/bin/Debug/net7.0-windows/Simulation.deps.json # SimulationServer/bin/Debug/net7.0-windows/ThirdParty.dll # SimulationServer/bin/Debug/net7.0/KYFramework.dll # SimulationServer/bin/Debug/net7.0/KYNetwork.dll # SimulationServer/bin/Debug/net7.0/KYNetwork.pdb # SimulationServer/bin/Debug/net7.0/Missions/editor_config.json # SimulationServer/bin/Debug/net7.0/Missions/task_config.json # SimulationServer/bin/Debug/net7.0/Reports/LSX/2024-08-30/搜救任务总体指标报告.xls # SimulationServer/bin/Debug/net7.0/Reports/SSJ/2024-08-30/搜救任务总体指标报告.xls # SimulationServer/bin/Debug/net7.0/SimulationCommon.dll # SimulationServer/bin/Debug/net7.0/SimulationCommon.pdb # SimulationServer/bin/Debug/net7.0/SimulationServer.dll # SimulationServer/bin/Debug/net7.0/SimulationServer.exe # SimulationServer/bin/Debug/net7.0/SimulationServer.pdb # SimulationServer/bin/Debug/net7.0/ThirdParty.pdb # ThirdParty/bin/Debug/net7.0/ThirdParty.dll # ThirdParty/bin/Debug/net7.0/ThirdParty.pdb

5 days ago

zansimple created new branch v1.0 at zansimple/SimulationServer

5 days ago

zansimple pushed to tongxin at zansimple/SimulationServer

352453270f 替换文件

5 days ago

zansimple closed issue zansimple/SimulationServer#1

根据任务配置文件创建任务

5 days ago

zansimple closed issue zansimple/SimulationServer#2

根据任务触发条件启动任务

5 days ago

zansimple closed issue zansimple/SimulationServer#3

修改灭火任务新需求

5 days ago