From da4b0c771a6563927d7c31f8dfdbfe72e6f7044b Mon Sep 17 00:00:00 2001 From: Huo Yaoyuan Date: Thu, 14 Dec 2017 00:09:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=A8=A1=E5=9D=97=E5=88=86?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AdmiralRoom.sln | 39 +------- .../API}/ranking_getlist.cs | 0 AdmiralRoom/AdmiralRoom.csproj | 46 +++++++++ .../Models}/ApiModel.cs | 5 +- .../Officer}/Akashi/AkashiData.tt | 2 +- .../Officer}/Akashi/AkashiData.txt | 0 .../Officer}/Akashi/AkashiData.xaml | 2 +- .../Officer}/Akashi/AkashiViewModel.cs | 5 +- .../Officer}/RankingViewModel.cs | 3 +- .../Officer/RawApi.cs | 11 +-- .../Views/Converter}/JsonConverter.cs | 2 +- .../Views}/RankingView.xaml | 6 +- .../Views}/RankingView.xaml.cs | 2 +- .../Views}/RawApiView.xaml | 9 +- .../Views}/RawApiView.xaml.cs | 2 +- .../Views/Standalone}/AkashiWindow.xaml | 6 +- .../Views/Standalone}/AkashiWindow.xaml.cs | 2 +- .../Views/Standalone}/MasterDataWindow.xaml | 7 +- .../Standalone}/MasterDataWindow.xaml.cs | 2 +- Modules/Akashi/Akashi.cs | 12 --- Modules/Akashi/Akashi.csproj | 95 ------------------- Modules/Akashi/Properties/AssemblyInfo.cs | 36 ------- Modules/MasterDataViewer/MasterDataViewer.cs | 12 --- .../MasterDataViewer/MasterDataViewer.csproj | 91 ------------------ .../Properties/AssemblyInfo.cs | 36 ------- Modules/Ranking/Properties/AssemblyInfo.cs | 36 ------- Modules/Ranking/Ranking.cs | 19 ---- Modules/Ranking/Ranking.csproj | 81 ---------------- .../RawApiViewer/Properties/AssemblyInfo.cs | 36 ------- Modules/RawApiViewer/RawApiViewer.cs | 13 --- Modules/RawApiViewer/RawApiViewer.csproj | 82 ---------------- 31 files changed, 81 insertions(+), 619 deletions(-) rename {Modules/Ranking => AdmiralRoom/API}/ranking_getlist.cs (100%) rename {Modules/RawApiViewer => AdmiralRoom/Models}/ApiModel.cs (77%) rename {Modules => AdmiralRoom/Officer}/Akashi/AkashiData.tt (97%) rename {Modules => AdmiralRoom/Officer}/Akashi/AkashiData.txt (100%) rename {Modules => AdmiralRoom/Officer}/Akashi/AkashiData.xaml (99%) rename {Modules => AdmiralRoom/Officer}/Akashi/AkashiViewModel.cs (94%) rename {Modules/Ranking => AdmiralRoom/Officer}/RankingViewModel.cs (99%) rename Modules/RawApiViewer/RawApiViewModel.cs => AdmiralRoom/Officer/RawApi.cs (87%) rename {Modules/RawApiViewer => AdmiralRoom/Views/Converter}/JsonConverter.cs (97%) rename {Modules/Ranking => AdmiralRoom/Views}/RankingView.xaml (92%) rename {Modules/Ranking => AdmiralRoom/Views}/RankingView.xaml.cs (94%) rename {Modules/RawApiViewer => AdmiralRoom/Views}/RawApiView.xaml (88%) rename {Modules/RawApiViewer => AdmiralRoom/Views}/RawApiView.xaml.cs (93%) rename {Modules/Akashi => AdmiralRoom/Views/Standalone}/AkashiWindow.xaml (98%) rename {Modules/Akashi => AdmiralRoom/Views/Standalone}/AkashiWindow.xaml.cs (95%) rename {Modules/MasterDataViewer => AdmiralRoom/Views/Standalone}/MasterDataWindow.xaml (96%) rename {Modules/MasterDataViewer => AdmiralRoom/Views/Standalone}/MasterDataWindow.xaml.cs (92%) delete mode 100644 Modules/Akashi/Akashi.cs delete mode 100644 Modules/Akashi/Akashi.csproj delete mode 100644 Modules/Akashi/Properties/AssemblyInfo.cs delete mode 100644 Modules/MasterDataViewer/MasterDataViewer.cs delete mode 100644 Modules/MasterDataViewer/MasterDataViewer.csproj delete mode 100644 Modules/MasterDataViewer/Properties/AssemblyInfo.cs delete mode 100644 Modules/Ranking/Properties/AssemblyInfo.cs delete mode 100644 Modules/Ranking/Ranking.cs delete mode 100644 Modules/Ranking/Ranking.csproj delete mode 100644 Modules/RawApiViewer/Properties/AssemblyInfo.cs delete mode 100644 Modules/RawApiViewer/RawApiViewer.cs delete mode 100644 Modules/RawApiViewer/RawApiViewer.csproj diff --git a/AdmiralRoom.sln b/AdmiralRoom.sln index be445fc..19fe472 100644 --- a/AdmiralRoom.sln +++ b/AdmiralRoom.sln @@ -1,20 +1,10 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.2003 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdmiralRoom", "AdmiralRoom\AdmiralRoom.csproj", "{501AD96A-9AAE-4232-98E6-1ED41067C1FB}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{430ECE0C-AFBA-47EB-98DD-3F2D0186AF4D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akashi", "Modules\Akashi\Akashi.csproj", "{F0245DDE-EF28-4E72-8493-E1FCAF380E8B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MasterDataViewer", "Modules\MasterDataViewer\MasterDataViewer.csproj", "{BCCF344F-69B8-443C-9173-0DC640735871}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ranking", "Modules\Ranking\Ranking.csproj", "{0394F232-C474-4F4F-9F0C-9865C92902DA}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RawApiViewer", "Modules\RawApiViewer\RawApiViewer.csproj", "{57FA364A-4801-406C-909A-D1AEAC7AFA2C}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -25,34 +15,13 @@ Global {501AD96A-9AAE-4232-98E6-1ED41067C1FB}.Debug|Any CPU.Build.0 = Debug|Any CPU {501AD96A-9AAE-4232-98E6-1ED41067C1FB}.Release|Any CPU.ActiveCfg = Release|Any CPU {501AD96A-9AAE-4232-98E6-1ED41067C1FB}.Release|Any CPU.Build.0 = Release|Any CPU - {F0245DDE-EF28-4E72-8493-E1FCAF380E8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0245DDE-EF28-4E72-8493-E1FCAF380E8B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0245DDE-EF28-4E72-8493-E1FCAF380E8B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0245DDE-EF28-4E72-8493-E1FCAF380E8B}.Release|Any CPU.Build.0 = Release|Any CPU - {BCCF344F-69B8-443C-9173-0DC640735871}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BCCF344F-69B8-443C-9173-0DC640735871}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BCCF344F-69B8-443C-9173-0DC640735871}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BCCF344F-69B8-443C-9173-0DC640735871}.Release|Any CPU.Build.0 = Release|Any CPU - {0394F232-C474-4F4F-9F0C-9865C92902DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0394F232-C474-4F4F-9F0C-9865C92902DA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0394F232-C474-4F4F-9F0C-9865C92902DA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0394F232-C474-4F4F-9F0C-9865C92902DA}.Release|Any CPU.Build.0 = Release|Any CPU - {57FA364A-4801-406C-909A-D1AEAC7AFA2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57FA364A-4801-406C-909A-D1AEAC7AFA2C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57FA364A-4801-406C-909A-D1AEAC7AFA2C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57FA364A-4801-406C-909A-D1AEAC7AFA2C}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {F0245DDE-EF28-4E72-8493-E1FCAF380E8B} = {430ECE0C-AFBA-47EB-98DD-3F2D0186AF4D} - {BCCF344F-69B8-443C-9173-0DC640735871} = {430ECE0C-AFBA-47EB-98DD-3F2D0186AF4D} - {0394F232-C474-4F4F-9F0C-9865C92902DA} = {430ECE0C-AFBA-47EB-98DD-3F2D0186AF4D} - {57FA364A-4801-406C-909A-D1AEAC7AFA2C} = {430ECE0C-AFBA-47EB-98DD-3F2D0186AF4D} - EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - RESX_SortFileContentOnSave = True RESX_ResXSortingComparison = InvariantCulture + RESX_SortFileContentOnSave = True + SolutionGuid = {BD1C1326-C931-40E1-860A-758FE3E95081} EndGlobalSection EndGlobal diff --git a/Modules/Ranking/ranking_getlist.cs b/AdmiralRoom/API/ranking_getlist.cs similarity index 100% rename from Modules/Ranking/ranking_getlist.cs rename to AdmiralRoom/API/ranking_getlist.cs diff --git a/AdmiralRoom/AdmiralRoom.csproj b/AdmiralRoom/AdmiralRoom.csproj index e6f1337..daa689c 100644 --- a/AdmiralRoom/AdmiralRoom.csproj +++ b/AdmiralRoom/AdmiralRoom.csproj @@ -142,6 +142,7 @@ + @@ -160,13 +161,17 @@ + + + + @@ -275,6 +280,9 @@ AdmiralView.xaml + + AkashiWindow.xaml + BattleView.xaml @@ -287,6 +295,7 @@ + @@ -310,6 +319,12 @@ QuestOverview.xaml + + RankingView.xaml + + + RawApiView.xaml + RepairView.xaml @@ -330,6 +345,9 @@ LogView.xaml + + MasterDataWindow.xaml + MaterialCatalog.xaml @@ -385,6 +403,13 @@ Designer MSBuild:Compile + + MSBuild:Compile + AkashiData.tt + True + Designer + True + Designer MSBuild:Compile @@ -409,6 +434,10 @@ Designer MSBuild:Compile + + MSBuild:Compile + Designer + Designer MSBuild:Compile @@ -441,6 +470,14 @@ Designer MSBuild:Compile + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + Designer MSBuild:Compile @@ -465,6 +502,10 @@ Designer MSBuild:Compile + + MSBuild:Compile + Designer + Designer MSBuild:Compile @@ -586,6 +627,11 @@ TextTemplatingFileGenerator StringTable.xaml + + + TextTemplatingFileGenerator + AkashiData.xaml + TextTemplatingFileGenerator StaticCounters.cs diff --git a/Modules/RawApiViewer/ApiModel.cs b/AdmiralRoom/Models/ApiModel.cs similarity index 77% rename from Modules/RawApiViewer/ApiModel.cs rename to AdmiralRoom/Models/ApiModel.cs index cbcc017..c6500b5 100644 --- a/Modules/RawApiViewer/ApiModel.cs +++ b/AdmiralRoom/Models/ApiModel.cs @@ -1,7 +1,6 @@ -using Huoyaoyuan.AdmiralRoom; -using Newtonsoft.Json.Linq; +using Newtonsoft.Json.Linq; -namespace RawApiViewer +namespace Huoyaoyuan.AdmiralRoom.Models { class ApiModel { diff --git a/Modules/Akashi/AkashiData.tt b/AdmiralRoom/Officer/Akashi/AkashiData.tt similarity index 97% rename from Modules/Akashi/AkashiData.tt rename to AdmiralRoom/Officer/Akashi/AkashiData.tt index b2ed143..9ca540e 100644 --- a/Modules/Akashi/AkashiData.tt +++ b/AdmiralRoom/Officer/Akashi/AkashiData.tt @@ -5,7 +5,7 @@ <#@ import namespace="System.Text" #> <#@ import namespace="System.Collections.Generic" #> <#@ output extension=".xaml" #> - <# diff --git a/Modules/Akashi/AkashiData.txt b/AdmiralRoom/Officer/Akashi/AkashiData.txt similarity index 100% rename from Modules/Akashi/AkashiData.txt rename to AdmiralRoom/Officer/Akashi/AkashiData.txt diff --git a/Modules/Akashi/AkashiData.xaml b/AdmiralRoom/Officer/Akashi/AkashiData.xaml similarity index 99% rename from Modules/Akashi/AkashiData.xaml rename to AdmiralRoom/Officer/Akashi/AkashiData.xaml index dcc6a11..14df06f 100644 --- a/Modules/Akashi/AkashiData.xaml +++ b/AdmiralRoom/Officer/Akashi/AkashiData.xaml @@ -1,4 +1,4 @@ - diff --git a/Modules/Akashi/AkashiViewModel.cs b/AdmiralRoom/Officer/Akashi/AkashiViewModel.cs similarity index 94% rename from Modules/Akashi/AkashiViewModel.cs rename to AdmiralRoom/Officer/Akashi/AkashiViewModel.cs index 9e75968..be887cb 100644 --- a/Modules/Akashi/AkashiViewModel.cs +++ b/AdmiralRoom/Officer/Akashi/AkashiViewModel.cs @@ -2,10 +2,9 @@ using System.Collections.Generic; using System.Linq; using System.Windows; -using Huoyaoyuan.AdmiralRoom.Officer; using Meowtrix.ComponentModel; -namespace Huoyaoyuan.AdmiralRoom.Modules.Akashi +namespace Huoyaoyuan.AdmiralRoom.Officer.Akashi { class AkashiViewModel : NotificationObject { @@ -28,7 +27,7 @@ public int WeekDay public IReadOnlyList TodayInfo => AllInfo.Select(x => x.CopyOfWeekDay(WeekDay)).Where(x => x.Secretaries.Any()).ToArray(); private readonly IReadOnlyList AllInfo - = (IReadOnlyList)Application.LoadComponent(new Uri("Akashi;component/AkashiData.xaml", UriKind.Relative)); + = (IReadOnlyList)Application.LoadComponent(new Uri("AdmiralRoom;component/Officer/Akashi/AkashiData.xaml", UriKind.Relative)); } class EnhancementInfo { diff --git a/Modules/Ranking/RankingViewModel.cs b/AdmiralRoom/Officer/RankingViewModel.cs similarity index 99% rename from Modules/Ranking/RankingViewModel.cs rename to AdmiralRoom/Officer/RankingViewModel.cs index 8359237..c3dcf04 100644 --- a/Modules/Ranking/RankingViewModel.cs +++ b/AdmiralRoom/Officer/RankingViewModel.cs @@ -2,10 +2,9 @@ using System.ComponentModel; using System.IO; using Huoyaoyuan.AdmiralRoom.API; -using Huoyaoyuan.AdmiralRoom.Officer; using Meowtrix.ComponentModel; -namespace Huoyaoyuan.AdmiralRoom.Modules.Ranking +namespace Huoyaoyuan.AdmiralRoom.Officer { class RankingViewModel : NotificationObject { diff --git a/Modules/RawApiViewer/RawApiViewModel.cs b/AdmiralRoom/Officer/RawApi.cs similarity index 87% rename from Modules/RawApiViewer/RawApiViewModel.cs rename to AdmiralRoom/Officer/RawApi.cs index b458c60..74216ac 100644 --- a/Modules/RawApiViewer/RawApiViewModel.cs +++ b/AdmiralRoom/Officer/RawApi.cs @@ -1,16 +1,15 @@ using System.Collections.Generic; using System.Collections.ObjectModel; -using Huoyaoyuan.AdmiralRoom; -using Huoyaoyuan.AdmiralRoom.Officer; +using Huoyaoyuan.AdmiralRoom.Models; using Meowtrix.ComponentModel; using Newtonsoft.Json.Linq; -namespace RawApiViewer +namespace Huoyaoyuan.AdmiralRoom.Officer { - class RawApiViewModel : NotificationObject + class RawApi : NotificationObject { - public static RawApiViewModel Instance { get; } = new RawApiViewModel(); - private RawApiViewModel() + public static RawApi Instance { get; } = new RawApi(); + private RawApi() { Staff.API("").Subscribe(AddSession); } diff --git a/Modules/RawApiViewer/JsonConverter.cs b/AdmiralRoom/Views/Converter/JsonConverter.cs similarity index 97% rename from Modules/RawApiViewer/JsonConverter.cs rename to AdmiralRoom/Views/Converter/JsonConverter.cs index 94b731f..5518aff 100644 --- a/Modules/RawApiViewer/JsonConverter.cs +++ b/AdmiralRoom/Views/Converter/JsonConverter.cs @@ -3,7 +3,7 @@ using System.Windows.Data; using Newtonsoft.Json.Linq; -namespace RawApiViewer +namespace Huoyaoyuan.AdmiralRoom.Views.Converter { class JsonConverter : IValueConverter { diff --git a/Modules/Ranking/RankingView.xaml b/AdmiralRoom/Views/RankingView.xaml similarity index 92% rename from Modules/Ranking/RankingView.xaml rename to AdmiralRoom/Views/RankingView.xaml index 2735a47..9a2b4d6 100644 --- a/Modules/Ranking/RankingView.xaml +++ b/AdmiralRoom/Views/RankingView.xaml @@ -1,10 +1,10 @@ - diff --git a/Modules/Ranking/RankingView.xaml.cs b/AdmiralRoom/Views/RankingView.xaml.cs similarity index 94% rename from Modules/Ranking/RankingView.xaml.cs rename to AdmiralRoom/Views/RankingView.xaml.cs index 749f6af..c8a28ed 100644 --- a/Modules/Ranking/RankingView.xaml.cs +++ b/AdmiralRoom/Views/RankingView.xaml.cs @@ -4,7 +4,7 @@ using System.Windows.Controls; using Huoyaoyuan.AdmiralRoom.Composition; -namespace Huoyaoyuan.AdmiralRoom.Modules.Ranking +namespace Huoyaoyuan.AdmiralRoom.Views { /// /// RankingView.xaml 的交互逻辑 diff --git a/Modules/RawApiViewer/RawApiView.xaml b/AdmiralRoom/Views/RawApiView.xaml similarity index 88% rename from Modules/RawApiViewer/RawApiView.xaml rename to AdmiralRoom/Views/RawApiView.xaml index ab0389e..4e2d5e9 100644 --- a/Modules/RawApiViewer/RawApiView.xaml +++ b/AdmiralRoom/Views/RawApiView.xaml @@ -1,15 +1,16 @@ - - + diff --git a/Modules/RawApiViewer/RawApiView.xaml.cs b/AdmiralRoom/Views/RawApiView.xaml.cs similarity index 93% rename from Modules/RawApiViewer/RawApiView.xaml.cs rename to AdmiralRoom/Views/RawApiView.xaml.cs index f0baaa9..012f2d8 100644 --- a/Modules/RawApiViewer/RawApiView.xaml.cs +++ b/AdmiralRoom/Views/RawApiView.xaml.cs @@ -4,7 +4,7 @@ using System.Windows.Controls; using Huoyaoyuan.AdmiralRoom.Composition; -namespace RawApiViewer +namespace Huoyaoyuan.AdmiralRoom.Views { /// /// RawApiView.xaml 的交互逻辑 diff --git a/Modules/Akashi/AkashiWindow.xaml b/AdmiralRoom/Views/Standalone/AkashiWindow.xaml similarity index 98% rename from Modules/Akashi/AkashiWindow.xaml rename to AdmiralRoom/Views/Standalone/AkashiWindow.xaml index 473d19d..33bdc6d 100644 --- a/Modules/Akashi/AkashiWindow.xaml +++ b/AdmiralRoom/Views/Standalone/AkashiWindow.xaml @@ -1,10 +1,10 @@ - /// AkashiWindow.xaml 的交互逻辑 diff --git a/Modules/MasterDataViewer/MasterDataWindow.xaml b/AdmiralRoom/Views/Standalone/MasterDataWindow.xaml similarity index 96% rename from Modules/MasterDataViewer/MasterDataWindow.xaml rename to AdmiralRoom/Views/Standalone/MasterDataWindow.xaml index 3651371..086116d 100644 --- a/Modules/MasterDataViewer/MasterDataWindow.xaml +++ b/AdmiralRoom/Views/Standalone/MasterDataWindow.xaml @@ -1,12 +1,11 @@ - /// MasterDataWindow.xaml 的交互逻辑 diff --git a/Modules/Akashi/Akashi.cs b/Modules/Akashi/Akashi.cs deleted file mode 100644 index b56c055..0000000 --- a/Modules/Akashi/Akashi.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.ComponentModel.Composition; -using Huoyaoyuan.AdmiralRoom.Composition; - -namespace Huoyaoyuan.AdmiralRoom.Modules.Akashi -{ - [Export(typeof(ModuleInfo))] - [ExportMetadata("Title", "改修工廠")] - [ExportMetadata("Author", "huoyaoyuan")] - [ExportMetadata("Description", "明石の改修工廠")] - [ExportMetadata("ContractVersion", _Version.Version)] - public class Akashi : ModuleInfo { } -} diff --git a/Modules/Akashi/Akashi.csproj b/Modules/Akashi/Akashi.csproj deleted file mode 100644 index 29983f1..0000000 --- a/Modules/Akashi/Akashi.csproj +++ /dev/null @@ -1,95 +0,0 @@ - - - - - Debug - AnyCPU - {F0245DDE-EF28-4E72-8493-E1FCAF380E8B} - Library - Properties - Huoyaoyuan.AdmiralRoom.Modules.Akashi - Akashi - v4.6 - 512 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - - AkashiWindow.xaml - - - - - - {501ad96a-9aae-4232-98e6-1ed41067c1fb} - AdmiralRoom - - - - - MSBuild:Compile - True - True - AkashiData.tt - Designer - - - Designer - MSBuild:Compile - - - - - TextTemplatingFileGenerator - AkashiData.xaml - - - - - - - - - \ No newline at end of file diff --git a/Modules/Akashi/Properties/AssemblyInfo.cs b/Modules/Akashi/Properties/AssemblyInfo.cs deleted file mode 100644 index 7142be7..0000000 --- a/Modules/Akashi/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 有关程序集的一般信息由以下 -// 控制。更改这些特性值可修改 -// 与程序集关联的信息。 -[assembly: AssemblyTitle("明石の改修工廠")] -[assembly: AssemblyDescription("明石の改修工廠")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("huoyaoyuan")] -[assembly: AssemblyProduct("AdmiralRoom")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -//将 ComVisible 设置为 false 将使此程序集中的类型 -//对 COM 组件不可见。 如果需要从 COM 访问此程序集中的类型， -//请将此类型的 ComVisible 特性设置为 true。 -[assembly: ComVisible(false)] - -// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID -[assembly: Guid("f0245dde-ef28-4e72-8493-e1fcaf380e8b")] - -// 程序集的版本信息由下列四个值组成: -// -// 主版本 -// 次版本 -// 生成号 -// 修订号 -// -//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， -// 方法是按如下所示使用“*”: : -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.3.0.2")] -[assembly: AssemblyFileVersion("1.3.0.2")] diff --git a/Modules/MasterDataViewer/MasterDataViewer.cs b/Modules/MasterDataViewer/MasterDataViewer.cs deleted file mode 100644 index 683f1f7..0000000 --- a/Modules/MasterDataViewer/MasterDataViewer.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.ComponentModel.Composition; -using Huoyaoyuan.AdmiralRoom.Composition; - -namespace Huoyaoyuan.AdmiralRoom.Modules.MasterDataViewer -{ - [Export(typeof(ModuleInfo))] - [ExportMetadata("Title", "MasterDataViewer")] - [ExportMetadata("Author", "huoyaoyuan")] - [ExportMetadata("Description", "MasterDataViewer")] - [ExportMetadata("ContractVersion", _Version.Version)] - public class MasterDataViewer : ModuleInfo { } -} diff --git a/Modules/MasterDataViewer/MasterDataViewer.csproj b/Modules/MasterDataViewer/MasterDataViewer.csproj deleted file mode 100644 index bb8b6b6..0000000 --- a/Modules/MasterDataViewer/MasterDataViewer.csproj +++ /dev/null @@ -1,91 +0,0 @@ - - - - - Debug - AnyCPU - {BCCF344F-69B8-443C-9173-0DC640735871} - Library - Properties - Huoyaoyuan.AdmiralRoom.Modules.MasterDataViewer - MasterDataViewer - v4.6 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - 4.0 - - - - - - - - - MasterDataWindow.xaml - - - Code - - - - - - {501ad96a-9aae-4232-98e6-1ed41067c1fb} - AdmiralRoom - - - - - Designer - MSBuild:Compile - - - - - \ No newline at end of file diff --git a/Modules/MasterDataViewer/Properties/AssemblyInfo.cs b/Modules/MasterDataViewer/Properties/AssemblyInfo.cs deleted file mode 100644 index 7866e13..0000000 --- a/Modules/MasterDataViewer/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 有关程序集的一般信息由以下 -// 控制。更改这些特性值可修改 -// 与程序集关联的信息。 -[assembly: AssemblyTitle("MasterDataViewer")] -[assembly: AssemblyDescription("MasterDataViewer")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("huoyaoyuan")] -[assembly: AssemblyProduct("AdmiralRoom")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -//将 ComVisible 设置为 false 将使此程序集中的类型 -//对 COM 组件不可见。 如果需要从 COM 访问此程序集中的类型， -//请将此类型的 ComVisible 特性设置为 true。 -[assembly: ComVisible(false)] - -// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID -[assembly: Guid("6c906c9b-390e-4fd4-94c0-066a60db7aa7")] - -// 程序集的版本信息由下列四个值组成: -// -// 主版本 -// 次版本 -// 生成号 -// 修订号 -// -//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， -// 方法是按如下所示使用“*”: : -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.0.0")] -[assembly: AssemblyFileVersion("1.1.0.0")] diff --git a/Modules/Ranking/Properties/AssemblyInfo.cs b/Modules/Ranking/Properties/AssemblyInfo.cs deleted file mode 100644 index db1ee33..0000000 --- a/Modules/Ranking/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 有关程序集的一般信息由以下 -// 控制。更改这些特性值可修改 -// 与程序集关联的信息。 -[assembly: AssemblyTitle("戦果情報")] -[assembly: AssemblyDescription("戦果情報")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("huoyaoyuan")] -[assembly: AssemblyProduct("AdmiralRoom")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -//将 ComVisible 设置为 false 将使此程序集中的类型 -//对 COM 组件不可见。 如果需要从 COM 访问此程序集中的类型， -//请将此类型的 ComVisible 特性设置为 true。 -[assembly: ComVisible(false)] - -// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID -[assembly: Guid("0394f232-c474-4f4f-9f0c-9865c92902da")] - -// 程序集的版本信息由下列四个值组成: -// -// 主版本 -// 次版本 -// 生成号 -// 修订号 -// -//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， -// 方法是按如下所示使用“*”: : -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.4.0")] -[assembly: AssemblyFileVersion("1.2.4.0")] diff --git a/Modules/Ranking/Ranking.cs b/Modules/Ranking/Ranking.cs deleted file mode 100644 index 1d257ff..0000000 --- a/Modules/Ranking/Ranking.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.ComponentModel.Composition; -using Huoyaoyuan.AdmiralRoom.Composition; - -namespace Huoyaoyuan.AdmiralRoom.Modules.Ranking -{ - [Export(typeof(ModuleInfo))] - [ExportMetadata("Title", "戦果情報")] - [ExportMetadata("Author", "huoyaoyuan")] - [ExportMetadata("Description", "戦果情報")] - [ExportMetadata("ContractVersion", _Version.Version)] - public class Ranking : ModuleInfo, IDisposable - { - public void Dispose() - { - RankingViewModel.Instance.Save(); - } - } -} diff --git a/Modules/Ranking/Ranking.csproj b/Modules/Ranking/Ranking.csproj deleted file mode 100644 index 76a4b23..0000000 --- a/Modules/Ranking/Ranking.csproj +++ /dev/null @@ -1,81 +0,0 @@ - - - - - Debug - AnyCPU - {0394F232-C474-4F4F-9F0C-9865C92902DA} - Library - Properties - Huoyaoyuan.AdmiralRoom.Modules.Ranking - Ranking - v4.6 - 512 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - ..\..\AdmiralRoom\AdmiralRoom.ruleset - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - ..\..\AdmiralRoom\AdmiralRoom.ruleset - - - - - - - - - - - - - - - - - - - - - - - - RankingView.xaml - - - - - - - {501ad96a-9aae-4232-98e6-1ed41067c1fb} - AdmiralRoom - - - - - Designer - MSBuild:Compile - - - - - \ No newline at end of file diff --git a/Modules/RawApiViewer/Properties/AssemblyInfo.cs b/Modules/RawApiViewer/Properties/AssemblyInfo.cs deleted file mode 100644 index f46fd04..0000000 --- a/Modules/RawApiViewer/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 有关程序集的一般信息由以下 -// 控制。更改这些特性值可修改 -// 与程序集关联的信息。 -[assembly: AssemblyTitle("RawApiViewer")] -[assembly: AssemblyDescription("RawApiViewer")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("huoyaoyuan")] -[assembly: AssemblyProduct("AdmiralRoom")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -//将 ComVisible 设置为 false 将使此程序集中的类型 -//对 COM 组件不可见。 如果需要从 COM 访问此程序集中的类型， -//请将此类型的 ComVisible 特性设置为 true。 -[assembly: ComVisible(false)] - -// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID -[assembly: Guid("57fa364a-4801-406c-909a-d1aeac7afa2c")] - -// 程序集的版本信息由下列四个值组成: -// -// 主版本 -// 次版本 -// 生成号 -// 修订号 -// -//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， -// 方法是按如下所示使用“*”: : -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.2.0")] -[assembly: AssemblyFileVersion("1.0.2.0")] diff --git a/Modules/RawApiViewer/RawApiViewer.cs b/Modules/RawApiViewer/RawApiViewer.cs deleted file mode 100644 index 45f6723..0000000 --- a/Modules/RawApiViewer/RawApiViewer.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.ComponentModel.Composition; -using Huoyaoyuan.AdmiralRoom; -using Huoyaoyuan.AdmiralRoom.Composition; - -namespace RawApiViewer -{ - [Export(typeof(ModuleInfo))] - [ExportMetadata("Title", "RawApiViewer")] - [ExportMetadata("Author", "huoyaoyuan")] - [ExportMetadata("Description", "RawApiViewer")] - [ExportMetadata("ContractVersion", _Version.Version)] - public class RawApiViewer : ModuleInfo { } -} diff --git a/Modules/RawApiViewer/RawApiViewer.csproj b/Modules/RawApiViewer/RawApiViewer.csproj deleted file mode 100644 index 06904ca..0000000 --- a/Modules/RawApiViewer/RawApiViewer.csproj +++ /dev/null @@ -1,82 +0,0 @@ - - - - - Debug - AnyCPU - {57FA364A-4801-406C-909A-D1AEAC7AFA2C} - Library - Properties - RawApiViewer - RawApiViewer - v4.6 - 512 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - RawApiView.xaml - - - - - - - {501ad96a-9aae-4232-98e6-1ed41067c1fb} - AdmiralRoom - - - - - Designer - MSBuild:Compile - - - - - \ No newline at end of file