Merged develop into master

amatukaze · Jul 16, 2016 · 307aa9d · 307aa9d
2 parents c8b461f + b91b4c1
commit 307aa9d
Show file tree

Hide file tree

Showing 12 changed files with 51 additions and 33 deletions.
diff --git a/HeavenlyWind.Base/HeavenlyWind.Base.csproj b/HeavenlyWind.Base/HeavenlyWind.Base.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sakuno.KanColle.Amatsukaze</RootNamespace>
     <AssemblyName>HeavenlyWind.Base</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>

diff --git a/HeavenlyWind.Base/ProductInfo.cs b/HeavenlyWind.Base/ProductInfo.cs
@@ -5,7 +5,7 @@ public static class ProductInfo
         public const string AppName = "いんてりじぇんと連装砲くん";
         public const string ProductName = "Intelligent Naval Gun";
 
-        public const string AssemblyVersionString = "0.1.11.1";
+        public const string AssemblyVersionString = "0.1.11.2";
 
         public static string Version => AssemblyVersionString;
         public static string ReleaseCodeName => "Kraken";

diff --git a/HeavenlyWind.Extensibility/HeavenlyWind.Extensibility.csproj b/HeavenlyWind.Extensibility/HeavenlyWind.Extensibility.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sakuno.KanColle.Amatsukaze.Extensibility</RootNamespace>
     <AssemblyName>HeavenlyWind.Extensibility</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>

diff --git a/HeavenlyWind.Game/HeavenlyWind.Game.csproj b/HeavenlyWind.Game/HeavenlyWind.Game.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sakuno.KanColle.Amatsukaze.Game</RootNamespace>
     <AssemblyName>HeavenlyWind.Game</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -44,7 +44,7 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.SQLite, Version=1.0.102.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Data.SQLite.Core.1.0.102.0\lib\net46\System.Data.SQLite.dll</HintPath>
+      <HintPath>..\packages\System.Data.SQLite.Core.1.0.102.0\lib\net45\System.Data.SQLite.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -313,6 +313,7 @@
     <Compile Include="Proxy\SessionHeader.cs" />
     <Compile Include="QuestManager.cs" />
     <Compile Include="Services\CacheService.cs" />
+    <Compile Include="Services\DataService.cs" />
     <Compile Include="Services\EnemyEncounterService.cs" />
     <Compile Include="Services\MapService.cs" />
     <Compile Include="Services\Quest\Functions\ConstantFunction.cs" />
@@ -384,12 +385,12 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets')" />
+  <Import Project="..\packages\System.Data.SQLite.Core.1.0.102.0\build\net45\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.102.0\build\net45\System.Data.SQLite.Core.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>このプロジェクトは、このコンピューター上にない NuGet パッケージを参照しています。それらのパッケージをダウンロードするには、[NuGet パッケージの復元] を使用します。詳細については、http://go.microsoft.com/fwlink/?LinkID=322105 を参照してください。見つからないファイルは {0} です。</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets'))" />
+    <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.102.0\build\net45\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.102.0\build\net45\System.Data.SQLite.Core.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/HeavenlyWind.Game/Services/DataService.cs b/HeavenlyWind.Game/Services/DataService.cs
@@ -0,0 +1,13 @@
+using System.IO;
+
+namespace Sakuno.KanColle.Amatsukaze.Game.Services
+{
+    public class DataService
+    {
+        public static DataService Instance { get; } = new DataService();
+
+        DataService() { }
+
+        public string GetDataDirectory() => Path.Combine(Path.GetDirectoryName(typeof(DataService).Assembly.Location), "Data");
+    }
+}
diff --git a/HeavenlyWind.Game/packages.config b/HeavenlyWind.Game/packages.config
@@ -7,5 +7,5 @@
   <package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Main" version="2.2.5" targetFramework="net45" />
   <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
-  <package id="System.Data.SQLite.Core" version="1.0.102.0" targetFramework="net461" />
+  <package id="System.Data.SQLite.Core" version="1.0.102.0" targetFramework="net45" />
 </packages>
diff --git a/HeavenlyWind/App.config b/HeavenlyWind/App.config
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
-    </startup>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+  </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>

diff --git a/HeavenlyWind/HeavenlyWind.csproj b/HeavenlyWind/HeavenlyWind.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sakuno.KanColle.Amatsukaze</RootNamespace>
     <AssemblyName>HeavenlyWind</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
@@ -45,7 +45,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Expression.Interactions, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Expression.Interaction.3.0.40218.0\lib\net46\Microsoft.Expression.Interactions.dll</HintPath>
+      <HintPath>..\packages\Expression.Interaction.3.0.40218.0\lib\net45\Microsoft.Expression.Interactions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -60,7 +60,7 @@
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.SQLite, Version=1.0.102.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Data.SQLite.Core.1.0.102.0\lib\net46\System.Data.SQLite.dll</HintPath>
+      <HintPath>..\packages\System.Data.SQLite.Core.1.0.102.0\lib\net45\System.Data.SQLite.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Drawing" />
@@ -87,7 +87,7 @@
     </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Expression.Interaction.3.0.40218.0\lib\net46\System.Windows.Interactivity.dll</HintPath>
