update resources, misc changes

This commit is contained in:
Mikhail
2025-04-16 14:48:10 -04:00
parent 56b7ffc4bd
commit 652b7e0598
6 changed files with 21 additions and 25 deletions

View File

@@ -2,17 +2,12 @@
using Microsoft.AspNetCore.Mvc;
using System.Diagnostics;
namespace EpinelPS.Controllers
namespace EpinelPS.Controllers.AdminPanel
{
[Route("admin")]
public class AdminController : Controller
public class AdminController(ILogger<AdminController> logger) : Controller
{
private readonly ILogger<AdminController> _logger;
public AdminController(ILogger<AdminController> logger)
{
_logger = logger;
}
private readonly ILogger<AdminController> _logger = logger;
public static bool CheckAuth(HttpContext context)
{

View File

@@ -5,12 +5,12 @@ using System.Diagnostics;
using System.Security.Cryptography;
using System.Text;
namespace EpinelPS.Controllers
namespace EpinelPS.Controllers.AdminPanel
{
[Route("admin/Users")]
public class UsersController(ILogger<AdminController> logger) : Controller
public class UsersController(ILogger<UsersController> logger) : Controller
{
private readonly ILogger<AdminController> _logger = logger;
private readonly ILogger<UsersController> _logger = logger;
private static readonly MD5 sha = MD5.Create();
public IActionResult Index()
@@ -79,7 +79,7 @@ namespace EpinelPS.Controllers
return NotFound();
}
userToUpdate.Password = Convert.ToHexString(sha.ComputeHash(Encoding.ASCII.GetBytes(newPw))).ToLower(); ;
userToUpdate.Password = Convert.ToHexString(sha.ComputeHash(Encoding.ASCII.GetBytes(newPw))).ToLower();
return View(userToUpdate);
}

View File

@@ -10,11 +10,12 @@ namespace EpinelPS.LobbyServer.LobbyUser
{
var req = await ReadData<ReqSetScenarioComplete>();
var response = new ResSetScenarioComplete();
// Mark the story "scenario" as completed.
// TODO: Get rewards by making a database of them from actual server.
response.Reward = new NetRewardData();
var response = new ResSetScenarioComplete
{
// Mark the story "scenario" as completed.
// TODO: Get rewards by making a database of them from actual server.
Reward = new NetRewardData()
};
var user = JsonDb.GetUser(UserId);

View File

@@ -32,7 +32,7 @@ namespace EpinelPS.Utils
var requestUri = new Uri("https://" + CloudIp + "/" + rawUrl);
using var request = new HttpRequestMessage(HttpMethod.Get, requestUri);
request.Headers.TryAddWithoutValidation("host", "cloud.nikke-kr.com");
using var response = await AssetDownloader.SendAsync(request);
using var response = await AssetDownloader.SendAsync(request, cancellationToken);
if (response.StatusCode == HttpStatusCode.OK)
{
if (!File.Exists(targetFile))

View File

@@ -50,7 +50,7 @@
<footer class="border-top footer text-muted">
<div class="container">
&copy; 2024 - EpinelPS - <a href="https://github.com/MishaProductions/EpinelPS">Source code</a>
&copy; 2025 - EpinelPS - <a href="https://github.com/MishaProductions/EpinelPS">Source code</a>
</div>
</footer>
<script src="/admin/lib/jquery/dist/jquery.min.js"></script>

View File

@@ -1,15 +1,15 @@
{
// Asset Urls for game version 131.10.2
// Extracted from POST https://global-lobby.nikke-kr.com/v1/staticdatapack
"StaticData": {
"Url": "https://cloud.nikke-kr.com/prdenv/131-c60e0497e5/staticdata/data/qa-250327-03b/386618/StaticData.pack",
"Version": "data/qa-250327-03b/386618",
"Salt1": "zgnwS/ZrGQdzgm8SHLKRJ7JPr3zwxoAWQXNGLzZaQLA=",
"Salt2": "wWKFI3Cl6LXOJRrkbN++t5N89VUw9B0yfGMiQ3n+OrE="
"StaticData": {
"Url": "https://cloud.nikke-kr.com/prdenv/131-c4d45cd256/staticdata/data/qa-250410-03b-p1/389398/StaticData.pack",
"Version": "data/qa-250410-03b-p1/389398",
"Salt1": "yuRIVKw6ANm8RhnrTzi6eWDfCT44vDgaDSoSIqPURUA=",
"Salt2": "f5w1sPCN5R0Ro7ixBQq0iZ6sSH7PVv34HNFC0F3h+AU="
},
// Extracted from POST https://global-lobby.nikke-kr.com/v1/resourcehosts2
"ResourceBaseURL": "https://cloud.nikke-kr.com/prdenv/131-b2562bc684/{Platform}",
"ResourceBaseURL": "https://cloud.nikke-kr.com/prdenv/131-bc111f9274/{Platform}",
// Extracted from route config
"GameMinVer": "131.10.1",