Skip to content

Commit

Permalink
Version 2.5.5
Browse files Browse the repository at this point in the history
* 艦隊:デッキビルダーへのコピーについて、3スロ以下の艦の補強スロット装備が正しく反映されない不具合を修正
  • Loading branch information
andanteyk committed Mar 28, 2017
1 parent f0187fe commit 96cd2e7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 11 deletions.
6 changes: 3 additions & 3 deletions ElectronicObserver/Utility/SoftwareInformation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public static string SoftwareNameEnglish {
/// </summary>
public static string VersionJapanese {
get {
return SoftwareNameJapanese + "二五型改四甲";
return SoftwareNameJapanese + "二五型改五";
}
}

Expand All @@ -44,7 +44,7 @@ public static string VersionJapanese {
/// </summary>
public static string VersionEnglish {
get {
return "2.5.4.1";
return "2.5.5";
}
}

Expand All @@ -54,7 +54,7 @@ public static string VersionEnglish {
/// </summary>
public static DateTime UpdateTime {
get {
return DateTimeHelper.CSVStringToTime( "2017/02/28 20:00:00" );
return DateTimeHelper.CSVStringToTime( "2017/03/29 00:00:00" );
}
}

Expand Down
9 changes: 2 additions & 7 deletions ElectronicObserver/Window/FormFleet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -918,16 +918,11 @@ private void ContextMenuFleet_CopyFleetDeckBuilder_Click( object sender, EventAr
ship.Level,
ship.LuckBase );

if ( ship.ExpansionSlot <= 0 )
sb.Append( @"""ix"":{}," );
else
sb.AppendFormat( @"""ix"":{{""id"":{0}}},", ship.ExpansionSlotMaster );

int eqcount = 1;
foreach ( var eq in ship.SlotInstance ) {
foreach ( var eq in ship.AllSlotInstance.Where( eq => eq != null ) ) {
if ( eq == null ) break;

sb.AppendFormat( @"""i{0}"":{{""id"":{1},""rf"":{2},""mas"":{3}}},", eqcount, eq.EquipmentID, eq.Level, eq.AircraftLevel );
sb.AppendFormat( @"""i{0}"":{{""id"":{1},""rf"":{2},""mas"":{3}}},", eqcount >= 5 ? "x" : eqcount.ToString(), eq.EquipmentID, eq.Level, eq.AircraftLevel );

eqcount++;
}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

*このリンクの更新は遅れる可能性があります。最新版は[こちら](http://electronicobserver.blog.fc2.com/)で確認してください。*

[ver. 2.5.4.1 (2017/02/28)](http://bit.ly/2l7F1Pn)
[ver. 2.5.5 (2017/03/29)](http://bit.ly/2o7pccw)

[更新内容・履歴はこちらで確認できます。](https://github.com/andanteyk/ElectronicObserver/wiki/ChangeLog)

Expand Down

0 comments on commit 96cd2e7

Please sign in to comment.