Revert "Readded locking songs in initialDataCheck, updated game constants"
This reverts commit e440e340fc.
This commit is contained in:
S-Sebb??
parent
e440e340fc
commit
d476d323d9
@ -7,16 +7,16 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\SharedProject\SharedProject.csproj"/>
|
<ProjectReference Include="..\SharedProject\SharedProject.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0-rc.1.22426.7"/>
|
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0-rc.1.22426.7" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0-rc.1.22426.7"/>
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0-rc.1.22426.7" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0-rc.1.22426.7">
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0-rc.1.22426.7">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@ -9,19 +9,19 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="JorgeSerrano.Json.JsonSnakeCaseNamingPolicy" Version="0.9.0"/>
|
<PackageReference Include="JorgeSerrano.Json.JsonSnakeCaseNamingPolicy" Version="0.9.0" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0-rc.1.22426.7"/>
|
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0-rc.1.22426.7" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0-rc.1.22426.7"/>
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0-rc.1.22426.7" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0-rc.1.22426.7">
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0-rc.1.22426.7">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="SharpZipLib" Version="1.4.0"/>
|
<PackageReference Include="SharpZipLib" Version="1.4.0" />
|
||||||
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1"/>
|
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\GameDatabase\GameDatabase.csproj"/>
|
<ProjectReference Include="..\GameDatabase\GameDatabase.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@ -7,7 +7,7 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Throw" Version="1.3.0"/>
|
<PackageReference Include="Throw" Version="1.3.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@ -29,13 +29,13 @@ public static class Constants
|
|||||||
|
|
||||||
public const int TONE_UID_MAX = 19;
|
public const int TONE_UID_MAX = 19;
|
||||||
|
|
||||||
public const int TITLE_UID_MAX = 941;
|
public const int TITLE_UID_MAX = 814;
|
||||||
|
|
||||||
private const int COSTUME_FLAG_1_ARRAY_SIZE = 156;
|
private const int COSTUME_FLAG_1_ARRAY_SIZE = 154;
|
||||||
private const int COSTUME_FLAG_2_ARRAY_SIZE = 140;
|
private const int COSTUME_FLAG_2_ARRAY_SIZE = 140;
|
||||||
private const int COSTUME_FLAG_3_ARRAY_SIZE = 156;
|
private const int COSTUME_FLAG_3_ARRAY_SIZE = 156;
|
||||||
private const int COSTUME_FLAG_4_ARRAY_SIZE = 58;
|
private const int COSTUME_FLAG_4_ARRAY_SIZE = 58;
|
||||||
private const int COSTUME_FLAG_5_ARRAY_SIZE = 142;
|
private const int COSTUME_FLAG_5_ARRAY_SIZE = 129;
|
||||||
public static readonly int[] CostumeFlagArraySizes =
|
public static readonly int[] CostumeFlagArraySizes =
|
||||||
{
|
{
|
||||||
COSTUME_FLAG_1_ARRAY_SIZE,
|
COSTUME_FLAG_1_ARRAY_SIZE,
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"DataSettings": {
|
"DataSettings" : {
|
||||||
"DanDataFileName": "dan_data.json",
|
"DanDataFileName" : "dan_data.json",
|
||||||
"EventFolderDataFileName": "event_folder_data.json",
|
"EventFolderDataFileName" : "event_folder_data.json",
|
||||||
"IntroDataFileName": "intro_data.json"
|
"IntroDataFileName" : "intro_data.json"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1,3 +1,3 @@
|
|||||||
{
|
{
|
||||||
"DbFileName": "taiko.db3"
|
"DbFileName" : "taiko.db3"
|
||||||
}
|
}
|
||||||
@ -1,9 +1,6 @@
|
|||||||
{
|
{
|
||||||
"Serilog": {
|
"Serilog": {
|
||||||
"Using": [
|
"Using": [ "Serilog.Sinks.Console", "Serilog.Sinks.File" ],
|
||||||
"Serilog.Sinks.Console",
|
|
||||||
"Serilog.Sinks.File"
|
|
||||||
],
|
|
||||||
"MinimumLevel": {
|
"MinimumLevel": {
|
||||||
"Default": "Information",
|
"Default": "Information",
|
||||||
"Override": {
|
"Override": {
|
||||||
@ -23,10 +20,7 @@
|
|||||||
"WriteTo": [
|
"WriteTo": [
|
||||||
{
|
{
|
||||||
"Name": "File",
|
"Name": "File",
|
||||||
"Args": {
|
"Args": { "path": "./Logs/log-.txt", "rollingInterval": "Day" }
|
||||||
"path": "./Logs/log-.txt",
|
|
||||||
"rollingInterval": "Day"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@ -24,17 +24,12 @@ public class InitialDataCheckController : BaseController<InitialDataCheckControl
|
|||||||
Logger.LogInformation("Initial data check request: {Request}", request.Stringify());
|
Logger.LogInformation("Initial data check request: {Request}", request.Stringify());
|
||||||
|
|
||||||
var songIdMax = settings.EnableMoreSongs ? Constants.MUSIC_ID_MAX_EXPANDED : Constants.MUSIC_ID_MAX;
|
var songIdMax = settings.EnableMoreSongs ? Constants.MUSIC_ID_MAX_EXPANDED : Constants.MUSIC_ID_MAX;
|
||||||
|
|
||||||
var musicList = gameDataService.GetMusicList();
|
|
||||||
var lockedSongsList = gameDataService.GetLockedSongsList();
|
|
||||||
var enabledMusicList = musicList.Except(lockedSongsList);
|
|
||||||
var enabledArray =
|
var enabledArray =
|
||||||
FlagCalculator.GetBitArrayFromIds(enabledMusicList, songIdMax, Logger);
|
FlagCalculator.GetBitArrayFromIds(gameDataService.GetMusicList(), songIdMax, Logger);
|
||||||
|
|
||||||
var defaultSongWithUraList = gameDataService.GetMusicWithUraList();
|
var defaultSongWithUraList = gameDataService.GetMusicWithUraList();
|
||||||
var enabledUraList = defaultSongWithUraList.Except(lockedSongsList);
|
|
||||||
var uraReleaseBit =
|
var uraReleaseBit =
|
||||||
FlagCalculator.GetBitArrayFromIds(enabledUraList, songIdMax, Logger);
|
FlagCalculator.GetBitArrayFromIds(defaultSongWithUraList, songIdMax, Logger);
|
||||||
|
|
||||||
var response = new InitialdatacheckResponse
|
var response = new InitialdatacheckResponse
|
||||||
{
|
{
|
||||||
@ -73,13 +68,12 @@ public class InitialDataCheckController : BaseController<InitialDataCheckControl
|
|||||||
verUp2Type101.AryInformationDatas.AddRange(danData);
|
verUp2Type101.AryInformationDatas.AddRange(danData);
|
||||||
response.AryVerupNoData2s.Add(verUp2Type101);
|
response.AryVerupNoData2s.Add(verUp2Type101);
|
||||||
|
|
||||||
// gaiden testing
|
var verUp2Type102 = new InitialdatacheckResponse.VerupNoData2
|
||||||
// var verUp2Type102 = new InitialdatacheckResponse.VerupNoData2
|
{
|
||||||
// {
|
MasterType = 102,
|
||||||
// MasterType = 102,
|
};
|
||||||
// };
|
verUp2Type102.AryInformationDatas.AddRange(danData);
|
||||||
// verUp2Type102.AryInformationDatas.AddRange(danData);
|
response.AryVerupNoData2s.Add(verUp2Type102);
|
||||||
// response.AryVerupNoData2s.Add(verUp2Type102);
|
|
||||||
|
|
||||||
var eventFolderData = new List<InitialdatacheckResponse.VerupNoData2.InformationData>();
|
var eventFolderData = new List<InitialdatacheckResponse.VerupNoData2.InformationData>();
|
||||||
foreach (var folderId in Constants.EVENT_FOLDER_IDS)
|
foreach (var folderId in Constants.EVENT_FOLDER_IDS)
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
# Server
|
# Server
|
||||||
|
|
||||||
This is the solution for server.
|
This is the solution for server.
|
||||||
|
|
||||||
Server is implemented with ASP.NET Core 6. ORM is Entity Framework Core 6. Database is SQLite for easier setup.
|
Server is implemented with ASP.NET Core 6. ORM is Entity Framework Core 6. Database is SQLite for easier setup.
|
||||||
|
|
||||||
|
|||||||
@ -6,105 +6,105 @@
|
|||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Version>0.4.0-alpha</Version>
|
<Version>0.4.0-alpha</Version>
|
||||||
<LangVersion>11</LangVersion>
|
<LangVersion>11</LangVersion>
|
||||||
<EnableConfigurationBindingGenerator>false</EnableConfigurationBindingGenerator>
|
<EnableConfigurationBindingGenerator>false</EnableConfigurationBindingGenerator>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Remove="Templates\TemplateController.cs"/>
|
<Compile Remove="Templates\TemplateController.cs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.0-rc.1.23421.29"/>
|
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.0-rc.1.23421.29" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0-rc.1.23419.6"/>
|
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0-rc.1.23419.6" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-rc.1.23419.6"/>
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-rc.1.23419.6" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0-rc.1.23419.6">
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0-rc.1.23419.6">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="protobuf-net" Version="3.2.26"/>
|
<PackageReference Include="protobuf-net" Version="3.2.26" />
|
||||||
<PackageReference Include="protobuf-net.AspNetCore" Version="3.2.12"/>
|
<PackageReference Include="protobuf-net.AspNetCore" Version="3.2.12" />
|
||||||
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0"/>
|
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
|
||||||
<PackageReference Include="Serilog.Expressions" Version="3.4.2-dev-00120"/>
|
<PackageReference Include="Serilog.Expressions" Version="3.4.2-dev-00120" />
|
||||||
<PackageReference Include="SharpZipLib" Version="1.4.2"/>
|
<PackageReference Include="SharpZipLib" Version="1.4.2" />
|
||||||
<PackageReference Include="Swan.Core" Version="7.0.0-beta.2"/>
|
<PackageReference Include="Swan.Core" Version="7.0.0-beta.2" />
|
||||||
<PackageReference Include="Swan.Logging" Version="6.0.2-beta.96"/>
|
<PackageReference Include="Swan.Logging" Version="6.0.2-beta.96" />
|
||||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0"/>
|
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
|
||||||
<PackageReference Include="Throw" Version="1.4.0"/>
|
<PackageReference Include="Throw" Version="1.4.0" />
|
||||||
<PackageReference Include="Yoh.Text.Json.NamingPolicies" Version="1.0.0"/>
|
<PackageReference Include="Yoh.Text.Json.NamingPolicies" Version="1.0.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Update="Certificates\cert.pfx">
|
<None Update="Certificates\cert.pfx">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</None>
|
</None>
|
||||||
<None Update="Certificates\root.pfx">
|
<None Update="Certificates\root.pfx">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</None>
|
</None>
|
||||||
<Content Remove="Configurations\ServerSettings.json"/>
|
<Content Remove="Configurations\ServerSettings.json" />
|
||||||
<None Include="Configurations\ServerSettings.json">
|
<None Include="Configurations\ServerSettings.json">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</None>
|
</None>
|
||||||
<Content Remove="Configurations\Database.json"/>
|
<Content Remove="Configurations\Database.json" />
|
||||||
<None Include="Configurations\Database.json">
|
<None Include="Configurations\Database.json">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</None>
|
</None>
|
||||||
<Content Remove="Configurations\DataSettings.json"/>
|
<Content Remove="Configurations\DataSettings.json" />
|
||||||
<None Include="Configurations\DataSettings.json">
|
<None Include="Configurations\DataSettings.json">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</None>
|
</None>
|
||||||
<Content Remove="Configurations\Kestrel.json"/>
|
<Content Remove="Configurations\Kestrel.json" />
|
||||||
<None Include="Configurations\Kestrel.json">
|
<None Include="Configurations\Kestrel.json">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</None>
|
</None>
|
||||||
<Content Remove="Configurations\Logging.json"/>
|
<Content Remove="Configurations\Logging.json" />
|
||||||
<None Include="Configurations\Logging.json">
|
<None Include="Configurations\Logging.json">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</None>
|
</None>
|
||||||
<Content Update="wwwroot\data\locked_songs_data.json">
|
<Content Update="wwwroot\data\locked_songs_data.json">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Update="wwwroot\data\movie_data.json">
|
<Content Update="wwwroot\data\movie_data.json">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Update="wwwroot\data\music_order.json">
|
<Content Update="wwwroot\data\music_order.json">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Update="wwwroot\data\musicinfo.json">
|
<Content Update="wwwroot\data\musicinfo.json">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Update="wwwroot\data\shop_folder_data.json">
|
<Content Update="wwwroot\data\shop_folder_data.json">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Update="wwwroot\data\token_data.json">
|
<Content Update="wwwroot\data\token_data.json">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Update="wwwroot\data\wordlist.json">
|
<Content Update="wwwroot\data\wordlist.json">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Content Update="wwwroot\data\dan_data.json">
|
<Content Update="wwwroot\data\dan_data.json">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Update="wwwroot\data\event_folder_data.json">
|
<Content Update="wwwroot\data\event_folder_data.json">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Update="wwwroot\data\intro_data.json">
|
<Content Update="wwwroot\data\intro_data.json">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Update="wwwroot\data\music_attribute.json">
|
<Content Update="wwwroot\data\music_attribute.json">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Update="wwwroot\data\music_attribute.json">
|
<Content Update="wwwroot\data\music_attribute.json">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\GameDatabase\GameDatabase.csproj"/>
|
<ProjectReference Include="..\GameDatabase\GameDatabase.csproj" />
|
||||||
<ProjectReference Include="..\SharedProject\SharedProject.csproj"/>
|
<ProjectReference Include="..\SharedProject\SharedProject.csproj" />
|
||||||
<ProjectReference Include="..\TaikoWebUI\TaikoWebUI.csproj"/>
|
<ProjectReference Include="..\TaikoWebUI\TaikoWebUI.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -1,227 +1,84 @@
|
|||||||
[
|
[
|
||||||
{
|
{
|
||||||
"folderId": 1,
|
"folderId": 1,
|
||||||
"verupNo": 1,
|
"verupNo": 1,
|
||||||
"priority": 1,
|
"priority": 1,
|
||||||
"songNo": []
|
"songNo": []
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"folderId": 2,
|
"folderId": 2,
|
||||||
"verupNo": 1,
|
"verupNo": 1,
|
||||||
"priority": 1,
|
"priority": 1,
|
||||||
"songNo": [
|
"songNo": [
|
||||||
478,
|
478, 153, 200, 482, 511, 672, 675, 646, 644, 645, 676, 671, 479,
|
||||||
153,
|
707, 480, 481, 203, 204, 483, 205, 202, 241, 14, 387, 197, 281, 226,
|
||||||
200,
|
484, 543, 512, 709, 35
|
||||||
482,
|
]
|
||||||
511,
|
},
|
||||||
672,
|
{
|
||||||
675,
|
"folderId": 3,
|
||||||
646,
|
"verupNo": 1,
|
||||||
644,
|
"priority": 1,
|
||||||
645,
|
"songNo": [
|
||||||
676,
|
1485, 1404, 1580, 1730, 1750, 1277, 1478, 1481, 1482, 1484, 1500,
|
||||||
671,
|
1890, 2349, 2604, 2640, 1176, 1419, 1596, 1693, 2248, 1049, 1221,
|
||||||
479,
|
1222, 1223, 1224, 1493, 1578, 1719, 2650, 1595, 1964, 1469, 1217,
|
||||||
707,
|
1314, 1406, 1565, 1745, 2120, 2200, 2324, 2785, 1631, 2301, 2802,
|
||||||
480,
|
1490, 2088, 2268, 2309, 2507, 2126, 1630, 2509, 1263, 2495, 2642,
|
||||||
481,
|
2745, 1054, 2583, 1271, 1266, 1267, 2923
|
||||||
203,
|
]
|
||||||
204,
|
},
|
||||||
483,
|
{
|
||||||
205,
|
"folderId": 4,
|
||||||
202,
|
"verupNo": 1,
|
||||||
241,
|
"priority": 1,
|
||||||
14,
|
"songNo": [
|
||||||
387,
|
1361, 1366, 1373, 1379, 1337, 1345, 1357, 1362, 1367, 1368, 1369,
|
||||||
197,
|
1374, 1375, 1388, 1390, 1579, 2225, 1354, 1394, 2804, 1340, 1341,
|
||||||
281,
|
1370, 1376, 1384, 1359, 1385, 2416, 2756, 1363, 1920, 1353, 1360,
|
||||||
226,
|
1381, 1389, 1364, 1391, 1342, 1546, 1931
|
||||||
484,
|
]
|
||||||
543,
|
},
|
||||||
512,
|
{
|
||||||
709,
|
"folderId": 5,
|
||||||
35
|
"verupNo": 1,
|
||||||
]
|
"priority": 1,
|
||||||
},
|
"songNo": [242, 430, 368, 604, 333]
|
||||||
{
|
},
|
||||||
"folderId": 3,
|
{
|
||||||
"verupNo": 1,
|
"folderId": 6,
|
||||||
"priority": 1,
|
"verupNo": 1,
|
||||||
"songNo": [
|
"priority": 1,
|
||||||
1485,
|
"songNo": [841, 767, 658, 467, 468, 466, 460, 157, 465]
|
||||||
1404,
|
},
|
||||||
1580,
|
{
|
||||||
1730,
|
"folderId": 7,
|
||||||
1750,
|
"verupNo": 1,
|
||||||
1277,
|
"priority": 1,
|
||||||
1478,
|
"songNo": [733, 732, 44, 790, 894]
|
||||||
1481,
|
},
|
||||||
1482,
|
{
|
||||||
1484,
|
"folderId": 8,
|
||||||
1500,
|
"verupNo": 1,
|
||||||
1890,
|
"priority": 1,
|
||||||
2349,
|
"songNo": []
|
||||||
2604,
|
},
|
||||||
2640,
|
{
|
||||||
1176,
|
"folderId": 12,
|
||||||
1419,
|
"verupNo": 1,
|
||||||
1596,
|
"priority": 1,
|
||||||
1693,
|
"songNo": []
|
||||||
2248,
|
},
|
||||||
1049,
|
{
|
||||||
1221,
|
"folderId": 13,
|
||||||
1222,
|
"verupNo": 1,
|
||||||
1223,
|
"priority": 1,
|
||||||
1224,
|
"songNo": []
|
||||||
1493,
|
},
|
||||||
1578,
|
{
|
||||||
1719,
|
"folderId": 14,
|
||||||
2650,
|
"verupNo": 1,
|
||||||
1595,
|
"priority": 1,
|
||||||
1964,
|
"songNo": []
|
||||||
1469,
|
}
|
||||||
1217,
|
|
||||||
1314,
|
|
||||||
1406,
|
|
||||||
1565,
|
|
||||||
1745,
|
|
||||||
2120,
|
|
||||||
2200,
|
|
||||||
2324,
|
|
||||||
2785,
|
|
||||||
1631,
|
|
||||||
2301,
|
|
||||||
2802,
|
|
||||||
1490,
|
|
||||||
2088,
|
|
||||||
2268,
|
|
||||||
2309,
|
|
||||||
2507,
|
|
||||||
2126,
|
|
||||||
1630,
|
|
||||||
2509,
|
|
||||||
1263,
|
|
||||||
2495,
|
|
||||||
2642,
|
|
||||||
2745,
|
|
||||||
1054,
|
|
||||||
2583,
|
|
||||||
1271,
|
|
||||||
1266,
|
|
||||||
1267,
|
|
||||||
2923
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"folderId": 4,
|
|
||||||
"verupNo": 1,
|
|
||||||
"priority": 1,
|
|
||||||
"songNo": [
|
|
||||||
1361,
|
|
||||||
1366,
|
|
||||||
1373,
|
|
||||||
1379,
|
|
||||||
1337,
|
|
||||||
1345,
|
|
||||||
1357,
|
|
||||||
1362,
|
|
||||||
1367,
|
|
||||||
1368,
|
|
||||||
1369,
|
|
||||||
1374,
|
|
||||||
1375,
|
|
||||||
1388,
|
|
||||||
1390,
|
|
||||||
1579,
|
|
||||||
2225,
|
|
||||||
1354,
|
|
||||||
1394,
|
|
||||||
2804,
|
|
||||||
1340,
|
|
||||||
1341,
|
|
||||||
1370,
|
|
||||||
1376,
|
|
||||||
1384,
|
|
||||||
1359,
|
|
||||||
1385,
|
|
||||||
2416,
|
|
||||||
2756,
|
|
||||||
1363,
|
|
||||||
1920,
|
|
||||||
1353,
|
|
||||||
1360,
|
|
||||||
1381,
|
|
||||||
1389,
|
|
||||||
1364,
|
|
||||||
1391,
|
|
||||||
1342,
|
|
||||||
1546,
|
|
||||||
1931
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"folderId": 5,
|
|
||||||
"verupNo": 1,
|
|
||||||
"priority": 1,
|
|
||||||
"songNo": [
|
|
||||||
242,
|
|
||||||
430,
|
|
||||||
368,
|
|
||||||
604,
|
|
||||||
333
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"folderId": 6,
|
|
||||||
"verupNo": 1,
|
|
||||||
"priority": 1,
|
|
||||||
"songNo": [
|
|
||||||
841,
|
|
||||||
767,
|
|
||||||
658,
|
|
||||||
467,
|
|
||||||
468,
|
|
||||||
466,
|
|
||||||
460,
|
|
||||||
157,
|
|
||||||
465
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"folderId": 7,
|
|
||||||
"verupNo": 1,
|
|
||||||
"priority": 1,
|
|
||||||
"songNo": [
|
|
||||||
733,
|
|
||||||
732,
|
|
||||||
44,
|
|
||||||
790,
|
|
||||||
894
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"folderId": 8,
|
|
||||||
"verupNo": 1,
|
|
||||||
"priority": 1,
|
|
||||||
"songNo": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"folderId": 12,
|
|
||||||
"verupNo": 1,
|
|
||||||
"priority": 1,
|
|
||||||
"songNo": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"folderId": 13,
|
|
||||||
"verupNo": 1,
|
|
||||||
"priority": 1,
|
|
||||||
"songNo": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"folderId": 14,
|
|
||||||
"verupNo": 1,
|
|
||||||
"priority": 1,
|
|
||||||
"songNo": []
|
|
||||||
}
|
|
||||||
]
|
]
|
||||||
|
|||||||
@ -1,134 +1,74 @@
|
|||||||
[
|
[
|
||||||
{
|
{
|
||||||
"setId": 1,
|
"setId":1,
|
||||||
"verupNo": 1,
|
"verupNo":1,
|
||||||
"mainSongNo": 895,
|
"mainSongNo":895,
|
||||||
"subSongNo": [
|
"subSongNo":[894,732,44,921]
|
||||||
894,
|
|
||||||
732,
|
|
||||||
44,
|
|
||||||
921
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"setId": 2,
|
"setId":2,
|
||||||
"verupNo": 1,
|
"verupNo":1,
|
||||||
"mainSongNo": 912,
|
"mainSongNo":912,
|
||||||
"subSongNo": [
|
"subSongNo":[827,871,36,227]
|
||||||
827,
|
|
||||||
871,
|
|
||||||
36,
|
|
||||||
227
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"setId": 3,
|
"setId":3,
|
||||||
"verupNo": 1,
|
"verupNo":1,
|
||||||
"mainSongNo": 913,
|
"mainSongNo":913,
|
||||||
"subSongNo": [
|
"subSongNo":[460,916,430,872]
|
||||||
460,
|
|
||||||
916,
|
|
||||||
430,
|
|
||||||
872
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"setId": 4,
|
"setId":4,
|
||||||
"verupNo": 1,
|
"verupNo":1,
|
||||||
"mainSongNo": 842,
|
"mainSongNo":842,
|
||||||
"subSongNo": [
|
"subSongNo":[7,233,256,831]
|
||||||
7,
|
|
||||||
233,
|
|
||||||
256,
|
|
||||||
831
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"setId": 5,
|
"setId":5,
|
||||||
"verupNo": 1,
|
"verupNo":1,
|
||||||
"mainSongNo": 947,
|
"mainSongNo":947,
|
||||||
"subSongNo": [
|
"subSongNo":[926,882,730,695]
|
||||||
926,
|
|
||||||
882,
|
|
||||||
730,
|
|
||||||
695
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"setId": 6,
|
"setId":6,
|
||||||
"verupNo": 1,
|
"verupNo":1,
|
||||||
"mainSongNo": 937,
|
"mainSongNo":937,
|
||||||
"subSongNo": [
|
"subSongNo":[828,925,474,924]
|
||||||
828,
|
|
||||||
925,
|
|
||||||
474,
|
|
||||||
924
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"setId": 7,
|
"setId":7,
|
||||||
"verupNo": 1,
|
"verupNo":1,
|
||||||
"mainSongNo": 956,
|
"mainSongNo":956,
|
||||||
"subSongNo": [
|
"subSongNo":[839,255,285,187]
|
||||||
839,
|
|
||||||
255,
|
|
||||||
285,
|
|
||||||
187
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"setId": 8,
|
"setId":8,
|
||||||
"verupNo": 1,
|
"verupNo":1,
|
||||||
"mainSongNo": 923,
|
"mainSongNo":923,
|
||||||
"subSongNo": [
|
"subSongNo":[729,873,789,893]
|
||||||
729,
|
|
||||||
873,
|
|
||||||
789,
|
|
||||||
893
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"setId": 9,
|
"setId":9,
|
||||||
"verupNo": 1,
|
"verupNo":1,
|
||||||
"mainSongNo": 915,
|
"mainSongNo":915,
|
||||||
"subSongNo": [
|
"subSongNo":[726,811,711,303]
|
||||||
726,
|
|
||||||
811,
|
|
||||||
711,
|
|
||||||
303
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"setId": 10,
|
"setId":10,
|
||||||
"verupNo": 1,
|
"verupNo":1,
|
||||||
"mainSongNo": 885,
|
"mainSongNo":885,
|
||||||
"subSongNo": [
|
"subSongNo":[837,464,801,18]
|
||||||
837,
|
|
||||||
464,
|
|
||||||
801,
|
|
||||||
18
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"setId": 11,
|
"setId":11,
|
||||||
"verupNo": 1,
|
"verupNo":1,
|
||||||
"mainSongNo": 898,
|
"mainSongNo":898,
|
||||||
"subSongNo": [
|
"subSongNo":[47,135,374,792]
|
||||||
47,
|
|
||||||
135,
|
|
||||||
374,
|
|
||||||
792
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"setId": 12,
|
"setId":12,
|
||||||
"verupNo": 1,
|
"verupNo":1,
|
||||||
"mainSongNo": 948,
|
"mainSongNo":948,
|
||||||
"subSongNo": [
|
"subSongNo":[412,538,411,413]
|
||||||
412,
|
|
||||||
538,
|
|
||||||
411,
|
|
||||||
413
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@ -1,6 +1,6 @@
|
|||||||
[
|
[
|
||||||
{
|
{
|
||||||
"movie_id": 0,
|
"movie_id": 0,
|
||||||
"enable_days": 0
|
"enable_days": 0
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@ -7,44 +7,44 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Autocomplete.Clients" Version="1.1.0"/>
|
<PackageReference Include="Autocomplete.Clients" Version="1.1.0" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.9"/>
|
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.9" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.9" PrivateAssets="all"/>
|
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.9" PrivateAssets="all" />
|
||||||
<PackageReference Include="MudBlazor" Version="6.0.15"/>
|
<PackageReference Include="MudBlazor" Version="6.0.15" />
|
||||||
<PackageReference Include="SharpZipLib" Version="1.4.0"/>
|
<PackageReference Include="SharpZipLib" Version="1.4.0" />
|
||||||
<PackageReference Include="Swan.Core" Version="6.0.2-beta.90"/>
|
<PackageReference Include="Swan.Core" Version="6.0.2-beta.90" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\SharedProject\SharedProject.csproj"/>
|
<ProjectReference Include="..\SharedProject\SharedProject.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Content Update="wwwroot\data\musicinfo.bin">
|
<Content Update="wwwroot\data\musicinfo.bin">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Update="wwwroot\data\music_order.bin">
|
<Content Update="wwwroot\data\music_order.bin">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Update="wwwroot\data\wordlist.bin">
|
<Content Update="wwwroot\data\wordlist.bin">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Update="wwwroot\data\music_attribute.bin">
|
<Content Update="wwwroot\data\music_attribute.bin">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Update="wwwroot\data\music_order.json">
|
<Content Update="wwwroot\data\music_order.json">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Update="wwwroot\data\musicinfo.json">
|
<Content Update="wwwroot\data\musicinfo.json">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Update="wwwroot\data\wordlist.json">
|
<Content Update="wwwroot\data\wordlist.json">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Folder Include="wwwroot\data"/>
|
<Folder Include="wwwroot\data" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -2,25 +2,25 @@
|
|||||||
<html>
|
<html>
|
||||||
|
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8"/>
|
<meta charset="utf-8" />
|
||||||
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport"/>
|
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
|
||||||
<title>TaikoWebUI</title>
|
<title>TaikoWebUI</title>
|
||||||
<base href="/"/>
|
<base href="/" />
|
||||||
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" rel="stylesheet"/>
|
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" rel="stylesheet" />
|
||||||
<link href="_content/MudBlazor/MudBlazor.min.css" rel="stylesheet"/>
|
<link href="_content/MudBlazor/MudBlazor.min.css" rel="stylesheet" />
|
||||||
<link href="style.overrides.css" rel="stylesheet"/>
|
<link href="style.overrides.css" rel="stylesheet" />
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<div id="app">Loading...</div>
|
<div id="app">Loading...</div>
|
||||||
|
|
||||||
<div id="blazor-error-ui">
|
<div id="blazor-error-ui">
|
||||||
An unhandled error has occurred.
|
An unhandled error has occurred.
|
||||||
<a class="reload" href="">Reload</a>
|
<a href="" class="reload">Reload</a>
|
||||||
<a class="dismiss">🗙</a>
|
<a class="dismiss">🗙</a>
|
||||||
</div>
|
</div>
|
||||||
<script src="_framework/blazor.webassembly.js"></script>
|
<script src="_framework/blazor.webassembly.js"></script>
|
||||||
<script src="_content/MudBlazor/MudBlazor.min.js"></script>
|
<script src="_content/MudBlazor/MudBlazor.min.js"></script>
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
||||||
@ -3,7 +3,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.mud-progress-linear.bar-pass-gold .mud-progress-linear-bars .mud-progress-linear-bar {
|
.mud-progress-linear.bar-pass-gold .mud-progress-linear-bars .mud-progress-linear-bar {
|
||||||
background: linear-gradient(90deg, rgb(255, 83, 147) 0%, rgb(255, 248, 6) 15%, rgb(255, 248, 6) 20%, rgb(122, 255, 79) 30%, rgb(122, 244, 255) 45%, rgb(149, 104, 255) 70%, rgb(255, 98, 244) 90%, rgb(255, 98, 244) 95%, rgb(255, 83, 147) 100%);
|
background: linear-gradient( 90deg, rgb(255,83,147) 0%, rgb(255,248,6) 15%, rgb(255,248,6) 20%, rgb(122,255,79) 30%, rgb(122,244,255) 45%, rgb(149,104,255) 70%, rgb(255,98,244) 90%, rgb(255,98,244) 95%, rgb(255,83,147) 100% );
|
||||||
}
|
}
|
||||||
|
|
||||||
.mud-progress-linear.bar-pass-red .mud-progress-linear-bars .mud-progress-linear-bar {
|
.mud-progress-linear.bar-pass-red .mud-progress-linear-bars .mud-progress-linear-bar {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user