Skip to content

Commit

Permalink
Merge upstream changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Yuubari
Yuubari committed Jul 6, 2016
2 parents 2d98c20 + f7fc8a6 commit 958c474
Show file tree
Hide file tree
Showing 33 changed files with 401 additions and 269 deletions.
36 changes: 18 additions & 18 deletions source/Grabacr07.KanColleViewer/KanColleViewer.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand Down Expand Up @@ -85,8 +86,8 @@
<HintPath>..\packages\Nekoxy.1.5.2.20\lib\net45\Nekoxy.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="StatefulModel, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\StatefulModel.0.5.0\lib\portable-net45+win+wp80+MonoAndroid10+xamarinios10+MonoTouch10\StatefulModel.dll</HintPath>
<Reference Include="StatefulModel">
<HintPath>..\packages\StatefulModel.0.6.0\lib\portable-net45+win+wp80+MonoAndroid10+xamarinios10+MonoTouch10\StatefulModel.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down Expand Up @@ -627,6 +628,21 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<None Include="readme.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\..\LICENSE.txt">
<Visible>False</Visible>
<Link>license.txt</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\..\licenses\*.*">
<Visible>False</Visible>
<Link>Licenses\%(FileName)%(Extension)</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<COMReference Include="MSHTML">
<Guid>{3050F1C5-98B5-11CF-BB82-00AA00BDCE0B}</Guid>
Expand All @@ -647,22 +663,6 @@
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
</ItemGroup>
<ItemGroup>
<None Include="readme.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\..\LICENSE.txt">
<Visible>False</Visible>
<Link>license.txt</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\..\licenses\*.*">
<Visible>False</Visible>
<Link>Licenses\%(FileName)%(Extension)</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
2 changes: 1 addition & 1 deletion source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
ResourceDictionaryLocation.None,
ResourceDictionaryLocation.SourceAssembly)]

[assembly: AssemblyVersion("4.2.5.0")]
[assembly: AssemblyVersion("4.2.7.0")]
36 changes: 36 additions & 0 deletions source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions source/Grabacr07.KanColleViewer/Properties/Resources.en.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1459,4 +1459,16 @@ Small Radar LoS × (1.00) + Large Radar LoS × (0.99) +
<data name="ShipCatalog_Filter_Misc_ConditionBelow50" xml:space="preserve">
<value>Below 50</value>
</data>
<data name="Settings_Operation_LoS_UseFleets" xml:space="preserve">
<value>In a combined fleet setting, use these fleets to calculate LoS:</value>
</data>
<data name="Settings_Operation_LoS_UseFleets_Fleet1" xml:space="preserve">
<value>Fleet #1</value>
</data>
<data name="Settings_Operation_LoS_UseFleets_Fleet2" xml:space="preserve">
<value>Fleet #2</value>
</data>
<data name="ShipCatalog_Column_ASW_Tooltip" xml:space="preserve">
<value>Includes stat bonuses from the equipment</value>
</data>
</root>
12 changes: 12 additions & 0 deletions source/Grabacr07.KanColleViewer/Properties/Resources.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1463,4 +1463,16 @@ HTTP プロトコルの通信は自動構成も含め「インターネット
<data name="ShipCatalog_Filter_Misc_ConditionBelow50" xml:space="preserve">
<value>50 未満</value>
</data>
<data name="Settings_Operation_LoS_UseFleets" xml:space="preserve">
<value>連合艦隊時、以下の艦隊を索敵値計算の対象として使用する</value>
</data>
<data name="Settings_Operation_LoS_UseFleets_Fleet1" xml:space="preserve">
<value>第1艦隊</value>
</data>
<data name="Settings_Operation_LoS_UseFleets_Fleet2" xml:space="preserve">
<value>第2艦隊</value>
</data>
<data name="ShipCatalog_Column_ASW_Tooltip" xml:space="preserve">
<value>装備によるステータス上昇を含んだ値です</value>
</data>
</root>
2 changes: 2 additions & 0 deletions source/Grabacr07.KanColleViewer/ViewModels/Catalogs/ShipCatalogSortWorker.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public class ShipCatalogSortWorker : ViewModel
public static readonly SortableColumn ViewRangeColumn = new SortableColumn { Name = Resources.ShipCatalog_Column_ViewRange, KeySelector = x => x.ViewRange, DefaultIsDescending = true, };
public static readonly SortableColumn EvasionColumn = new SortableColumn { Name = Resources.ShipCatalog_Column_Evasion, KeySelector = x => x.Evasion.Current, DefaultIsDescending = true, };
public static readonly SortableColumn AntiSubColumn = new SortableColumn { Name = Resources.ShipCatalog_Column_ASW, KeySelector = x => x.AntiSub.Current, DefaultIsDescending = true, };
/* public static readonly SortableColumn ASWColumn = new SortableColumn { Name = Resources.ShipCatalog_Column_ASW, KeySelector = x => x.ASW, DefaultIsDescending = true, }; */
public static readonly SortableColumn TimeToRepairColumn = new SortableColumn { Name = Resources.ShipCatalog_Column_TTR, KeySelector = x => x.TimeToRepair.Ticks, DefaultIsDescending = true, };

