Update a bit
This commit is contained in:
parent
aa6499866f
commit
372c972ea7
@ -4,17 +4,8 @@
|
|||||||
"BaseServer": {
|
"BaseServer": {
|
||||||
"Url": "http://0.0.0.0:5000"
|
"Url": "http://0.0.0.0:5000"
|
||||||
},
|
},
|
||||||
"AmAuthServer": {
|
|
||||||
"Url": "http://0.0.0.0:80"
|
|
||||||
},
|
|
||||||
"MuchaServer": {
|
|
||||||
"Url": "https://0.0.0.0:10122"
|
|
||||||
},
|
|
||||||
"GameServer1": {
|
"GameServer1": {
|
||||||
"Url": "https://0.0.0.0:57402"
|
"Url": "https://0.0.0.0:57402"
|
||||||
},
|
|
||||||
"GameServer2": {
|
|
||||||
"Url": "https://0.0.0.0:54431"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Certificates": {
|
"Certificates": {
|
||||||
|
@ -118,6 +118,7 @@ public class BaidController : BaseController<BaidController>
|
|||||||
PlayerType = 0,
|
PlayerType = 0,
|
||||||
Baid = baid,
|
Baid = baid,
|
||||||
MydonName = userData.MyDonName,
|
MydonName = userData.MyDonName,
|
||||||
|
MydonNameLanguage = 4,
|
||||||
Title = userData.Title,
|
Title = userData.Title,
|
||||||
TitleplateId = userData.TitlePlateId,
|
TitleplateId = userData.TitlePlateId,
|
||||||
ColorFace = userData.ColorFace,
|
ColorFace = userData.ColorFace,
|
||||||
|
@ -24,23 +24,19 @@ 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 lockedSongsList = gameDataService.GetLockedSongsList();
|
|
||||||
var enabledMusicList = gameDataService.GetMusicList().Except(lockedSongsList);
|
|
||||||
var enabledUraMusicList = gameDataService.GetMusicWithUraList().Except(lockedSongsList);
|
|
||||||
|
|
||||||
var enabledArray =
|
var enabledArray =
|
||||||
FlagCalculator.GetBitArrayFromIds(enabledMusicList, songIdMax, Logger);
|
FlagCalculator.GetBitArrayFromIds(gameDataService.GetMusicList(), songIdMax, Logger);
|
||||||
var uraReleaseBit = FlagCalculator.GetBitArrayFromIds(enabledUraMusicList, songIdMax, Logger);
|
|
||||||
|
|
||||||
var movieDataDictionary = gameDataService.GetMovieDataDictionary();
|
var defaultSongWithUraList = gameDataService.GetMusicWithUraList();
|
||||||
|
var uraReleaseBit =
|
||||||
|
FlagCalculator.GetBitArrayFromIds(defaultSongWithUraList, songIdMax, Logger);
|
||||||
|
|
||||||
var verupNo1 = new uint[] { 104 };
|
var verupNo1 = new uint[] { 2, 3, 4, 5, 6, 7, 8, 13, 15, 24, 25, 26, 27, 28, 29, 30, 31, 104 };
|
||||||
var aryVerUp = verupNo1.Select(i => new InitialdatacheckResponse.VerupNoData1
|
var aryVerUp = verupNo1.Select(i => new InitialdatacheckResponse.VerupNoData1
|
||||||
{
|
{
|
||||||
MasterType = i,
|
MasterType = i,
|
||||||
VerupNo = 1
|
VerupNo = 1
|
||||||
})
|
})
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
var response = new InitialdatacheckResponse
|
var response = new InitialdatacheckResponse
|
||||||
@ -51,9 +47,6 @@ public class InitialDataCheckController : BaseController<InitialDataCheckControl
|
|||||||
UraReleaseBit = uraReleaseBit,
|
UraReleaseBit = uraReleaseBit,
|
||||||
SongIntroductionEndDatetime = DateTime.Now.AddYears(10).ToString(Constants.DATE_TIME_FORMAT),
|
SongIntroductionEndDatetime = DateTime.Now.AddYears(10).ToString(Constants.DATE_TIME_FORMAT),
|
||||||
};
|
};
|
||||||
|
|
||||||
foreach (var movieData in movieDataDictionary) response.AryMovieInfoes.Add(movieData.Value);
|
|
||||||
|
|
||||||
response.AryVerupNoData1s.AddRange(aryVerUp);
|
response.AryVerupNoData1s.AddRange(aryVerUp);
|
||||||
|
|
||||||
var danData = new List<InitialdatacheckResponse.VerupNoData2.InformationData>();
|
var danData = new List<InitialdatacheckResponse.VerupNoData2.InformationData>();
|
||||||
@ -65,8 +58,7 @@ public class InitialDataCheckController : BaseController<InitialDataCheckControl
|
|||||||
VerupNo = 1
|
VerupNo = 1
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
var verupNo2 = new uint[] { 11, 101, 102, 103, 105 };
|
||||||
var verupNo2 = new uint[] { 101 };
|
|
||||||
foreach (var i in verupNo2)
|
foreach (var i in verupNo2)
|
||||||
{
|
{
|
||||||
var verUp2 = new InitialdatacheckResponse.VerupNoData2
|
var verUp2 = new InitialdatacheckResponse.VerupNoData2
|
||||||
@ -76,8 +68,8 @@ public class InitialDataCheckController : BaseController<InitialDataCheckControl
|
|||||||
verUp2.AryInformationDatas.AddRange(danData);
|
verUp2.AryInformationDatas.AddRange(danData);
|
||||||
response.AryVerupNoData2s.Add(verUp2);
|
response.AryVerupNoData2s.Add(verUp2);
|
||||||
}
|
}
|
||||||
|
response.AryChassisFunctionIds = new uint[] {1,2,3};
|
||||||
|
|
||||||
response.AryChassisFunctionIds = new uint[] { 1, 2, 3 };
|
|
||||||
|
|
||||||
return Ok(response);
|
return Ok(response);
|
||||||
}
|
}
|
||||||
|
@ -53,6 +53,7 @@ public class MyDonEntryController : BaseController<MyDonEntryController>
|
|||||||
Result = 1,
|
Result = 1,
|
||||||
Baid = newId,
|
Baid = newId,
|
||||||
MydonName = request.MydonName,
|
MydonName = request.MydonName,
|
||||||
|
MydonNameLanguage = 4
|
||||||
};
|
};
|
||||||
|
|
||||||
return Ok(response);
|
return Ok(response);
|
||||||
|
@ -117,15 +117,6 @@ try
|
|||||||
|
|
||||||
|
|
||||||
app.UseHttpLogging();
|
app.UseHttpLogging();
|
||||||
app.MapControllers();
|
|
||||||
app.MapFallbackToFile("index.html");
|
|
||||||
|
|
||||||
app.UseWhen(
|
|
||||||
context => context.Request.Path.StartsWithSegments("/sys/servlet/PowerOn", StringComparison.InvariantCulture),
|
|
||||||
applicationBuilder => applicationBuilder.UseAllNetRequestMiddleware());
|
|
||||||
|
|
||||||
app.Run();
|
|
||||||
|
|
||||||
app.Use(async (context, next) =>
|
app.Use(async (context, next) =>
|
||||||
{
|
{
|
||||||
await next();
|
await next();
|
||||||
@ -136,6 +127,14 @@ try
|
|||||||
context.Connection.RemoteIpAddress, context.Request.Method, context.Request.Path, context.Response.StatusCode);
|
context.Connection.RemoteIpAddress, context.Request.Method, context.Request.Path, context.Response.StatusCode);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
app.MapControllers();
|
||||||
|
app.MapFallbackToFile("index.html");
|
||||||
|
|
||||||
|
app.UseWhen(
|
||||||
|
context => context.Request.Path.StartsWithSegments("/sys/servlet/PowerOn", StringComparison.InvariantCulture),
|
||||||
|
applicationBuilder => applicationBuilder.UseAllNetRequestMiddleware());
|
||||||
|
|
||||||
|
app.Run();
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
@ -64,10 +64,10 @@
|
|||||||
<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.bin">
|
<Content Update="wwwroot\data\music_order.json">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Update="wwwroot\data\musicinfo.bin">
|
<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">
|
||||||
@ -76,7 +76,7 @@
|
|||||||
<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.bin">
|
<Content Update="wwwroot\data\wordlist.json">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
@ -91,7 +91,7 @@
|
|||||||
<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.bin">
|
<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">
|
||||||
|
Loading…
Reference in New Issue
Block a user