Merge branch 'develop'

andanteyk · May 1, 2015 · 7071af5 · 7071af5
2 parents 470a95f + 3237a4c
commit 7071af5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 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 "1.2.3";
+				return "1.2.3.1";
 			}
 		}
 
@@ -54,7 +54,7 @@ public static string VersionEnglish {
 		/// </summary>
 		public static DateTime UpdateTime {
 			get {
-				return DateTimeHelper.CSVStringToTime( "2015/05/01 21:00:00" );
+				return DateTimeHelper.CSVStringToTime( "2015/05/01 23:00:00" );
 			}
 		}
 

diff --git a/ElectronicObserver/Window/Dialog/DialogVersion.Designer.cs b/ElectronicObserver/Window/Dialog/DialogVersion.Designer.cs
diff --git a/ElectronicObserver/Window/FormBattle.cs b/ElectronicObserver/Window/FormBattle.cs
@@ -205,7 +205,7 @@ private void Updated( string apiname, dynamic data ) {
 				case "api_req_combined_battle/midnight_battle": {
 						int[] hp = bm.BattleNight.EmulateBattle();
 
-						SetNightBattleEvent( bm.BattleNight.InitialHP.Skip( 1 ).ToArray(), true, bm.BattleNight );
+						SetNightBattleEvent( bm.BattleNight.InitialHP.Skip( 1 ).Concat( ( (BattleDataCombined)bm.BattleNight ).InitialHPCombined.Skip( 1 ) ).ToArray(), true, bm.BattleNight );
 						SetHPCombined( hp, bm.BattleNight );
 						SetDamageRateCombined( hp, bm.BattleDay );
 
@@ -218,7 +218,7 @@ private void Updated( string apiname, dynamic data ) {
 						SetFormation( bm.BattleNight );
 						ClearAerialWarfare();
 						ClearSearchingResult();
-						SetNightBattleEvent( bm.BattleNight.InitialHP.Skip( 1 ).ToArray(), true, bm.BattleNight );
+						SetNightBattleEvent( bm.BattleNight.InitialHP.Skip( 1 ).Concat( ( (BattleDataCombined)bm.BattleNight ).InitialHPCombined.Skip( 1 ) ).ToArray(), true, bm.BattleNight );
 						SetHPCombined( hp, bm.BattleNight );
 						SetDamageRateCombined( hp, bm.BattleNight );