Merge branch 'develop'

andanteyk · Aug 27, 2016 · 145817d · 145817d
2 parents b23b03d + 79677aa
commit 145817d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/ElectronicObserver/Utility/SoftwareInformation.cs b/ElectronicObserver/Utility/SoftwareInformation.cs
@@ -35,7 +35,7 @@ public static string SoftwareNameEnglish {
 		/// </summary>
 		public static string VersionJapanese {
 			get {
-				return SoftwareNameJapanese + "二四型";
+				return SoftwareNameJapanese + "二四型甲";
 			}
 		}
 
@@ -44,7 +44,7 @@ public static string VersionJapanese {
 		/// </summary>
 		public static string VersionEnglish {
 			get {
-				return "2.4.0";
+				return "2.4.0.1";
 			}
 		}
 
@@ -54,7 +54,7 @@ public static string VersionEnglish {
 		/// </summary>
 		public static DateTime UpdateTime {
 			get {
-				return DateTimeHelper.CSVStringToTime( "2016/08/27 13:00:00" );
+				return DateTimeHelper.CSVStringToTime( "2016/08/27 18:00:00" );
 			}
 		}
 

diff --git a/ElectronicObserver/Window/FormBattle.cs b/ElectronicObserver/Window/FormBattle.cs
@@ -817,8 +817,8 @@ private void SetHPNormal( BattleData bd ) {
 
 
 					} else if ( bd is BattleAirBattle ) {
-						var shipAirBattle1Detail = SelectBattleDetail( ( (BattleCombinedAirBattle)bd ).AirBattle.BattleDetails, i );
-						var shipAirBattle2Detail = SelectBattleDetail( ( (BattleCombinedAirBattle)bd ).AirBattle2.BattleDetails, i );
+						var shipAirBattle1Detail = SelectBattleDetail( ( (BattleAirBattle)bd ).AirBattle.BattleDetails, i );
+						var shipAirBattle2Detail = SelectBattleDetail( ( (BattleAirBattle)bd ).AirBattle2.BattleDetails, i );
 
 						if ( shipAirBattle1Detail.Any() ) {
 							builder.AppendLine( "《第一次航空戦》" );

diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@
 
 *このリンクの更新は遅れる可能性があります。最新版は[こちら](http://electronicobserver.blog.fc2.com/)で確認してください。*  
 
-[ver. 2.4.0 (2016/08/27)](http://bit.ly/2cgTqVx)  
+[ver. 2.4.0.1 (2016/08/27)](http://bit.ly/2bnTuCY)  
 
 [更新内容・履歴はこちらで確認できます。](https://github.com/andanteyk/ElectronicObserver/wiki/ChangeLog)