diff --git a/ElectronicObserver/Utility/FleetImageGenerator.cs b/ElectronicObserver/Utility/FleetImageGenerator.cs index c78d82393..c4323c4c9 100644 --- a/ElectronicObserver/Utility/FleetImageGenerator.cs +++ b/ElectronicObserver/Utility/FleetImageGenerator.cs @@ -781,6 +781,7 @@ public static Bitmap GenerateCutinBitmap( FleetImageArgument args ) { /// public static Bitmap GenerateBannerBitmap( FleetImageArgument args ) { + var formatTopLeft = GetStringFormat( ContentAlignment.TopLeft ); var formatMiddleLeft = GetStringFormat( ContentAlignment.MiddleLeft ); var formatMiddleCenter = GetStringFormat( ContentAlignment.MiddleCenter ); var formatMiddleRight = GetStringFormat( ContentAlignment.MiddleRight ); @@ -981,7 +982,10 @@ public static Bitmap GenerateBannerBitmap( FleetImageArgument args ) { //g.DrawString( string.Format( "#{0}:", shipIndex + 1 ), args.MediumDigitFont, subTextBrush, new Rectangle( shipPointer + GetAlignmentOffset( ContentAlignment.MiddleLeft, shipIndexSize, shipNameAreaSize ), shipIndexSize ), formatMiddleLeft ); //shipPointer.X += shipIndexSize.Width; - DrawShipSwfImage( g, ship.MasterShip.ResourceName, args.ReflectDamageGraphic && ship.HPRate <= 0.5 ? ShipBannerDamagedID : ShipBannerNormalID, shipPointer.X, shipPointer.Y, ShipBannerSize ); + if ( !DrawShipSwfImage( g, ship.MasterShip.ResourceName, args.ReflectDamageGraphic && ship.HPRate <= 0.5 ? ShipBannerDamagedID : ShipBannerNormalID, shipPointer.X, shipPointer.Y, ShipBannerSize ) ) { + // alternate drawing + g.DrawString( ship.Name, args.MediumFont, mainTextBrush, new RectangleF( shipPointer.X, shipPointer.Y, ShipBannerSize.Width, ShipBannerSize.Height ), formatTopLeft ); + } shipPointer.X += shipBannerSize.Width; g.DrawString( ship.Level.ToString(), args.SmallDigitFont, subTextBrush, new Rectangle( shipPointer, smallDigit3Size ), formatMiddleLeft ); diff --git a/ElectronicObserver/Utility/SoftwareInformation.cs b/ElectronicObserver/Utility/SoftwareInformation.cs index 0840a85ae..b70bc80c4 100644 --- a/ElectronicObserver/Utility/SoftwareInformation.cs +++ b/ElectronicObserver/Utility/SoftwareInformation.cs @@ -35,7 +35,7 @@ public static string SoftwareNameEnglish { /// public static string VersionJapanese { get { - return SoftwareNameJapanese + "二六型"; + return SoftwareNameJapanese + "二六型甲"; } } @@ -44,7 +44,7 @@ public static string VersionJapanese { /// public static string VersionEnglish { get { - return "2.6.0"; + return "2.6.0.1"; } } @@ -54,7 +54,7 @@ public static string VersionEnglish { /// public static DateTime UpdateTime { get { - return DateTimeHelper.CSVStringToTime( "2017/04/23 23:00:00" ); + return DateTimeHelper.CSVStringToTime( "2017/04/24 01:00:00" ); } } diff --git a/ElectronicObserver/Window/Dialog/DialogFleetImageGenerator.cs b/ElectronicObserver/Window/Dialog/DialogFleetImageGenerator.cs index 62d6cff1e..bef5b7307 100644 --- a/ElectronicObserver/Window/Dialog/DialogFleetImageGenerator.cs +++ b/ElectronicObserver/Window/Dialog/DialogFleetImageGenerator.cs @@ -386,7 +386,7 @@ private void UpdateButtonAlert() { bool visibility = false; - if ( !Utility.Configuration.Config.Connection.SaveSWF ) { + if ( !Utility.Configuration.Config.Connection.SaveReceivedData || !Utility.Configuration.Config.Connection.SaveSWF ) { visibility = true; ButtonAlert.Text = "艦船画像保存設定が無効です(詳細表示...)"; @@ -407,12 +407,16 @@ private void UpdateButtonAlert() { private void ButtonAlert_Click( object sender, EventArgs e ) { - if ( !Utility.Configuration.Config.Connection.SaveSWF ) { + if ( !Utility.Configuration.Config.Connection.SaveReceivedData || !Utility.Configuration.Config.Connection.SaveSWF ) { if ( MessageBox.Show( "編成画像を出力するためには、艦船画像を保存する設定を有効にする必要があります。\r\n有効にしますか?", - "艦船画像保存設定が無効です", MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation, MessageBoxDefaultButton.Button2 ) + "艦船画像保存設定が無効です", MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation, MessageBoxDefaultButton.Button1 ) == System.Windows.Forms.DialogResult.Yes ) { + if ( !Utility.Configuration.Config.Connection.SaveReceivedData ) { + Utility.Configuration.Config.Connection.SaveReceivedData = true; + Utility.Configuration.Config.Connection.SaveResponse = false; // もともと不要にしていたユーザーには res は邪魔なだけだと思うので + } Utility.Configuration.Config.Connection.SaveSWF = true; UpdateButtonAlert(); diff --git a/README.md b/README.md index d7f15bea0..7647bbe46 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ *このリンクの更新は遅れる可能性があります。最新版は[こちら](http://electronicobserver.blog.fc2.com/)で確認してください。* -[ver. 2.6.0 (2017/04/23)](http://bit.ly/2pTlkfz) +[ver. 2.6.0.1 (2017/04/24)](http://bit.ly/2oVUvGo) [更新内容・履歴はこちらで確認できます。](https://github.com/andanteyk/ElectronicObserver/wiki/ChangeLog)