From 212ec356a6ebdb1be28ca4633a423e91ff7e6483 Mon Sep 17 00:00:00 2001 From: Danny Vargas Date: Wed, 23 Apr 2014 14:40:18 -0400 Subject: [PATCH 1/2] Fix for possible white-screen bug. --- Grabacr07.KanColleViewer/App.config | 2 +- .../Properties/Settings.Designer.cs | 2 +- Grabacr07.KanColleViewer/Properties/Settings.settings | 2 +- .../ViewModels/MainWindowViewModel.cs | 6 +++--- Grabacr07.KanColleWrapper/KanColleClient.cs | 10 +++++----- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Grabacr07.KanColleViewer/App.config b/Grabacr07.KanColleViewer/App.config index 999afb91e..ad5101f88 100644 --- a/Grabacr07.KanColleViewer/App.config +++ b/Grabacr07.KanColleViewer/App.config @@ -36,7 +36,7 @@ } #flashWrap { - position:fixed; + position:free; z-index:1; margin:0; } diff --git a/Grabacr07.KanColleViewer/Properties/Settings.Designer.cs b/Grabacr07.KanColleViewer/Properties/Settings.Designer.cs index 266c2d624..e003c1d9a 100644 --- a/Grabacr07.KanColleViewer/Properties/Settings.Designer.cs +++ b/Grabacr07.KanColleViewer/Properties/Settings.Designer.cs @@ -57,7 +57,7 @@ public int LocalProxyPort { } #flashWrap { - position:fixed; + position:free; z-index:1; margin:0; } diff --git a/Grabacr07.KanColleViewer/Properties/Settings.settings b/Grabacr07.KanColleViewer/Properties/Settings.settings index c84567d83..3964b5d8c 100644 --- a/Grabacr07.KanColleViewer/Properties/Settings.settings +++ b/Grabacr07.KanColleViewer/Properties/Settings.settings @@ -23,7 +23,7 @@ } #flashWrap { - position:fixed; + position:free; z-index:1; margin:0; } diff --git a/Grabacr07.KanColleViewer/ViewModels/MainWindowViewModel.cs b/Grabacr07.KanColleViewer/ViewModels/MainWindowViewModel.cs index 082678572..fd444a340 100644 --- a/Grabacr07.KanColleViewer/ViewModels/MainWindowViewModel.cs +++ b/Grabacr07.KanColleViewer/ViewModels/MainWindowViewModel.cs @@ -46,9 +46,9 @@ public Mode Mode // 今後の実装にご期待ください ThemeService.Current.ChangeAccent(Accent.Orange); break; - case Mode.CriticalCondition: - ThemeService.Current.ChangeAccent(Accent.Orange); - break; + case Mode.CriticalCondition: + ThemeService.Current.ChangeAccent(Accent.Orange); + break; } this.RaisePropertyChanged(); diff --git a/Grabacr07.KanColleWrapper/KanColleClient.cs b/Grabacr07.KanColleWrapper/KanColleClient.cs index ee4cf470b..68103bc89 100644 --- a/Grabacr07.KanColleWrapper/KanColleClient.cs +++ b/Grabacr07.KanColleWrapper/KanColleClient.cs @@ -42,10 +42,10 @@ public static KanColleClient Current /// public ObservableSynchronizedCollection Errors { get; private set; } - /// - /// Application update notifications and downloads. - /// - public Updater Updater { get; private set; } + /// + /// Application update notifications and downloads. + /// + public Updater Updater { get; private set; } #region IsStarted 変更通知プロパティ @@ -76,7 +76,7 @@ private KanColleClient() this.Proxy = new KanColleProxy(); this.Master = new Master(this.Proxy); this.Homeport = new Homeport(this.Proxy); - this.Updater = new Updater(); + this.Updater = new Updater(); this.Proxy.ApiSessionSource.Where(x => x.PathAndQuery == "/kcsapi/api_start") .TryParse() From 1725cd86020b2a8fd50bdc8481893d5d4ff55048 Mon Sep 17 00:00:00 2001 From: Danny Vargas Date: Wed, 23 Apr 2014 15:20:45 -0400 Subject: [PATCH 2/2] =?UTF-8?q?Release=20v2.6.0=20r426=20=CE=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Changelog.txt | 7 +++++++ Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs | 2 +- resources/Version.xml | 6 +++--- resources/translations/ShipTypes.xml | 7 ++++++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index ef99d2f90..11f0f2598 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -2,6 +2,13 @@ KCV Change Log ======================== +v2.6.0 β r426 - 4/23/2014 The Spring Time Youth + * Direct fix from the main man himself, @Grabacr07. + * Back end - All it was is just file name changes and a few additional packets. +The following has changed from how things worked previously: + * **Fatigue values only update when you advance or withdraw from battle, not after battle.** + * Rearrangement of the fleets will only update when you return to homeport (main menu). + v2.5.0 r420 - 4/22/2014 The Spring Event Note: Setting have been reset with this version! Please review them. * *New* Custom sound alerts. Works on all versions of windows. Will randomly pick diff --git a/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs b/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs index 835f77eed..1a5dec451 100644 --- a/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs +++ b/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs @@ -51,4 +51,4 @@ // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を // 既定値にすることができます: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.6.0.0")] +[assembly: AssemblyVersion("2.6.0.426")] diff --git a/resources/Version.xml b/resources/Version.xml index f467492b2..f964fa908 100644 --- a/resources/Version.xml +++ b/resources/Version.xml @@ -2,8 +2,8 @@ App - 2.5.0.420 - https://github.com/Zharay/KanColleViewer/releases/tag/v2.5.0r420 + 2.6.0.426 + https://github.com/Zharay/KanColleViewer/releases/tag/v2.6.0r426 Equipment @@ -27,7 +27,7 @@ ShipTypes - 1.0.2 + 1.0.3 https://raw.github.com/Zharay/KanColleViewer/master/resources/translations/ShipTypes.xml diff --git a/resources/translations/ShipTypes.xml b/resources/translations/ShipTypes.xml index 5989b8013..315c5ae57 100644 --- a/resources/translations/ShipTypes.xml +++ b/resources/translations/ShipTypes.xml @@ -1,5 +1,5 @@  - + 1 海防艦 @@ -90,4 +90,9 @@ 装甲空母 CVB + + 19 + 工作艦 + AR + \ No newline at end of file