diff --git a/src/Snap.Hutao/Snap.Hutao/Model/InterChange/Achievement/UIAF.cs b/src/Snap.Hutao/Snap.Hutao/Model/InterChange/Achievement/UIAF.cs index 58aa97d2..cc8fbe82 100644 --- a/src/Snap.Hutao/Snap.Hutao/Model/InterChange/Achievement/UIAF.cs +++ b/src/Snap.Hutao/Snap.Hutao/Model/InterChange/Achievement/UIAF.cs @@ -22,12 +22,14 @@ public class UIAF /// /// 信息 /// + [JsonPropertyName("info")] [JsonIgnore(Condition = JsonIgnoreCondition.Never)] public UIAFInfo Info { get; set; } = default!; /// /// 列表 /// + [JsonPropertyName("list")] public List List { get; set; } = default!; /// diff --git a/src/Snap.Hutao/Snap.Hutao/Model/InterChange/Achievement/UIAFItem.cs b/src/Snap.Hutao/Snap.Hutao/Model/InterChange/Achievement/UIAFItem.cs index ec85a5ab..fd97e80c 100644 --- a/src/Snap.Hutao/Snap.Hutao/Model/InterChange/Achievement/UIAFItem.cs +++ b/src/Snap.Hutao/Snap.Hutao/Model/InterChange/Achievement/UIAFItem.cs @@ -13,21 +13,25 @@ public class UIAFItem /// /// 成就Id /// + [JsonPropertyName("id")] public int Id { get; set; } /// /// 完成时间 /// + [JsonPropertyName("timestamp")] public long Timestamp { get; set; } /// /// 当前值 /// 对于progress为1的项,该属性始终为0 /// + [JsonPropertyName("current")] public int Current { get; set; } /// /// 完成状态 /// + [JsonPropertyName("status")] public AchievementInfoStatus Status { get; set; } } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/UrlProvider/GachaLogUrlWebCacheProvider.cs b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/UrlProvider/GachaLogUrlWebCacheProvider.cs index ef22692d..f47a26c3 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/UrlProvider/GachaLogUrlWebCacheProvider.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/UrlProvider/GachaLogUrlWebCacheProvider.cs @@ -25,12 +25,6 @@ internal class GachaLogUrlWebCacheProvider : IGachaLogUrlProvider this.gameService = gameService; } - private enum UrlMatch - { - Chinese, - Oversea, - } - /// public string Name { get => nameof(GachaLogUrlWebCacheProvider); } @@ -41,11 +35,12 @@ internal class GachaLogUrlWebCacheProvider : IGachaLogUrlProvider /// 缓存文件路径 public static string GetCacheFile(string path) { - string folder = Path.GetDirectoryName(path) ?? string.Empty; - string cacheDataPathChinese = Path.Combine(folder, @"YuanShen_Data\webCaches\Cache\Cache_Data\data_2"); - string cacheDataPathOversea = Path.Combine(folder, @"GenshinImpact_Data\webCaches\Cache\Cache_Data\data_2"); + string exeName = Path.GetFileName(path); + string dataFolder = exeName == GameConstants.GenshinImpactFileName + ? GameConstants.GenshinImpactData + : GameConstants.YuanShenData; - return File.Exists(cacheDataPathChinese) ? cacheDataPathChinese : cacheDataPathOversea; + return Path.Combine(Path.GetDirectoryName(path)!, dataFolder, @"webCaches\Cache\Cache_Data\data_2"); } /// @@ -98,4 +93,4 @@ internal class GachaLogUrlWebCacheProvider : IGachaLogUrlProvider return null; } -} +} \ No newline at end of file