v4.2.12 rev17

CirnoV · Aug 20, 2018 · dde4d19 · dde4d19
2 parents fc284cb + 95f8dad
commit dde4d19
Show file tree

Hide file tree

Showing 36 changed files with 481 additions and 666 deletions.
diff --git a/source/Grabacr07.KanColleViewer.QuestTracker/Models/Tracker/DefaultTracker.cs b/source/Grabacr07.KanColleViewer.QuestTracker/Models/Tracker/DefaultTracker.cs
@@ -59,8 +59,6 @@ protected virtual int Progress80
 			}
 		}
 
-		private QuestProgressType lastProgress = QuestProgressType.None;
-
 		public DefaultTracker()
 		{
 			this.Datas = new TrackingValue[0];
@@ -147,25 +145,31 @@ public override void SetRawDatas(int[] data)
 		private void CheckOverUnder(QuestProgressType progress)
 		{
 			if (this.Datas.Length != 1) return;
-			if (lastProgress == progress) return;
-			lastProgress = progress;
 
-			int Current = this.Datas[0].Current;
-			int Maximum = this.Datas[0].Maximum;
-			int cut50 = this.Progress50, cut80 = this.Progress80;
+			var Current = this.Datas[0].Current;
+			var Maximum = this.Datas[0].Maximum;
+			var cut50 = this.Progress50;
+			var cut80 = this.Progress80;
 
 			switch (progress)
 			{
 				case QuestProgressType.None:
-					if (Current >= cut50) Current = cut50 - 1;
+					if (Current >= cut50)
+						Current = cut50 - 1;
 					break;
 				case QuestProgressType.Progress50:
-					if (Current >= cut80) Current = cut80 - 1;
-					if (Current < cut50) Current = cut50;
+					if (Current >= cut80)
+						Current = cut80 - 1;
+
+					if (Current < cut50)
+						Current = cut50;
 					break;
 				case QuestProgressType.Progress80:
-					if (Current >= Maximum) Current = Maximum - 1;
-					if (Current < cut80) Current = cut80;
+					if (Current >= Maximum)
+						Current = Maximum - 1;
+
+					if (Current < cut80)
+						Current = cut80;
 					break;
 				case QuestProgressType.Complete:
 					Current = Maximum;

diff --git a/source/Grabacr07.KanColleViewer.QuestTracker/Properties/AssemblyInfo.cs b/source/Grabacr07.KanColleViewer.QuestTracker/Properties/AssemblyInfo.cs
@@ -10,5 +10,5 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("039E4D88-DECD-494D-92D2-407C6403A010")]
 
-[assembly: AssemblyVersion("1.2.1")]
-[assembly: AssemblyInformationalVersion("1.2.1")]
+[assembly: AssemblyVersion("1.2.2")]
+[assembly: AssemblyInformationalVersion("1.2.2")]
diff --git a/source/Grabacr07.KanColleViewer.QuestTracker/TrackManager.cs b/source/Grabacr07.KanColleViewer.QuestTracker/TrackManager.cs
@@ -102,6 +102,8 @@ public TrackManager(Func<bool> PreprocessCheck, Func<string> KcaQSync_Pass)
 						y =>
 						{
 							var result = DynamicJson.Parse(y);
+							if (result.status.ToString() == "error") return;
+
 							ApplySyncData(
 								result.data.ToString() as string,
 								Convert.ToInt64(result.timestamp.ToString() as string)

diff --git a/source/Grabacr07.KanColleViewer/App.config b/source/Grabacr07.KanColleViewer/App.config
@@ -22,12 +22,6 @@
             <setting name="FeatureBrowserEmulation" serializeAs="String">
                 <value>11000</value>
             </setting>
-            <setting name="KCVUpdateUrl" serializeAs="String">
-                <value>https://raw.github.com/CirnoV/KCVKrTranslation/master/resources/Version.xml</value>
-            </setting>
-            <setting name="XMLTransUrl" serializeAs="String">
-                <value>https://raw.github.com/CirnoV/KCVKrTranslation/master/resources/Translations/</value>
-            </setting>
             <setting name="OverrideStyleSheet" serializeAs="String">
                 <value>body {
     margin:0;
@@ -38,7 +32,7 @@
     position:fixed;
     left:50%;
     top:-16px;
-    margin-left:-600px;
+    margin-left:-450px;
     z-index:1
 }
 
@@ -48,6 +42,12 @@
     display:none!important;
 }</value>
             </setting>
+            <setting name="KCVUpdateUrl" serializeAs="String">
+                <value>https://raw.github.com/CirnoV/KCVKrTranslation/master/resources/Version.xml</value>
+            </setting>
+            <setting name="XMLTransUrl" serializeAs="String">
+                <value>https://raw.github.com/CirnoV/KCVKrTranslation/master/resources/Translations/</value>
+            </setting>
             <setting name="SallyAreaSource" serializeAs="String">
                 <value>http://kctadil.devcussion.net/viewer/sally.json</value>
             </setting>

diff --git a/source/Grabacr07.KanColleViewer/Application.xaml.cs b/source/Grabacr07.KanColleViewer/Application.xaml.cs
@@ -147,9 +147,12 @@ protected override void OnStartup(StartupEventArgs e)
 				GCWorker.Current.AddTo(this).Startup();
 
 				// WebBrowser 컨트롤 IE 버전 레지스트리 패치, MMCSS 설정
-				// Helper.SetRegistryFeatureBrowserEmulation();
+				Helper.SetRegistryFeatureBrowserEmulation();
 				if (GeneralSettings.MMCSSEnabled) Helper.SetMMCSSTask();
 
+				// CEF 제거 마이그레이션
+				Models.Migration.cef_Migration.Migration();
+
 				// 번역 여부
 				KanColleClient.Current.Translations.EnableTranslations = KanColleSettings.EnableTranslations;
 				KanColleClient.Current.Translations.EnableAddUntranslated = KanColleSettings.EnableAddUntranslated;

diff --git a/source/Grabacr07.KanColleViewer/KanColleViewer.csproj b/source/Grabacr07.KanColleViewer/KanColleViewer.csproj
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\CefSharp.Wpf.65.0.1\build\CefSharp.Wpf.props" Condition="Exists('..\packages\CefSharp.Wpf.65.0.1\build\CefSharp.Wpf.props')" />
-  <Import Project="..\packages\CefSharp.Common.65.0.1\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.65.0.1\build\CefSharp.Common.props')" />
-  <Import Project="..\packages\cef.redist.x86.3.3325.1758\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.3.3325.1758\build\cef.redist.x86.props')" />
-  <Import Project="..\packages\cef.redist.x64.3.3325.1758\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.3.3325.1758\build\cef.redist.x64.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <CefSharpAnyCpuSupport>true</CefSharpAnyCpuSupport>
     <ProjectGuid>{C5F0111F-3F68-4A74-BB20-BB762564D080}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -46,8 +41,6 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -58,7 +51,7 @@
     <DefineConstants>TRACE;DEBUG;BETA</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>true</Prefer32Bit>
+    <Prefer32Bit>false</Prefer32Bit>
     <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -69,7 +62,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>true</Prefer32Bit>
+    <Prefer32Bit>false</Prefer32Bit>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup>
@@ -85,34 +78,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;BETA</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release %28beta%29|x64'">
-    <OutputPath>bin\x64\Release %28beta%29\</OutputPath>
-    <DefineConstants>TRACE;BETA</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Livet, Version=1.3.0.0, Culture=neutral, PublicKeyToken=b0b1d3f711ef38cb, processorArchitecture=MSIL">
       <HintPath>..\packages\LivetCask.1.3.1.0\lib\net45\Livet.dll</HintPath>
@@ -136,6 +101,9 @@
     <Reference Include="Microsoft.mshtml, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
+    <Reference Include="NAudio, Version=1.8.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\NAudio.1.8.4\lib\net35\NAudio.dll</HintPath>
+    </Reference>
     <Reference Include="Nekoxy, Version=1.5.3.21, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Nekoxy.1.5.3.21\lib\net45\Nekoxy.dll</HintPath>
     </Reference>
@@ -204,17 +172,16 @@
     <Compile Include="Composition\PluginMetadata.cs" />
     <Compile Include="Models\AkashiTimer.cs" />
     <Compile Include="Models\BrowserZoomFactor.cs" />
-    <Compile Include="Models\Cef\ChromiumWebBrowserEx.cs" />
     <Compile Include="Models\ComboBoxItemTemplateSelector.cs" />
     <Compile Include="Models\CSV.cs" />
     <Compile Include="Models\ExitConfirmationType.cs" />
     <Compile Include="Models\ExpeditionResultData.cs" />
     <Compile Include="Models\ExpeditionPossible.cs" />
     <Compile Include="Models\ExpeditionExtension.cs" />
-    <Compile Include="Models\FlashQuality.cs" />
     <Compile Include="Models\GCWorker.cs" />
     <Compile Include="Models\HQRecord.cs" />
     <Compile Include="Models\IZoomFactor.cs" />
+    <Compile Include="Models\Migration\cef_Migration.cs" />
     <Compile Include="Models\NotifierHost.cs" />
     <Compile Include="Models\ProductInfo.cs" />
     <Compile Include="Models\Migration\_XmlFileReader.cs" />
@@ -240,7 +207,6 @@
     <Compile Include="Models\Migration\_Settings.cs" />
     <Compile Include="Models\SupportedImageFormat.cs" />
     <Compile Include="Models\TaskbarProgress.cs" />
-    <Compile Include="Models\Volume.cs" />
     <Compile Include="Models\Migration\_KanColleClientSettings.cs" />
     <Compile Include="ViewModels\AkashiTimerViewModel.cs" />
     <Compile Include="ViewModels\Catalogs\CalculatorViewModel.cs" />
@@ -870,15 +836,6 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Import Project="..\packages\CefSharp.Common.65.0.1\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.65.0.1\build\CefSharp.Common.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>이 프로젝트는 이 컴퓨터에 없는 NuGet 패키지를 참조합니다. 해당 패키지를 다운로드하려면 NuGet 패키지 복원을 사용하십시오. 자세한 내용은 http://go.microsoft.com/fwlink/?LinkID=322105를 참조하십시오. 누락된 파일은 {0}입니다.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\CefSharp.Wpf.65.0.1\build\CefSharp.Wpf.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Wpf.65.0.1\build\CefSharp.Wpf.props'))" />
-    <Error Condition="!Exists('..\packages\CefSharp.Wpf.65.0.1\build\CefSharp.Wpf.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Wpf.65.0.1\build\CefSharp.Wpf.targets'))" />
-  </Target>
-  <Import Project="..\packages\CefSharp.Wpf.65.0.1\build\CefSharp.Wpf.targets" Condition="Exists('..\packages\CefSharp.Wpf.65.0.1\build\CefSharp.Wpf.targets')" />
   <!-- 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.
   <Target Name="BeforeBuild">

diff --git a/source/Grabacr07.KanColleViewer/Models/FlashQuality.cs b/source/Grabacr07.KanColleViewer/Models/FlashQuality.cs