+      <HintPath>..\packages\Expression.Interaction.3.0.40218.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml" />
@@ -436,14 +436,14 @@
       <Project>{9263590f-63a1-4586-b478-a12d7d67b622}</Project>
       <Name>HeavenlyWind.Game</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Library\Sakuno.Base\Sakuno.Base.csproj">
-      <Project>{85fe16eb-f999-445c-872e-b8181c67031c}</Project>
-      <Name>Sakuno.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Library\Sakuno.SystemInterop\Sakuno.SystemInterop.csproj">
-      <Project>{3cd66841-054e-409b-8653-f846216061aa}</Project>
-      <Name>Sakuno.SystemInterop</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\Library\Sakuno.Base\Sakuno.Base.csproj"> 
+      <Project>{85fe16eb-f999-445c-872e-b8181c67031c}</Project> 
+      <Name>Sakuno.Base</Name> 
+    </ProjectReference> 
+    <ProjectReference Include="..\Library\Sakuno.SystemInterop\Sakuno.SystemInterop.csproj"> 
+      <Project>{3cd66841-054e-409b-8653-f846216061aa}</Project> 
+      <Name>Sakuno.SystemInterop</Name> 
+    </ProjectReference> 
     <ProjectReference Include="..\Library\Sakuno.UserInterface\Sakuno.UserInterface.csproj">
       <Project>{dba4b269-e3ec-43be-83e6-ee9dedfa21f8}</Project>
       <Name>Sakuno.UserInterface</Name>
@@ -995,12 +995,12 @@
     <PreBuildEvent>IF NOT EXIST "$(SolutionDir)Resources" exit
 xcopy /Y /E /I "$(SolutionDir)Resources" "$(TargetDir)Resources"</PreBuildEvent>
   </PropertyGroup>
-  <Import Project="..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets')" />
+  <Import Project="..\packages\System.Data.SQLite.Core.1.0.102.0\build\net45\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.102.0\build\net45\System.Data.SQLite.Core.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>このプロジェクトは、このコンピューター上にない NuGet パッケージを参照しています。それらのパッケージをダウンロードするには、[NuGet パッケージの復元] を使用します。詳細については、http://go.microsoft.com/fwlink/?LinkID=322105 を参照してください。見つからないファイルは {0} です。</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets'))" />
+    <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.102.0\build\net45\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.102.0\build\net45\System.Data.SQLite.Core.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/HeavenlyWind/Views/Game/Overview.xaml b/HeavenlyWind/Views/Game/Overview.xaml
@@ -113,17 +113,17 @@
                                                 </StackPanel>
                                             </Grid>
 
-                                            <rvg:FleetsAndAirBase />
+                                            <rvg:FleetsAndAirBase Margin="0, 8, 0, 0" />
                                         </StackPanel>
 
                                         <StackPanel Grid.Column="2">
-                                            <rvg:DockOverview Margin="0, 0, 0, 8" />
+                                            <rvg:DockOverview />
 
-                                            <Border Style="{StaticResource PanelBorderStyle}">
+                                            <Border Style="{StaticResource PanelBorderStyle}" Margin="0, 8, 0, 0">
                                                 <rvg:FleetOverview />
                                             </Border>
 
-                                            <Border Style="{StaticResource PanelBorderStyle}" >
+                                            <Border Style="{StaticResource PanelBorderStyle}" Margin="0, 0, 0, 8">
                                                 <rvg:ActiveQuestsOverview />
                                             </Border>
                                         </StackPanel>

diff --git a/HeavenlyWind/packages.config b/HeavenlyWind/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Expression.Interaction" version="3.0.40218.0" targetFramework="net461" />
+  <package id="Expression.Interaction" version="3.0.40218.0" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
   <package id="Rx-Core" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
@@ -10,5 +10,5 @@
   <package id="Rx-WPF" version="2.2.5" targetFramework="net45" />
   <package id="Rx-XAML" version="2.2.5" targetFramework="net45" />
   <package id="Sakuno.Toast" version="1.0.0.0" targetFramework="net45" />
-  <package id="System.Data.SQLite.Core" version="1.0.102.0" targetFramework="net461" />
+  <package id="System.Data.SQLite.Core" version="1.0.102.0" targetFramework="net45" />
 </packages>
diff --git a/Library b/Library
diff --git a/Resources/Strings/SimplifiedChinese/Main.xml b/Resources/Strings/SimplifiedChinese/Main.xml
@@ -298,7 +298,7 @@
   <String Key="Window_EquipmentOverview">装备一览</String>
   <String Key="Window_ConstructionHistory">建造历史</String>
   <String Key="Window_DevelopmentHistory">开发历史</String>
-  <String Key="Window_SortieHistory">出击历史</String>
+  <String Key="Window_SortieHistory">出击・掉落历史</String>
   <String Key="Window_ExpeditionHistory">远征历史</String>
   <String Key="Window_ScrappingHistory">解体・废弃历史</String>
   <String Key="Window_ResourceHistory">资源历史</String>