・未対応マップ表示対応

・難易度未選択表示対応
・リファクタリング

EventMapHpViewer/EventMapHpViewer.cs

@@ -1,4 +1,6 @@
 using System.ComponentModel.Composition;
+using EventMapHpViewer.Models;
+using EventMapHpViewer.ViewModels;
 using Grabacr07.KanColleViewer.Composition;
 
 namespace EventMapHpViewer

EventMapHpViewer/EventMapHpViewer.csproj

@@ -63,14 +63,17 @@
       <HintPath>..\packages\LivetCask.1.1.0.0\lib\net45\Livet.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="MetroRadiance, Version=0.1.0.18891, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>KanColleViewerAssemblies\MetroRadiance.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="MetroRadiance">
+      <HintPath>..\packages\MetroRadiance.1.0.16\lib\net45\MetroRadiance.dll</HintPath>
+    </Reference>
+    <Reference Include="MetroRadiance.Chrome">
+      <HintPath>..\packages\MetroRadiance.Chrome.1.0.0\lib\net45\MetroRadiance.Chrome.dll</HintPath>
+    </Reference>
+    <Reference Include="MetroRadiance.Core">
+      <HintPath>..\packages\MetroRadiance.Core.1.0.0\lib\net45\MetroRadiance.Core.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Expression.Interactions, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\LivetCask.1.1.0.0\lib\net45\Microsoft.Expression.Interactions.dll</HintPath>
-      <Private>False</Private>
+      <HintPath>..\packages\MetroRadiance.1.0.16\lib\net45\Microsoft.Expression.Interactions.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -93,8 +96,7 @@
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\LivetCask.1.1.0.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
-      <Private>False</Private>
+      <HintPath>..\packages\MetroRadiance.1.0.16\lib\net45\System.Windows.Interactivity.dll</HintPath>
     </Reference>
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq" />
@@ -106,14 +108,17 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="EventMapHpViewer.cs" />
-    <Compile Include="MapInfo.cs" />
-    <Compile Include="MapInfoProxy.cs" />
-    <Compile Include="MapInfoViewModel.cs" />
+    <Compile Include="Models\MapInfos.cs" />
+    <Compile Include="Models\MapInfoProxy.cs" />
+    <Compile Include="Models\Raw\Api_Eventmap.cs" />
+    <Compile Include="Models\Raw\member_mapinfo.cs" />
+    <Compile Include="Models\Raw\map_start_next.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ToolView.xaml.cs">
       <DependentUpon>ToolView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="ToolViewModel.cs" />
+    <Compile Include="ViewModels\MapInfoViewModel.cs" />
+    <Compile Include="ViewModels\ToolViewModel.cs" />
   </ItemGroup>
   <ItemGroup>
     <Page Include="ToolView.xaml">
@@ -133,7 +138,6 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="KanColleViewerAssemblies\Desktop.Metro.dll" />
-    <Content Include="KanColleViewerAssemblies\MetroRadiance.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />