diff --git a/Common b/Common index fe4e46e..2ac9814 160000 --- a/Common +++ b/Common @@ -1 +1 @@ -Subproject commit fe4e46ee800b030e916b62465e1869a912c0f188 +Subproject commit 2ac9814d645d4b79abecaa386a48904b17471230 diff --git a/Desktop b/Desktop index a5605db..9c2473a 160000 --- a/Desktop +++ b/Desktop @@ -1 +1 @@ -Subproject commit a5605dbb968ec04335c128f5dd6b81cf7e15b494 +Subproject commit 9c2473af313f8908eaafaba1b50487eaf762112f diff --git a/Server b/Server index ae68f08..ab91afc 160000 --- a/Server +++ b/Server @@ -1 +1 @@ -Subproject commit ae68f081f9396413cc3db8588e132993fb7dbc00 +Subproject commit ab91afc0bcd6eea99bcfa6db3485b0ff79f3ac39 diff --git a/Tool b/Tool index 551a32e..a32fd32 160000 --- a/Tool +++ b/Tool @@ -1 +1 @@ -Subproject commit 551a32e4dccc1b061ae2ecee070ef6b7413ba466 +Subproject commit a32fd320aa5883f60cfde4b7b5e3a49ea63e20a3 diff --git a/Xunkong.sln b/Xunkong.sln index f586135..689c669 100644 --- a/Xunkong.sln +++ b/Xunkong.sln @@ -23,8 +23,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xunkong.ApiServer", "Server EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tool", "Tool", "{9703BC98-F54D-43A0-A6C9-6548E3776181}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DatabaseMigration", "Tool\DatabaseMigration\DatabaseMigration.csproj", "{7D9D05B7-9673-4053-8148-EEF51305DCD8}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GenerateWallpaperSql", "Tool\GenerateWallpaperSql\GenerateWallpaperSql.csproj", "{98B7C51A-C603-4CD4-81E9-5A4A7C22D8FE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "YaeAchievement", "YaeAchievement", "{4A50D7CF-0F67-4397-9308-F5D9BA6C12B1}" @@ -33,6 +31,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YaeAchievement", "YaeAchiev EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YaeAchievementLib", "YaeAchievement\lib\YaeAchievementLib.vcxproj", "{83C3DF1A-6219-408E-98A3-C7040CCC96FD}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GenshinDataParser", "Tool\GenshinDataParser\GenshinDataParser.csproj", "{DDCADF65-6ED3-47F6-B49E-B2D747BCA74E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSelector", "Tool\ImageSelector\ImageSelector.csproj", "{D2DD1A5A-60DB-4346-805C-1FBEDB11D5BE}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -197,22 +199,6 @@ Global {27A74007-233D-46A5-AAF4-ED24F255B559}.Release|x64.Build.0 = Release|Any CPU {27A74007-233D-46A5-AAF4-ED24F255B559}.Release|x86.ActiveCfg = Release|Any CPU {27A74007-233D-46A5-AAF4-ED24F255B559}.Release|x86.Build.0 = Release|Any CPU - {7D9D05B7-9673-4053-8148-EEF51305DCD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D9D05B7-9673-4053-8148-EEF51305DCD8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D9D05B7-9673-4053-8148-EEF51305DCD8}.Debug|arm64.ActiveCfg = Debug|Any CPU - {7D9D05B7-9673-4053-8148-EEF51305DCD8}.Debug|arm64.Build.0 = Debug|Any CPU - {7D9D05B7-9673-4053-8148-EEF51305DCD8}.Debug|x64.ActiveCfg = Debug|Any CPU - {7D9D05B7-9673-4053-8148-EEF51305DCD8}.Debug|x64.Build.0 = Debug|Any CPU - {7D9D05B7-9673-4053-8148-EEF51305DCD8}.Debug|x86.ActiveCfg = Debug|Any CPU - {7D9D05B7-9673-4053-8148-EEF51305DCD8}.Debug|x86.Build.0 = Debug|Any CPU - {7D9D05B7-9673-4053-8148-EEF51305DCD8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D9D05B7-9673-4053-8148-EEF51305DCD8}.Release|Any CPU.Build.0 = Release|Any CPU - {7D9D05B7-9673-4053-8148-EEF51305DCD8}.Release|arm64.ActiveCfg = Release|Any CPU - {7D9D05B7-9673-4053-8148-EEF51305DCD8}.Release|arm64.Build.0 = Release|Any CPU - {7D9D05B7-9673-4053-8148-EEF51305DCD8}.Release|x64.ActiveCfg = Release|Any CPU - {7D9D05B7-9673-4053-8148-EEF51305DCD8}.Release|x64.Build.0 = Release|Any CPU - {7D9D05B7-9673-4053-8148-EEF51305DCD8}.Release|x86.ActiveCfg = Release|Any CPU - {7D9D05B7-9673-4053-8148-EEF51305DCD8}.Release|x86.Build.0 = Release|Any CPU {98B7C51A-C603-4CD4-81E9-5A4A7C22D8FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {98B7C51A-C603-4CD4-81E9-5A4A7C22D8FE}.Debug|Any CPU.Build.0 = Debug|Any CPU {98B7C51A-C603-4CD4-81E9-5A4A7C22D8FE}.Debug|arm64.ActiveCfg = Debug|Any CPU @@ -261,15 +247,48 @@ Global {83C3DF1A-6219-408E-98A3-C7040CCC96FD}.Release|x64.Build.0 = Release|x64 {83C3DF1A-6219-408E-98A3-C7040CCC96FD}.Release|x86.ActiveCfg = Release|x64 {83C3DF1A-6219-408E-98A3-C7040CCC96FD}.Release|x86.Build.0 = Release|x64 + {DDCADF65-6ED3-47F6-B49E-B2D747BCA74E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DDCADF65-6ED3-47F6-B49E-B2D747BCA74E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DDCADF65-6ED3-47F6-B49E-B2D747BCA74E}.Debug|arm64.ActiveCfg = Debug|Any CPU + {DDCADF65-6ED3-47F6-B49E-B2D747BCA74E}.Debug|arm64.Build.0 = Debug|Any CPU + {DDCADF65-6ED3-47F6-B49E-B2D747BCA74E}.Debug|x64.ActiveCfg = Debug|Any CPU + {DDCADF65-6ED3-47F6-B49E-B2D747BCA74E}.Debug|x64.Build.0 = Debug|Any CPU + {DDCADF65-6ED3-47F6-B49E-B2D747BCA74E}.Debug|x86.ActiveCfg = Debug|Any CPU + {DDCADF65-6ED3-47F6-B49E-B2D747BCA74E}.Debug|x86.Build.0 = Debug|Any CPU + {DDCADF65-6ED3-47F6-B49E-B2D747BCA74E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DDCADF65-6ED3-47F6-B49E-B2D747BCA74E}.Release|Any CPU.Build.0 = Release|Any CPU + {DDCADF65-6ED3-47F6-B49E-B2D747BCA74E}.Release|arm64.ActiveCfg = Release|Any CPU + {DDCADF65-6ED3-47F6-B49E-B2D747BCA74E}.Release|arm64.Build.0 = Release|Any CPU + {DDCADF65-6ED3-47F6-B49E-B2D747BCA74E}.Release|x64.ActiveCfg = Release|Any CPU + {DDCADF65-6ED3-47F6-B49E-B2D747BCA74E}.Release|x64.Build.0 = Release|Any CPU + {DDCADF65-6ED3-47F6-B49E-B2D747BCA74E}.Release|x86.ActiveCfg = Release|Any CPU + {DDCADF65-6ED3-47F6-B49E-B2D747BCA74E}.Release|x86.Build.0 = Release|Any CPU + {D2DD1A5A-60DB-4346-805C-1FBEDB11D5BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D2DD1A5A-60DB-4346-805C-1FBEDB11D5BE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D2DD1A5A-60DB-4346-805C-1FBEDB11D5BE}.Debug|arm64.ActiveCfg = Debug|Any CPU + {D2DD1A5A-60DB-4346-805C-1FBEDB11D5BE}.Debug|arm64.Build.0 = Debug|Any CPU + {D2DD1A5A-60DB-4346-805C-1FBEDB11D5BE}.Debug|x64.ActiveCfg = Debug|Any CPU + {D2DD1A5A-60DB-4346-805C-1FBEDB11D5BE}.Debug|x64.Build.0 = Debug|Any CPU + {D2DD1A5A-60DB-4346-805C-1FBEDB11D5BE}.Debug|x86.ActiveCfg = Debug|Any CPU + {D2DD1A5A-60DB-4346-805C-1FBEDB11D5BE}.Debug|x86.Build.0 = Debug|Any CPU + {D2DD1A5A-60DB-4346-805C-1FBEDB11D5BE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D2DD1A5A-60DB-4346-805C-1FBEDB11D5BE}.Release|Any CPU.Build.0 = Release|Any CPU + {D2DD1A5A-60DB-4346-805C-1FBEDB11D5BE}.Release|arm64.ActiveCfg = Release|Any CPU + {D2DD1A5A-60DB-4346-805C-1FBEDB11D5BE}.Release|arm64.Build.0 = Release|Any CPU + {D2DD1A5A-60DB-4346-805C-1FBEDB11D5BE}.Release|x64.ActiveCfg = Release|Any CPU + {D2DD1A5A-60DB-4346-805C-1FBEDB11D5BE}.Release|x64.Build.0 = Release|Any CPU + {D2DD1A5A-60DB-4346-805C-1FBEDB11D5BE}.Release|x86.ActiveCfg = Release|Any CPU + {D2DD1A5A-60DB-4346-805C-1FBEDB11D5BE}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {7D9D05B7-9673-4053-8148-EEF51305DCD8} = {9703BC98-F54D-43A0-A6C9-6548E3776181} {98B7C51A-C603-4CD4-81E9-5A4A7C22D8FE} = {9703BC98-F54D-43A0-A6C9-6548E3776181} {4E3D7376-01ED-45F6-B21B-7B66A3ED3753} = {4A50D7CF-0F67-4397-9308-F5D9BA6C12B1} {83C3DF1A-6219-408E-98A3-C7040CCC96FD} = {4A50D7CF-0F67-4397-9308-F5D9BA6C12B1} + {DDCADF65-6ED3-47F6-B49E-B2D747BCA74E} = {9703BC98-F54D-43A0-A6C9-6548E3776181} + {D2DD1A5A-60DB-4346-805C-1FBEDB11D5BE} = {9703BC98-F54D-43A0-A6C9-6548E3776181} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1F771608-3C7E-4E89-AADD-CAC8D6ABFF83} diff --git a/YaeAchievement b/YaeAchievement index fbe1b70..20d3e2e 160000 --- a/YaeAchievement +++ b/YaeAchievement @@ -1 +1 @@ -Subproject commit fbe1b70a525399fb0963c27b204aa31ecab30204 +Subproject commit 20d3e2e5b937c3b42ead93cd4f5f4e1c36ecb09e