diff --git a/Plane.FormationCreator/Formation/CopterManager.cs b/Plane.FormationCreator/Formation/CopterManager.cs index 7d14c1a..ea79b06 100644 --- a/Plane.FormationCreator/Formation/CopterManager.cs +++ b/Plane.FormationCreator/Formation/CopterManager.cs @@ -25,7 +25,7 @@ namespace Plane.FormationCreator.Formation public class CopterCollection : ObservableCollection { //软件过期时间---过期将无法添加飞机,并自动退出 - public static DateTime Expire_App = DateTime.Parse("2021-06-01"); + public static DateTime Expire_App = DateTime.Parse("2022-06-10"); //超级用户过期时间--过期将无法使用内置超级用户登录 public static DateTime Expire_SuperUser = Expire_App; //允许飞行的飞机数量 diff --git a/Plane.FormationCreator/MainWindow.xaml.cs b/Plane.FormationCreator/MainWindow.xaml.cs index 7771201..126e46e 100644 --- a/Plane.FormationCreator/MainWindow.xaml.cs +++ b/Plane.FormationCreator/MainWindow.xaml.cs @@ -138,7 +138,9 @@ namespace Plane.FormationCreator { case Key.LeftCtrl: - { + case Key.RightCtrl: + case Key.LeftAlt: + { var copters = _copterManager.AcceptingControlCopters; Shiftkeydown = true; _copterManager.shiftkeydown = true; @@ -422,6 +424,8 @@ namespace Plane.FormationCreator switch (e.Key) { case Key.LeftCtrl: + case Key.RightCtrl: + case Key.LeftAlt: { Shiftkeydown = false; _copterManager.shiftkeydown = false; diff --git a/Plane.FormationCreator/ViewModels/ControlPanelViewModel.cs b/Plane.FormationCreator/ViewModels/ControlPanelViewModel.cs index 55e7607..413bce0 100644 --- a/Plane.FormationCreator/ViewModels/ControlPanelViewModel.cs +++ b/Plane.FormationCreator/ViewModels/ControlPanelViewModel.cs @@ -166,7 +166,7 @@ namespace Plane.FormationCreator.ViewModels { if ((!showch) &&(minVol>0.00) && (kv.Value<=minVol)) { - Message.Show(string.Format("以下飞机电压低于[{0}V]更换值:", minVol)); + Message.Show(string.Format("以下飞机电压低于[{0}V,单节{1:F2}]", minVol, minVol/4)); showch = true; } Message.Show(string.Format("{0} --> 5秒平均电压:{1:F2},单节{2:F2}", kv.Key, kv.Value, kv.Value/4));