// Copyright (C) 2013, 2014, 2015 Kazuhiro Fujieda <fujieda@users.osdn.me>\r
// \r
-// This program is part of KancolleSniffer.\r
+// Licensed under the Apache License, Version 2.0 (the "License");\r
+// you may not use this file except in compliance with the License.\r
+// You may obtain a copy of the License at\r
//\r
-// KancolleSniffer is free software: you can redistribute it and/or modify\r
-// it under the terms of the GNU General Public License as published by\r
-// the Free Software Foundation, either version 3 of the License, or\r
-// (at your option) any later version.\r
+// http://www.apache.org/licenses/LICENSE-2.0\r
//\r
-// This program is distributed in the hope that it will be useful,\r
-// but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
-// GNU General Public License for more details.\r
-//\r
-// You should have received a copy of the GNU General Public License\r
-// along with this program; if not, see <http://www.gnu.org/licenses/>.\r
+// Unless required by applicable law or agreed to in writing, software\r
+// distributed under the License is distributed on an "AS IS" BASIS,\r
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+// See the License for the specific language governing permissions and\r
+// limitations under the License.\r
\r
using System;\r
using System.Collections.Generic;\r
using System.Diagnostics;\r
using System.Drawing;\r
+using System.Globalization;\r
using System.IO;\r
using System.Linq;\r
+using System.Net.Sockets;\r
using System.Runtime.InteropServices;\r
using System.Text;\r
-using System.Windows.Forms;\r
+using System.Text.RegularExpressions;\r
+using System.Threading;\r
using System.Threading.Tasks;\r
-using Codeplex.Data;\r
-using Nekoxy;\r
+using System.Windows.Forms;\r
+using Microsoft.CSharp.RuntimeBinder;\r
+using Microsoft.Win32;\r
+using static System.Math;\r
+using Timer = System.Windows.Forms.Timer;\r
\r
namespace KancolleSniffer\r
{\r
private readonly Config _config = new Config();\r
private readonly ConfigDialog _configDialog;\r
private int _currentFleet;\r
+ private bool _combinedFleet;\r
private readonly Label[] _labelCheckFleets;\r
private readonly ShipLabels _shipLabels;\r
- private readonly ShipListForm _shipListForm;\r
+ private readonly ListForm _listForm;\r
private readonly NoticeQueue _noticeQueue;\r
private bool _started;\r
private string _debugLogFile;\r
private IEnumerator<string> _playLog;\r
private LogServer _logServer;\r
- private ProxyConfig _prevProxy;\r
+ private int _prevProxyPort;\r
private readonly SystemProxy _systemProxy = new SystemProxy();\r
+ private readonly ErrorDialog _errorDialog = new ErrorDialog();\r
+ private bool _missionFinishTimeMode;\r
+ private bool _ndockFinishTimeMode;\r
+ private readonly KancolleDb _kancolleDb = new KancolleDb();\r
\r
public MainForm()\r
{\r
SetupFleetClick();\r
_shipLabels = new ShipLabels();\r
_shipLabels.CreateAkashiTimers(panelShipInfo);\r
- _shipLabels.CreateLabels(panelShipInfo, ShowShipOnShipList);\r
- _shipLabels.CreateDamagedShipList(panelDamagedShipList);\r
- _shipLabels.CreateNDockLabels(panelDock);\r
- _shipListForm = new ShipListForm(_sniffer, _config) {Owner = this};\r
+ _shipLabels.CreateShipLabels(panelShipInfo, ShowShipOnShipList);\r
+ _shipLabels.CreateCombinedShipLabels(panelCombinedFleet, ShowShipOnShipList);\r
+ _shipLabels.CreateRepairList(panelRepairList, panelRepairList_Click);\r
+ _shipLabels.CreateNDockLabels(panelDock, labelNDock_Click);\r
+ labelPresetAkashiTimer.BackColor = ShipLabels.ColumnColors[1];\r
+ _listForm = new ListForm(_sniffer, _config) {Owner = this};\r
_noticeQueue = new NoticeQueue(Ring);\r
+ _config.Load();\r
+ PerformZoom();\r
+ _sniffer.LoadState();\r
}\r
\r
- private void HttpProxy_AfterSessionComplete(Session session)\r
+ private void HttpProxy_AfterSessionComplete(HttpProxy.Session session)\r
{\r
- Invoke(new Action<Session>(ProcessRequest), session);\r
+ Invoke(new Action<HttpProxy.Session>(ProcessRequest), session);\r
}\r
\r
- private void ProcessRequest(Session session)\r
+ private void ProcessRequest(HttpProxy.Session session)\r
{\r
+ var url = session.Request.PathAndQuery;\r
+ if (!url.Contains("kcsapi/"))\r
+ return;\r
+ var request = session.Request.BodyAsString;\r
var response = session.Response.BodyAsString;\r
if (response == null || !response.StartsWith("svdata="))\r
+ {\r
+ WriteDebugLog(url, request, response);\r
return;\r
- response = response.Remove(0, "svdata=".Length);\r
- var json = DynamicJson.Parse(response);\r
- var request = session.Request.BodyAsString;\r
+ }\r
+ if (_config.KancolleDb.On)\r
+ _kancolleDb.Send(url, request, response);\r
+ response = UnescapeString(response.Remove(0, "svdata=".Length));\r
+ WriteDebugLog(url, request, response);\r
+ try\r
+ {\r
+ UpdateInfo(_sniffer.Sniff(url, request, JsonParser.Parse(response)));\r
+ }\r
+ catch (RuntimeBinderException e)\r
+ {\r
+ if (_errorDialog.ShowDialog(this,\r
+ "このバージョンは現在の艦これに対応していません。\r\n新しいバージョンを利用してください。", e.ToString()) == DialogResult.Abort)\r
+ Application.Exit();\r
+ }\r
+ catch (LogIOException e)\r
+ {\r
+ if (_errorDialog.ShowDialog(this, e.Message, e.InnerException.ToString()) == DialogResult.Abort)\r
+ Application.Exit();\r
+ }\r
+ catch (Exception e)\r
+ {\r
+ if (_errorDialog.ShowDialog(this, "エラーが発生しました。", e.ToString()) == DialogResult.Abort)\r
+ Application.Exit();\r
+ }\r
+ }\r
+\r
+ private void WriteDebugLog(string url, string request, string response)\r
+ {\r
if (_debugLogFile != null)\r
{\r
File.AppendAllText(_debugLogFile,\r
- string.Format("url: {0}\nrequest: {1}\nresponse: {2}\n", session.Request.PathAndQuery, request, json.ToString()));\r
+ $"url: {url}\nrequest: {request}\nresponse: {response ?? "(null)"}\n");\r
+ }\r
+ }\r
+\r
+ private string UnescapeString(string s)\r
+ {\r
+ try\r
+ {\r
+ var rx = new Regex(@"\\[uU]([0-9A-Fa-f]{4})");\r
+ return rx.Replace(s,\r
+ match => ((char)int.Parse(match.Value.Substring(2), NumberStyles.HexNumber)).ToString());\r
+ }\r
+ catch (ArgumentException)\r
+ {\r
+ return s;\r
}\r
- UpdateInfo(_sniffer.Sniff(session.Request.PathAndQuery, request, json));\r
}\r
\r
private void UpdateInfo(Sniffer.Update update)\r
if (update == Sniffer.Update.Start)\r
{\r
labelLogin.Visible = false;\r
+ labelGuide.Visible = false;\r
_started = true;\r
return;\r
}\r
\r
private void MainForm_Load(object sender, EventArgs e)\r
{\r
- _config.Load();\r
RestoreLocation();\r
if (_config.HideOnMinimized && WindowState == FormWindowState.Minimized)\r
ShowInTaskbar = false;\r
ApplyConfig();\r
ApplyDebugLogSetting();\r
ApplyLogSetting();\r
- _sniffer.LoadState();\r
- if (_config.Proxy.Auto)\r
- _systemProxy.SetAutoProxyUrl(ProxyConfig.AutoConfigUrl);\r
- StartProxy();\r
- _prevProxy = _config.Proxy.Clone();\r
+ ApplyProxySetting();\r
+ SystemEvents.PowerModeChanged += SystemEvents_PowerModeChanged;\r
+ if (_config.KancolleDb.On)\r
+ _kancolleDb.Start(_config.KancolleDb.Token);\r
}\r
\r
- private void StartProxy()\r
+ private void SystemEvents_PowerModeChanged(object sender, PowerModeChangedEventArgs e)\r
{\r
- if (_config.Proxy.UseUpstream)\r
- {\r
- HttpProxy.UpstreamProxyHost = "127.0.0.1";\r
- HttpProxy.UpstreamProxyPort = _config.Proxy.UpstreamPort;\r
- }\r
- else\r
+ if (e.Mode != PowerModes.Resume || !_config.Proxy.Auto)\r
+ return;\r
+ Task.Run(() =>\r
{\r
- HttpProxy.UpstreamProxyHost = null;\r
- }\r
- HttpProxy.Startup(_config.Proxy.Listen, false, false);\r
+ for (var i = 0; i < 5; Thread.Sleep(10000), i++)\r
+ SystemProxy.Refresh();\r
+ });\r
}\r
\r
private void MainForm_FormClosing(object sender, FormClosingEventArgs e)\r
_config.Location = (WindowState == FormWindowState.Normal ? Bounds : RestoreBounds).Location;\r
_config.Save();\r
Task.Run(() => ShutdownProxy());\r
- if (_logServer != null)\r
- _logServer.Stop();\r
+ _logServer?.Stop();\r
if (_config.Proxy.Auto)\r
_systemProxy.RestoreSettings();\r
+ SystemEvents.PowerModeChanged -= SystemEvents_PowerModeChanged;\r
+ _kancolleDb.Stop();\r
}\r
\r
private void ShutdownProxy()\r
{\r
- lock (typeof (HttpProxy))\r
- {\r
- HttpProxy.Shutdown();\r
- }\r
+ HttpProxy.Shutdown();\r
}\r
\r
private void MainForm_Resize(object sender, EventArgs e)\r
ApplyConfig();\r
}\r
\r
+ private void PerformZoom()\r
+ {\r
+ if (_config.Zoom == 100)\r
+ return;\r
+ var prev = CurrentAutoScaleDimensions;\r
+ foreach (var control in new Control[] {this, _listForm, labelLogin, labelGuide})\r
+ control.Font = new Font(control.Font.FontFamily, control.Font.Size * _config.Zoom / 100);\r
+ ShipLabel.LatinFont = new Font("Tahoma", 8f * _config.Zoom / 100);\r
+ var cur = CurrentAutoScaleDimensions;\r
+ ShipLabel.ScaleFactor = new SizeF(ShipLabel.ScaleFactor.Width * cur.Width / prev.Width,\r
+ ShipLabel.ScaleFactor.Height * cur.Height / prev.Height);\r
+ }\r
+\r
private void RestoreLocation()\r
{\r
if (_config.Location.X == int.MinValue)\r
\r
private void ApplyConfig()\r
{\r
- _shipListForm.TopMost = TopMost = _config.TopMost;\r
+ _listForm.TopMost = TopMost = _config.TopMost;\r
_sniffer.Item.MarginShips = _config.MarginShips;\r
_sniffer.Item.MarginEquips = _config.MarginEquips;\r
_sniffer.Achievement.ResetHours = _config.ResetHours;\r
+ labelAkashiRepair.Visible = labelAkashiRepairTimer.Visible =\r
+ labelPresetAkashiTimer.Visible = _config.UsePresetAkashi;\r
+ if (_config.KancolleDb.On)\r
+ _kancolleDb.Start(_config.KancolleDb.Token);\r
}\r
\r
public void ApplyDebugLogSetting()\r
_debugLogFile = _config.DebugLogging ? _config.DebugLogFile : null;\r
}\r
\r
- public void ApplyProxySetting()\r
+ public bool ApplyProxySetting()\r
{\r
- if (_config.Proxy.Auto != _prevProxy.Auto)\r
+ if (!_config.Proxy.Auto)\r
+ _systemProxy.RestoreSettings();\r
+ if (_config.Proxy.UseUpstream)\r
{\r
- if (_config.Proxy.Auto)\r
- _systemProxy.SetAutoProxyUrl(ProxyConfig.AutoConfigUrl);\r
- else\r
- _systemProxy.RestoreSettings();\r
+ HttpProxy.UpstreamProxyHost = "127.0.0.1";\r
+ HttpProxy.UpstreamProxyPort = _config.Proxy.UpstreamPort;\r
+ }\r
+ HttpProxy.IsEnableUpstreamProxy = _config.Proxy.UseUpstream;\r
+ var result = true;\r
+ if (!HttpProxy.IsInListening || _config.Proxy.Listen != _prevProxyPort)\r
+ {\r
+ ShutdownProxy();\r
+ result = StartProxy();\r
+ }\r
+ if (_config.Proxy.Auto && result)\r
+ {\r
+ _systemProxy.SetAutoProxyUrl(HttpProxy.LocalPort == 8080\r
+ ? ProxyConfig.AutoConfigUrl\r
+ : ProxyConfig.AutoConfigUrlWithPort + HttpProxy.LocalPort);\r
}\r
- if (_config.Proxy.Listen != _prevProxy.Listen ||\r
- _config.Proxy.UseUpstream != _prevProxy.UseUpstream ||\r
- _config.Proxy.UpstreamPort != _prevProxy.UpstreamPort)\r
+ _prevProxyPort = _config.Proxy.Listen;\r
+ return result;\r
+ }\r
+\r
+ private bool StartProxy()\r
+ {\r
+ try\r
{\r
- Task.Run(() =>\r
+ HttpProxy.Startup(_config.Proxy.Listen, false, false);\r
+ }\r
+ catch (SocketException e)\r
+ {\r
+ if (e.SocketErrorCode != SocketError.AddressAlreadyInUse)\r
+ throw;\r
+ if (WarnConflictPortNumber("プロキシサーバー", _config.Proxy.Listen, _config.Proxy.Auto) == DialogResult.No ||\r
+ !_config.Proxy.Auto)\r
{\r
- ShutdownProxy();\r
- StartProxy();\r
- });\r
+ _systemProxy.RestoreSettings();\r
+ return false;\r
+ }\r
+ HttpProxy.Startup(0, false, false);\r
+ _config.Proxy.Listen = HttpProxy.LocalPort;\r
}\r
- _prevProxy = _config.Proxy.Clone();\r
+ return true;\r
+ }\r
+\r
+ private DialogResult WarnConflictPortNumber(string name, int port, bool auto)\r
+ {\r
+ var msg = $"{name}のポート番号{port}は他のアプリケーションが使用中です。";\r
+ var cap = "ポート番号の衝突";\r
+ return auto\r
+ ? MessageBox.Show(this, msg + "自動的に別の番号を割り当てますか?", cap,\r
+ MessageBoxButtons.YesNo, MessageBoxIcon.Question)\r
+ : MessageBox.Show(this, msg + "設定ダイアログでポート番号を変更してください。", cap,\r
+ MessageBoxButtons.OK, MessageBoxIcon.Exclamation);\r
}\r
\r
- public void ApplyLogSetting()\r
+ public bool ApplyLogSetting()\r
{\r
- if (_logServer != null && (!_config.Log.ServerOn || _config.Log.Listen != _logServer.Port))\r
+ var result = true;\r
+ if (_config.Log.ServerOn)\r
{\r
- _logServer.Stop();\r
- _logServer = null;\r
+ result = StartLogServer();\r
}\r
- if (_logServer == null && _config.Log.ServerOn)\r
+ else\r
{\r
- _logServer = new LogServer(_config.Log.Listen);\r
- _logServer.Start();\r
+ _logServer?.Stop();\r
+ _logServer = null;\r
}\r
- if (_logServer != null)\r
- _logServer.OutputDir = _config.Log.OutputDir;\r
_sniffer.EnableLog(_config.Log.On ? LogType.All : LogType.None);\r
_sniffer.MaterialLogInterval = _config.Log.MaterialLogInterval;\r
_sniffer.LogOutputDir = _config.Log.OutputDir;\r
+ return result;\r
+ }\r
+\r
+ private bool StartLogServer()\r
+ {\r
+ var port = _config.Log.Listen;\r
+ if (_logServer?.Port == port)\r
+ return true;\r
+ _logServer?.Stop();\r
+ _logServer = null;\r
+ try\r
+ {\r
+ _logServer = new LogServer(port);\r
+ _logServer.Start();\r
+ }\r
+ catch (SocketException e) when (e.SocketErrorCode == SocketError.AddressAlreadyInUse)\r
+ {\r
+ if (WarnConflictPortNumber("閲覧サーバー", port, true) == DialogResult.No)\r
+ return false;\r
+ _logServer = new LogServer(0);\r
+ _logServer.Start();\r
+ _config.Log.Listen = _logServer.Port;\r
+ }\r
+ _logServer.OutputDir = _config.Log.OutputDir;\r
+ return true;\r
}\r
\r
public static bool IsVisibleOnAnyScreen(Rectangle rect)\r
private void timerMain_Tick(object sender, EventArgs e)\r
{\r
if (_started)\r
- UpdateTimers();\r
+ {\r
+ try\r
+ {\r
+ UpdateTimers();\r
+ }\r
+ catch (Exception ex)\r
+ {\r
+ if (_errorDialog.ShowDialog(this, "エラーが発生しました。", ex.ToString()) == DialogResult.Abort)\r
+ Application.Exit();\r
+ }\r
+ }\r
if (_playLog == null || _configDialog.Visible)\r
{\r
labelPlayLog.Visible = false;\r
labelPlayLog.Visible = false;\r
return;\r
}\r
- lines.Add(_playLog.Current.Substring(s.Count()));\r
+ lines.Add(_playLog.Current.Substring(s.Length));\r
}\r
labelPlayLog.Visible = !labelPlayLog.Visible;\r
- var json = DynamicJson.Parse(lines[2]);\r
+ var json = JsonParser.Parse(lines[2]);\r
UpdateInfo(_sniffer.Sniff(lines[0], lines[1], json));\r
}\r
\r
private void ShowShipOnShipList(object sender, EventArgs ev)\r
{\r
- if (!_shipListForm.Visible)\r
+ if (!_listForm.Visible)\r
return;\r
var idx = (int)((Control)sender).Tag;\r
var statuses = _sniffer.GetShipStatuses(_currentFleet);\r
if (statuses.Length <= idx)\r
return;\r
- _shipListForm.ShowShip(statuses[idx].Id);\r
+ _listForm.ShowShip(statuses[idx].Id);\r
}\r
\r
private void UpdateItemInfo()\r
{\r
UpdateNumOfShips();\r
UpdateNumOfEquips();\r
- labelNumOfBuckets.Text = _sniffer.Item.MaterialHistory[(int)Material.Bucket].Now.ToString("D");\r
+ labelNumOfBuckets.Text = _sniffer.Material.MaterialHistory[(int)Material.Bucket].Now.ToString("D");\r
UpdateBucketHistory();\r
var ac = _sniffer.Achievement.Value;\r
if (ac >= 10000)\r
"今月 " + _sniffer.Achievement.ValueOfMonth.ToString("F1") + "\n" +\r
"EO " + _sniffer.ExMap.Achievement);\r
UpdateMaterialHistry();\r
- if (_shipListForm.Visible)\r
- _shipListForm.UpdateList();\r
+ if (_listForm.Visible)\r
+ _listForm.UpdateList();\r
}\r
\r
private void UpdateNumOfShips()\r
{\r
var item = _sniffer.Item;\r
- labelNumOfShips.Text = string.Format("{0:D}/{1:D}", item.NowShips, item.MaxShips);\r
+ labelNumOfShips.Text = $"{item.NowShips:D}/{item.MaxShips:D}";\r
labelNumOfShips.ForeColor = item.TooManyShips ? Color.Red : Color.Black;\r
if (item.RingShips)\r
{\r
- var message = string.Format("残り{0:D}隻", _sniffer.Item.MaxShips - _sniffer.Item.NowShips);\r
- _noticeQueue.Enqueue("艦娘が多すぎます", message, _config.MaxShipsSoundFile);\r
+ var message = $"残り{_sniffer.Item.MaxShips - _sniffer.Item.NowShips:D}隻";\r
+ _noticeQueue.Enqueue("艦娘が多すぎます", message, _config.Sounds["艦娘数超過"]);\r
item.RingShips = false;\r
}\r
}\r
private void UpdateNumOfEquips()\r
{\r
var item = _sniffer.Item;\r
- labelNumOfEquips.Text = string.Format("{0:D}/{1:D}", item.NowEquips, item.MaxEquips);\r
+ labelNumOfEquips.Text = $"{item.NowEquips:D}/{item.MaxEquips:D}";\r
labelNumOfEquips.ForeColor = item.TooManyEquips ? Color.Red : Color.Black;\r
if (item.RingEquips)\r
{\r
- var message = string.Format("残り{0:D}個", _sniffer.Item.MaxEquips - _sniffer.Item.NowEquips);\r
- _noticeQueue.Enqueue("装備が多すぎます", message, _config.MaxEquipsSoundFile);\r
+ var message = $"残り{_sniffer.Item.MaxEquips - _sniffer.Item.NowEquips:D}個";\r
+ _noticeQueue.Enqueue("装備が多すぎます", message, _config.Sounds["装備数超過"]);\r
item.RingEquips = false;\r
}\r
}\r
\r
private void UpdateBucketHistory()\r
{\r
- var count = _sniffer.Item.MaterialHistory[(int)Material.Bucket];\r
+ var count = _sniffer.Material.MaterialHistory[(int)Material.Bucket];\r
var day = count.Now - count.BegOfDay;\r
var week = count.Now - count.BegOfWeek;\r
if (day >= 1000)\r
day = 999;\r
if (week >= 1000)\r
week = 999;\r
- labelBucketHistory.Text = string.Format("{0:+#;-#;±0} 今日\n{1:+#;-#;±0} 今週", day, week);\r
+ labelBucketHistory.Text = $"{day:+#;-#;±0} 今日\n{week:+#;-#;±0} 今週";\r
}\r
\r
private void UpdateMaterialHistry()\r
var text = new[] {"燃料", "弾薬", "鋼材", "ボーキ"};\r
for (var i = 0; i < labels.Length; i++)\r
{\r
- var count = _sniffer.Item.MaterialHistory[i];\r
+ var count = _sniffer.Material.MaterialHistory[i];\r
+ var port = count.Now - _sniffer.Material.PrevPort[i];\r
+ if (port >= 100000)\r
+ port = 99999;\r
var day = count.Now - count.BegOfDay;\r
if (day >= 100000)\r
day = 99999;\r
var week = count.Now - count.BegOfWeek;\r
if (week >= 100000)\r
week = 99999;\r
- labels[i].Text = string.Format("{0}\n{1:+#;-#;±0}\n{2:+#;-#;±0}", text[i], day, week);\r
+ labels[i].Text = $"{text[i]}\n{port:+#;-#;±0}\n{day:+#;-#;±0}\n{week:+#;-#;±0}";\r
}\r
}\r
\r
UpdatePanelShipInfo();\r
NotifyDamagedShip();\r
UpdateChargeInfo();\r
- UpdateDamagedShipList();\r
- if (_shipListForm.Visible)\r
- _shipListForm.UpdateList();\r
+ UpdateRepairList();\r
+ if (_listForm.Visible)\r
+ _listForm.UpdateList();\r
}\r
\r
private void UpdatePanelShipInfo()\r
{\r
var statuses = _sniffer.GetShipStatuses(_currentFleet);\r
- _shipLabels.SetShipInfo(statuses);\r
- labelFighterPower.Text = _sniffer.GetFighterPower(_currentFleet).ToString("D");\r
+ _shipLabels.SetShipLabels(statuses);\r
+ if (_sniffer.CombinedFleetType == 0)\r
+ _combinedFleet = false;\r
+ labelFleet1.Text = _combinedFleet ? "連合" : "第一";\r
+ panelCombinedFleet.Visible = _combinedFleet;\r
+ if (_combinedFleet)\r
+ _shipLabels.SetCombinedShipLabels(_sniffer.GetShipStatuses(0), _sniffer.GetShipStatuses(1));\r
UpdateAkashiTimer();\r
+ UpdateFighterPower();\r
UpdateLoS();\r
UpdateCondTimers();\r
}\r
\r
private void NotifyDamagedShip()\r
{\r
- if (_sniffer.Battle.HasDamagedShip)\r
- _noticeQueue.Enqueue("大破した艦娘がいます", string.Join(" ", _sniffer.Battle.DamagedShipNames),\r
- _config.DamagedShipSoundFile);\r
+ if (_sniffer.BadlyDamagedShips.Any())\r
+ _noticeQueue.Enqueue("大破した艦娘がいます", string.Join(" ", _sniffer.BadlyDamagedShips),\r
+ _config.Sounds["大破警告"]);\r
}\r
\r
private void NotifyAkashiTimer()\r
{\r
- var msgs = _sniffer.GetAkashiTimerNotice();\r
+ var akashi = _sniffer.AkashiTimer;\r
+ var msgs = akashi.GetNotice();\r
if (msgs.Length == 0)\r
return;\r
- if (msgs[0] == "20分経過しました。")\r
- {\r
- _noticeQueue.Enqueue("泊地修理", msgs[0], _config.Akashi20MinSoundFile);\r
+ if (!akashi.CheckReparing() && !(akashi.CheckPresetReparing() && _config.UsePresetAkashi))\r
return;\r
+ if (msgs[0].Proceeded == "20分経過しました。")\r
+ {\r
+ _noticeQueue.Enqueue("泊地修理", msgs[0].Proceeded, _config.Sounds["泊地修理20分経過"]);\r
+ msgs[0].Proceeded = "";\r
+ // 修理完了がいるかもしれないので続ける\r
}\r
var fn = new[] {"第一艦隊", "第二艦隊", "第三艦隊", "第四艦隊"};\r
for (var i = 0; i < fn.Length; i++)\r
{\r
- if (msgs[i] == "")\r
- continue;\r
- _noticeQueue.Enqueue("泊地修理 " + fn[i], msgs[i], _config.AkashiProgressSoundFile);\r
+ if (msgs[i].Proceeded != "")\r
+ _noticeQueue.Enqueue("泊地修理 " + fn[i], "修理進行:" + msgs[i].Proceeded, _config.Sounds["泊地修理進行"]);\r
+ if (msgs[i].Completed != "")\r
+ _noticeQueue.Enqueue("泊地修理 " + fn[i], "修理完了:" + msgs[i].Completed, _config.Sounds["泊地修理完了"]);\r
}\r
}\r
\r
+ public void UpdateFighterPower()\r
+ {\r
+ var fp = _sniffer.GetFighterPower(_currentFleet);\r
+ labelFighterPower.Text = fp[0].ToString("D");\r
+ var cr = _sniffer.GetContactTriggerRate(_currentFleet) * 100;\r
+ var text = "制空: " + (fp[0] == fp[1] ? $"{fp[0]}" : $"{fp[0]}~{fp[1]}") +\r
+ $" 触接: {cr:f1}";\r
+ toolTipFighterPower.SetToolTip(labelFighterPower, text);\r
+ toolTipFighterPower.SetToolTip(labelFighterPowerCaption, text);\r
+ }\r
+\r
private void UpdateLoS()\r
{\r
- labelLoS.Text = _sniffer.GetFleetLineOfSights(_currentFleet).ToString("F1");\r
+ labelLoS.Text = (Floor(_sniffer.GetFleetLineOfSights(_currentFleet) * 10) / 10.0).ToString("F1");\r
}\r
\r
private void UpdateBattleInfo()\r
var battle = _sniffer.Battle;\r
var color = new[] {DefaultForeColor, DefaultForeColor, Color.Blue, Color.Green, Color.Orange, Color.Red};\r
labelFormation.Text = battle.Formation;\r
- labelEnemyFighterPower.Text = battle.EnemyFighterPower.ToString("D");\r
+ labelEnemyFighterPower.Text = battle.EnemyFighterPower;\r
labelFighterPower.ForeColor = color[battle.AirControlLevel + 1];\r
if (_config.AlwaysShowResultRank)\r
ShowResultRank();\r
_shipLabels.SetNDockLabels(_sniffer.NDock);\r
}\r
\r
+\r
+ private void labelNDock_Click(object sender, EventArgs e)\r
+ {\r
+ _ndockFinishTimeMode = !_ndockFinishTimeMode;\r
+ UpdateTimers();\r
+ }\r
+\r
private void UpdateMissionLabels()\r
{\r
foreach (var entry in\r
entry.label.Text = entry.Name;\r
}\r
\r
+ private void labelMission_Click(object sender, EventArgs e)\r
+ {\r
+ _missionFinishTimeMode = !_missionFinishTimeMode;\r
+ UpdateTimers();\r
+ }\r
+\r
private void UpdateTimers()\r
{\r
foreach (var entry in\r
{\r
entry.Timer.Update();\r
SetTimerColor(entry.label, entry.Timer);\r
- var rest = entry.Timer.Rest;\r
- entry.label.Text = rest.Days == 0 ? rest.ToString(@"hh\:mm\:ss") : rest.ToString(@"d\.hh\:mm");\r
+ entry.label.Text = entry.Timer.ToString(_missionFinishTimeMode);\r
if (!entry.Timer.NeedRing)\r
continue;\r
- _noticeQueue.Enqueue("遠征が終わりました", entry.Name, _config.MissionSoundFile);\r
+ _noticeQueue.Enqueue("遠征が終わりました", entry.Name, _config.Sounds["遠征終了"]);\r
entry.Timer.NeedRing = false;\r
}\r
for (var i = 0; i < _sniffer.NDock.Length; i++)\r
{\r
var entry = _sniffer.NDock[i];\r
entry.Timer.Update();\r
- _shipLabels.SetNDockTimer(i, entry.Timer);\r
+ _shipLabels.SetNDockTimer(i, entry.Timer, _ndockFinishTimeMode);\r
if (!entry.Timer.NeedRing)\r
continue;\r
- _noticeQueue.Enqueue("入渠が終わりました", entry.Name, _config.NDockSoundFile);\r
+ _noticeQueue.Enqueue("入渠が終わりました", entry.Name, _config.Sounds["入渠終了"]);\r
entry.Timer.NeedRing = false;\r
}\r
var kdock = new[] {labelConstruct1, labelConstruct2, labelConstruct3, labelConstruct4};\r
var timer = _sniffer.KDock[i];\r
timer.Update();\r
SetTimerColor(kdock[i], timer);\r
- kdock[i].Text = timer.Rest.ToString(@"hh\:mm\:ss");\r
+\r
+ kdock[i].Text = timer.EndTime == DateTime.MinValue ? "" : timer.Rest.ToString(@"hh\:mm\:ss");\r
if (!timer.NeedRing)\r
continue;\r
- _noticeQueue.Enqueue("建造が終わりました", string.Format("第{0:D}ドック", i + 1), _config.KDockSoundFile);\r
+ _noticeQueue.Enqueue("建造が終わりました", $"第{i + 1:D}ドック", _config.Sounds["建造完了"]);\r
timer.NeedRing = false;\r
}\r
UpdateCondTimers();\r
\r
private void UpdateCondTimers()\r
{\r
- var timer = _sniffer.GetConditionTimer(_currentFleet);\r
+ DateTime timer;\r
+ if (_combinedFleet)\r
+ {\r
+ var timer1 = _sniffer.GetConditionTimer(0);\r
+ var timer2 = _sniffer.GetConditionTimer(1);\r
+ timer = timer2 > timer1 ? timer2 : timer1;\r
+ }\r
+ else\r
+ {\r
+ timer = _sniffer.GetConditionTimer(_currentFleet);\r
+ }\r
var now = DateTime.Now;\r
if (timer == DateTime.MinValue)\r
{\r
labelCondTimer.Text = "";\r
return;\r
}\r
- var span = TimeSpan.FromSeconds(Math.Ceiling((timer - now).TotalSeconds));\r
+ var span = TimeSpan.FromSeconds(Ceiling((timer - now).TotalSeconds));\r
if (span >= TimeSpan.FromMinutes(9))\r
{\r
labelCondTimerTitle.Text = "cond40まで";\r
{\r
if (!_config.NotifyConditions.Contains(notice[i]))\r
return;\r
- _noticeQueue.Enqueue("疲労が回復しました", fn[i] + " cond" + notice[i].ToString("D"), _config.ConditionSoundFile);\r
+ _noticeQueue.Enqueue("疲労が回復しました", fn[i] + " cond" + notice[i].ToString("D"), _config.Sounds["疲労回復"]);\r
}\r
}\r
\r
private void UpdateAkashiTimer()\r
{\r
+ if (_config.UsePresetAkashi)\r
+ UpdatePresetAkashiTimer();\r
_shipLabels.SetAkashiTimer(_sniffer.GetShipStatuses(_currentFleet),\r
- _sniffer.GetAkashiTimers(_currentFleet));\r
+ _sniffer.AkashiTimer.GetTimers(_currentFleet));\r
NotifyAkashiTimer();\r
}\r
\r
- private void UpdateDamagedShipList()\r
+ private void UpdatePresetAkashiTimer()\r
+ {\r
+ var akashi = _sniffer.AkashiTimer;\r
+ var span = akashi.PresetDeckTimer;\r
+ var color = span == TimeSpan.Zero && akashi.CheckPresetReparing() ? Color.Red : DefaultForeColor;\r
+ var text = span == TimeSpan.MinValue ? "" : span.ToString(@"mm\:ss");\r
+ labelAkashiRepairTimer.ForeColor = color;\r
+ labelAkashiRepairTimer.Text = text;\r
+ if (akashi.CheckPresetReparing() && !akashi.CheckReparing(_currentFleet))\r
+ {\r
+ labelPresetAkashiTimer.ForeColor = color;\r
+ labelPresetAkashiTimer.Text = text;\r
+ }\r
+ else\r
+ {\r
+ labelPresetAkashiTimer.ForeColor = DefaultForeColor;\r
+ labelPresetAkashiTimer.Text = "";\r
+ }\r
+ }\r
+\r
+ private void UpdateRepairList()\r
{\r
- _shipLabels.SetDamagedShipList(_sniffer.DamagedShipList);\r
+ _shipLabels.SetRepairList(_sniffer.RepairList);\r
}\r
\r
private void UpdateQuestList()\r
var name = new[] {labelQuest1, labelQuest2, labelQuest3, labelQuest4, labelQuest5, labelQuest6};\r
var progress = new[]\r
{labelProgress1, labelProgress2, labelProgress3, labelProgress4, labelProgress5, labelProgress6};\r
- var color = new[]\r
- {\r
- Color.FromArgb(60, 141, 76), Color.FromArgb(232, 57, 41), Color.FromArgb(136, 204, 120),\r
- Color.FromArgb(52, 147, 185), Color.FromArgb(220, 198, 126), Color.FromArgb(168, 111, 76),\r
- Color.FromArgb(200, 148, 231)\r
- };\r
-\r
var quests = _sniffer.Quests;\r
for (var i = 0; i < name.Length; i++)\r
{\r
if (i < quests.Length)\r
{\r
- category[i].BackColor = color[quests[i].Category - 1];\r
+ category[i].BackColor = quests[i].Color;\r
name[i].Text = quests[i].Name;\r
- progress[i].Text = string.Format("{0:D}%", quests[i].Progress);\r
+ progress[i].Text = $"{quests[i].Progress:D}%";\r
}\r
else\r
{\r
if (_config.ShowBaloonTip)\r
notifyIconMain.ShowBalloonTip(20000, baloonTitle, baloonMessage, ToolTipIcon.Info);\r
if (_config.PlaySound)\r
- PlaySound(soundFile, _config.SoundVolume);\r
+ PlaySound(soundFile, _config.Sounds.Volume);\r
}\r
\r
[DllImport("winmm.dll")]\r
\r
private void labelFleet_Click(object sender, EventArgs e)\r
{\r
+ if (!_started)\r
+ return;\r
var fleet = (int)((Label)sender).Tag;\r
if (_currentFleet == fleet)\r
+ {\r
+ if (fleet > 0)\r
+ return;\r
+ _combinedFleet = _sniffer.CombinedFleetType > 0 && !_combinedFleet;\r
+ UpdatePanelShipInfo();\r
return;\r
+ }\r
+ _combinedFleet = false;\r
_currentFleet = fleet;\r
foreach (var label in _labelCheckFleets)\r
label.Visible = false;\r
_labelCheckFleets[fleet].Visible = true;\r
- if (!_started)\r
- return;\r
UpdatePanelShipInfo();\r
}\r
\r
+ private void labelFleet1_MouseHover(object sender, EventArgs e)\r
+ {\r
+ labelFleet1.Text = _currentFleet == 0 && _sniffer.CombinedFleetType > 0 && !_combinedFleet ? "連合" : "第一";\r
+ }\r
+\r
+ private void labelFleet1_MouseLeave(object sender, EventArgs e)\r
+ {\r
+ labelFleet1.Text = _combinedFleet ? "連合" : "第一";\r
+ }\r
+\r
private void labelBucketHistoryButton_Click(object sender, EventArgs e)\r
{\r
if (labelBucketHistory.Visible)\r
}\r
}\r
\r
+ private void labelBucketHistory_Click(object sender, EventArgs e)\r
+ {\r
+ labelBucketHistory.Visible = false;\r
+ labelBucketHistoryButton.BackColor = DefaultBackColor;\r
+ }\r
+\r
private void labelMaterialHistoryButton_Click(object sender, EventArgs e)\r
{\r
if (panelMaterialHistory.Visible)\r
}\r
}\r
\r
+ private void panelMaterialHistory_Click(object sender, EventArgs e)\r
+ {\r
+ panelMaterialHistory.Visible = false;\r
+ labelMaterialHistoryButton.BackColor = DefaultBackColor;\r
+ }\r
+\r
public void ResetAchievemnt()\r
{\r
_sniffer.Achievement.Reset();\r
UpdateItemInfo();\r
}\r
\r
- private void labelDamgedShipListButton_Click(object sender, EventArgs e)\r
+ private void labelRepairListButton_Click(object sender, EventArgs e)\r
{\r
- if (panelDamagedShipList.Visible)\r
+ if (panelRepairList.Visible)\r
{\r
- panelDamagedShipList.Visible = false;\r
- labelDamgedShipListButton.BackColor = DefaultBackColor;\r
+ panelRepairList.Visible = false;\r
+ labelRepairListButton.BackColor = DefaultBackColor;\r
}\r
else\r
{\r
- panelDamagedShipList.Visible = true;\r
- panelDamagedShipList.BringToFront();\r
- labelDamgedShipListButton.BackColor = SystemColors.ActiveCaption;\r
+ panelRepairList.Visible = true;\r
+ panelRepairList.BringToFront();\r
+ labelRepairListButton.BackColor = SystemColors.ActiveCaption;\r
}\r
}\r
\r
+ private void panelRepairList_Click(object sender, EventArgs e)\r
+ {\r
+ panelRepairList.Visible = false;\r
+ labelRepairListButton.BackColor = DefaultBackColor;\r
+ }\r
+\r
private void ShipListToolStripMenuItem_Click(object sender, EventArgs e)\r
{\r
- _shipListForm.UpdateList();\r
- _shipListForm.Show();\r
- if (_shipListForm.WindowState == FormWindowState.Minimized)\r
- _shipListForm.WindowState = FormWindowState.Normal;\r
- _shipListForm.Activate();\r
+ _listForm.UpdateList();\r
+ _listForm.Show();\r
+ if (_listForm.WindowState == FormWindowState.Minimized)\r
+ _listForm.WindowState = FormWindowState.Normal;\r
+ _listForm.Activate();\r
}\r
\r
private void LogToolStripMenuItem_Click(object sender, EventArgs e)\r
{\r
Process.Start("http://localhost:" + _config.Log.Listen + "/");\r
}\r
+\r
+ private void CaptureToolStripMenuItem_Click(object sender, EventArgs e)\r
+ {\r
+ try\r
+ {\r
+ var proc = new ProcessStartInfo("BurageSnap.exe") {WorkingDirectory = "Capture"};\r
+ Process.Start(proc);\r
+ }\r
+ catch (FileNotFoundException)\r
+ {\r
+ }\r
+ }\r
}\r
}
\ No newline at end of file