fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 18:47:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复访问api获取关卡信息失败报错

Browse Source
This commit is contained in:
uye
2023-01-10 18:32:11 +08:00
parent 4b882c1aae
commit 6a4cab7fb2
1 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/MaaWpfGui/Helper/StageManager.cs
View File

@@ -54,37 +54,14 @@ namespace MaaWpfGui
"yyyy/MM/dd HH:mm:ss",
CultureInfo.InvariantCulture).AddHours(-Convert.ToInt32(keyValuePairs?["TimeZone"].ToString() ?? "0"));
try
{
var resource = activity["Official"]["resourceCollection"];
resourceCollection.Tip = resource?["Tip"]?.ToString();
resourceCollection.UtcStartTime = GetDateTime(resource, "UtcStartTime");
resourceCollection.UtcExpireTime = GetDateTime(resource, "UtcExpireTime");
}
catch
{
// DoNothing
}
foreach (var stageObj in activity["Official"]["sideStoryStage"] as JArray)
if (activity?["Official"]?["resourceCollection"] is JToken)
{
try
{
_stages.Add(
stageObj["Value"].ToString(),
new StageInfo
{
Display = stageObj["Display"].ToString(),
Value = stageObj["Value"].ToString(),
Drop = stageObj["Drop"].ToString(),
Activity = new StageActivityInfo()
{
Tip = stageObj["Activity"]["Tip"].ToString(),
StageName = stageObj["Activity"]["StageName"].ToString(),
UtcStartTime = GetDateTime(stageObj["Activity"], "UtcStartTime"),
UtcExpireTime = GetDateTime(stageObj["Activity"], "UtcExpireTime"),
},
});
var resource = activity["Official"]["resourceCollection"];
resourceCollection.Tip = resource?["Tip"]?.ToString();
resourceCollection.UtcStartTime = GetDateTime(resource, "UtcStartTime");
resourceCollection.UtcExpireTime = GetDateTime(resource, "UtcExpireTime");
}
catch
{
@@ -92,6 +69,35 @@ namespace MaaWpfGui
}
}
if (activity?["Official"]?["sideStoryStage"] is JArray)
{
foreach (var stageObj in activity["Official"]["sideStoryStage"])
{
try
{
_stages.Add(
stageObj["Value"].ToString(),
new StageInfo
{
Display = stageObj?["Display"]?.ToString() ?? string.Empty,
Value = stageObj["Value"].ToString(),
Drop = stageObj?["Drop"]?.ToString(),
Activity = new StageActivityInfo()
{
Tip = stageObj["Activity"]?["Tip"]?.ToString(),
StageName = stageObj["Activity"]?["StageName"]?.ToString(),
UtcStartTime = GetDateTime(stageObj["Activity"], "UtcStartTime"),
UtcExpireTime = GetDateTime(stageObj["Activity"], "UtcExpireTime"),
},
});
}
catch
{
// DoNothing
}
}
}
foreach (var kvp in new Dictionary<string, StageInfo>
{
// 主线关卡