From 652b7e0598c00eef933cffd1267bc64985a4731f Mon Sep 17 00:00:00 2001 From: Mikhail Date: Wed, 16 Apr 2025 14:48:10 -0400 Subject: [PATCH] update resources, misc changes --- EpinelPS/Controllers/AdminPanel/AdminController.cs | 11 +++-------- EpinelPS/Controllers/AdminPanel/UsersController.cs | 8 ++++---- .../LobbyServer/LobbyUser/SetScenarioCompleted.cs | 11 ++++++----- EpinelPS/Utils/AssetDownloadUtil.cs | 2 +- EpinelPS/Views/Shared/_Layout.cshtml | 2 +- EpinelPS/gameconfig.json | 12 ++++++------ 6 files changed, 21 insertions(+), 25 deletions(-) diff --git a/EpinelPS/Controllers/AdminPanel/AdminController.cs b/EpinelPS/Controllers/AdminPanel/AdminController.cs index 84ccd66..f67c4fd 100644 --- a/EpinelPS/Controllers/AdminPanel/AdminController.cs +++ b/EpinelPS/Controllers/AdminPanel/AdminController.cs @@ -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 logger) : Controller { - private readonly ILogger _logger; - - public AdminController(ILogger logger) - { - _logger = logger; - } + private readonly ILogger _logger = logger; public static bool CheckAuth(HttpContext context) { diff --git a/EpinelPS/Controllers/AdminPanel/UsersController.cs b/EpinelPS/Controllers/AdminPanel/UsersController.cs index 91df76f..dcb0763 100644 --- a/EpinelPS/Controllers/AdminPanel/UsersController.cs +++ b/EpinelPS/Controllers/AdminPanel/UsersController.cs @@ -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 logger) : Controller + public class UsersController(ILogger logger) : Controller { - private readonly ILogger _logger = logger; + private readonly ILogger _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); } diff --git a/EpinelPS/LobbyServer/LobbyUser/SetScenarioCompleted.cs b/EpinelPS/LobbyServer/LobbyUser/SetScenarioCompleted.cs index ef8b868..aa40b89 100644 --- a/EpinelPS/LobbyServer/LobbyUser/SetScenarioCompleted.cs +++ b/EpinelPS/LobbyServer/LobbyUser/SetScenarioCompleted.cs @@ -10,11 +10,12 @@ namespace EpinelPS.LobbyServer.LobbyUser { var req = await ReadData(); - 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); diff --git a/EpinelPS/Utils/AssetDownloadUtil.cs b/EpinelPS/Utils/AssetDownloadUtil.cs index 0299624..2ff2e7c 100644 --- a/EpinelPS/Utils/AssetDownloadUtil.cs +++ b/EpinelPS/Utils/AssetDownloadUtil.cs @@ -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)) diff --git a/EpinelPS/Views/Shared/_Layout.cshtml b/EpinelPS/Views/Shared/_Layout.cshtml index 8bce6f5..792de80 100644 --- a/EpinelPS/Views/Shared/_Layout.cshtml +++ b/EpinelPS/Views/Shared/_Layout.cshtml @@ -50,7 +50,7 @@ diff --git a/EpinelPS/gameconfig.json b/EpinelPS/gameconfig.json index 24e02b2..07f172b 100644 --- a/EpinelPS/gameconfig.json +++ b/EpinelPS/gameconfig.json @@ -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",