diff --git a/Qwilight/JSON.cs b/Qwilight/JSON.cs index 970b863..4afb076 100644 --- a/Qwilight/JSON.cs +++ b/Qwilight/JSON.cs @@ -793,15 +793,12 @@ public long date; public int[] avatarLevels; public double avatarAbility5K; - public double avatarAbility5KClass; public int avatarAbility5KPlace; public int avatarAbility5KCount; public double avatarAbility7K; - public double avatarAbility7KClass; public int avatarAbility7KPlace; public int avatarAbility7KCount; public double avatarAbility9K; - public double avatarAbility9KClass; public int avatarAbility9KPlace; public int avatarAbility9KCount; public string[] levelNames; diff --git a/Qwilight/ViewModel/AvatarViewModel.cs b/Qwilight/ViewModel/AvatarViewModel.cs index b2777a4..2ea55ce 100644 --- a/Qwilight/ViewModel/AvatarViewModel.cs +++ b/Qwilight/ViewModel/AvatarViewModel.cs @@ -1193,10 +1193,9 @@ OnPropertyChanged(nameof(AvatarViewLevelText)); OnPropertyChanged(nameof(AvatarViewLevelValue)); - var avatarAbility5KClass = twilightWwwAvatarValue.avatarAbility5KClass; try { - AbilityClass5KDrawing = DrawingSystem.Instance.LoadDefault(await TwilightSystem.Instance.GetWwwParallel($"{QwilightComponent.QwilightAPI}/drawing?abilityClass5K={(avatarAbility5KClass < 0 ? avatarAbility5KClass : 100 * avatarAbility5KClass)}"), null); + AbilityClass5KDrawing = DrawingSystem.Instance.LoadDefault(await TwilightSystem.Instance.GetWwwParallel($"{QwilightComponent.QwilightAPI}/drawing?abilityClass5K={twilightWwwAvatarValue.avatarAbility5K}"), null); } catch { @@ -1214,10 +1213,9 @@ _avatarAbility5K = twilightWwwAvatarValue.avatarAbility5K; OnPropertyChanged(nameof(AvatarViewAbility5KText)); - var avatarAbility7KClass = twilightWwwAvatarValue.avatarAbility7KClass; try { - AbilityClass7KDrawing = DrawingSystem.Instance.LoadDefault(await TwilightSystem.Instance.GetWwwParallel($"{QwilightComponent.QwilightAPI}/drawing?abilityClass7K={(avatarAbility7KClass < 0 ? avatarAbility7KClass : 100 * avatarAbility7KClass)}"), null); + AbilityClass7KDrawing = DrawingSystem.Instance.LoadDefault(await TwilightSystem.Instance.GetWwwParallel($"{QwilightComponent.QwilightAPI}/drawing?abilityClass7K={twilightWwwAvatarValue.avatarAbility7K}"), null); } catch { @@ -1235,10 +1233,9 @@ _avatarAbility7K = twilightWwwAvatarValue.avatarAbility7K; OnPropertyChanged(nameof(AvatarViewAbility7KText)); - var avatarAbility9KClass = twilightWwwAvatarValue.avatarAbility9KClass; try { - AbilityClass9KDrawing = DrawingSystem.Instance.LoadDefault(await TwilightSystem.Instance.GetWwwParallel($"{QwilightComponent.QwilightAPI}/drawing?abilityClass9K={(avatarAbility9KClass < 0 ? avatarAbility9KClass : 100 * avatarAbility9KClass)}"), null); + AbilityClass9KDrawing = DrawingSystem.Instance.LoadDefault(await TwilightSystem.Instance.GetWwwParallel($"{QwilightComponent.QwilightAPI}/drawing?abilityClass9K={twilightWwwAvatarValue.avatarAbility9K}"), null); } catch {