public static SortableColumn[] Columns { get; set; }
Expand All @@ -55,6 +56,7 @@ static ShipCatalogSortWorker()
ViewRangeColumn,
EvasionColumn,
AntiSubColumn,
/* ASWColumn, */
TimeToRepairColumn,
};
}
Expand Down
2 changes: 1 addition & 1 deletion source/Grabacr07.KanColleViewer/ViewModels/Catalogs/SlotItemCatalogViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ private static List<SlotItemCounter> UpdateCore()
{
foreach (var target in ship.EquippedItems.Select(slot => new { slot, counter = dic[slot.Item.Info.Id] }))
{
target.counter.AddShip(ship, target.slot.Item.Level, target.slot.Item.Adept);
target.counter.AddShip(ship, target.slot.Item.Level, target.slot.Item.Proficiency);
}
}

Expand Down
2 changes: 1 addition & 1 deletion source/Grabacr07.KanColleViewer/ViewModels/Catalogs/SlotItemCounter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public SlotItemCounter(SlotItemInfo target, IEnumerable<SlotItem> items)
this.Target = target;

this.itemsByLevel = items
.GroupBy(x => new SlotItemCounterKey(x.Level, x.Adept))
.GroupBy(x => new SlotItemCounterKey(x.Level, x.Proficiency))
.ToDictionary(
x => x.Key,
x => new SlotItemCounterByLevel { CounterKey = x.Key, Count = x.Count(), }
Expand Down
4 changes: 1 addition & 3 deletions source/Grabacr07.KanColleViewer/ViewModels/Contents/Fleets/FleetStateViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ public class FleetStateViewModel : ViewModel

public string TotalLevel => this.Source.TotalLevel.ToString("###0");

public string AirSuperiorityPotential => this.Source.AirSuperiorityPotential.ToString("##0");

public string MinAirSuperiorityPotential => this.Source.MinAirSuperiorityPotential.ToString("##0");

public string MaxAirSuperiorityPotential => this.Source.MaxAirSuperiorityPotential.ToString("##0");

public string ViewRange => this.Source.ViewRange.ToString("##0.##");
public string ViewRange => (Math.Floor(this.Source.ViewRange * 100) / 100).ToString("##0.##");

public string Speed
{
Expand Down
17 changes: 17 additions & 0 deletions source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -877,6 +877,23 @@
</controls:CollapsibleGridViewColumn.CellTemplate>
</controls:CollapsibleGridViewColumn>

<!-- <GridViewColumn Width="45">
<GridViewColumn.Header>
<metro2:SortButton MethodName="Sort"
MethodParameter="{x:Static viewModels:ShipCatalogSortWorker.ASWColumn}">
<TextBlock Text="{Binding Resources.ShipCatalog_Column_ASW, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
ToolTip="{Binding Resources.ShipCatalog_Column_ASW_Tooltip, Source={x:Static models:ResourceService.Current}, Mode=OneWay}" />
</metro2:SortButton>
</GridViewColumn.Header>
<GridViewColumn.CellTemplate>
<DataTemplate>
<TextBlock Text="{Binding Ship.ASW, Mode=OneWay}"
Foreground="{DynamicResource ActiveForegroundBrushKey}"
Margin="0,3" />
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn> -->

<GridViewColumn Width="{Binding ShipSallyAreaFilter.ColumnWidth}">
<GridViewColumn.Header>
<TextBlock Text="{Binding Resources.ShipCatalog_SortieWaters, Source={x:Static models:ResourceService.Current}, Mode=OneWay}" />
Expand Down
6 changes: 3 additions & 3 deletions source/Grabacr07.KanColleViewer/Views/Settings/Operation.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,16 @@
Style="{DynamicResource DetailTextStyleKey}"/>


<TextBlock Text="連合艦隊時、以下の艦隊を索敵値計算の対象として使用する"
<TextBlock Text="{Binding Resources.Settings_Operation_LoS_UseFleets, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
Margin="0,12,0,5"
Visibility="{Binding SelectedViewRangeCalcType.HasCombinedSettings, Converter={StaticResource BooleanToVisibilityConverter}}"/>

<StackPanel Orientation="Horizontal"
Visibility="{Binding SelectedViewRangeCalcType.HasCombinedSettings, Converter={StaticResource BooleanToVisibilityConverter}}">
<CheckBox Content="第1艦隊"
<CheckBox Content="{Binding Resources.Settings_Operation_LoS_UseFleets_Fleet1, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
IsChecked="{Binding Source={x:Static ms:KanColleSettings.IsViewRangeCalcIncludeFirstFleet}, Path=Value}"
Margin="0,0,20,0"/>
<CheckBox Content="第2艦隊"
<CheckBox Content="{Binding Resources.Settings_Operation_LoS_UseFleets_Fleet2, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
IsChecked="{Binding Source={x:Static ms:KanColleSettings.IsViewRangeCalcIncludeSecondFleet}, Path=Value}"/>
</StackPanel>

Expand Down
2 changes: 1 addition & 1 deletion source/Grabacr07.KanColleViewer/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
<package id="Rx-WPF" version="2.2.5" targetFramework="net45" />
<package id="Rx-XAML" version="2.2.5" targetFramework="net45" />
<package id="StatefulModel" version="0.5.0" targetFramework="net46" />
<package id="StatefulModel" version="0.6.0" targetFramework="net46" />
</packages>
4 changes: 3 additions & 1 deletion source/Grabacr07.KanColleViewer/readme.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
提督業も忙しい！ (KanColleViewer)
version 4.2.1 2016/02/12
version 4.2.6 2016/06/20
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━


Expand Down Expand Up @@ -167,6 +167,8 @@ Desktop Toast

■更新履歴

2016/06/20 - version 4.2.6 リリース
(わすれました)
2016/02/12 - version 4.2.1 リリース
2016/02/08 - version 4.2 リリース
2015/11/10 - version 4.1.6 リリース
Expand Down
Loading

0 comments on commit 958c474

Please sign in to comment.