diff --git a/Qwilight/View/AvatarWindow.xaml b/Qwilight/View/AvatarWindow.xaml index 92c4bbe..85bc801 100644 --- a/Qwilight/View/AvatarWindow.xaml +++ b/Qwilight/View/AvatarWindow.xaml @@ -378,15 +378,8 @@ - - - - - - - - - + + @@ -420,15 +413,8 @@ - - - - - - - - - + + diff --git a/Qwilight/View/MainWindow/DefaultMode/EntryView.xaml b/Qwilight/View/MainWindow/DefaultMode/EntryView.xaml index e022ea7..93c7772 100644 --- a/Qwilight/View/MainWindow/DefaultMode/EntryView.xaml +++ b/Qwilight/View/MainWindow/DefaultMode/EntryView.xaml @@ -51,25 +51,22 @@ - - - - - - + + + @@ -91,18 +88,19 @@ - - - + - + + + + diff --git a/Qwilight/ViewModel/AvatarViewModel.cs b/Qwilight/ViewModel/AvatarViewModel.cs index 0e07374..7be9757 100644 --- a/Qwilight/ViewModel/AvatarViewModel.cs +++ b/Qwilight/ViewModel/AvatarViewModel.cs @@ -183,20 +183,6 @@ set => SetProperty(ref _isLevelVSLoading, value, nameof(IsLevelVSLoading)); } - public string AvatarLevelVSCountText - { - get => _avatarLevelVSCountText; - - set => SetProperty(ref _avatarLevelVSCountText, value, nameof(AvatarLevelVSCountText)); - } - - public string TargetLevelVSCountText - { - get => _targetLevelVSCountText; - - set => SetProperty(ref _targetLevelVSCountText, value, nameof(TargetLevelVSCountText)); - } - public override double TargetHeight => 0.9; public override VerticalAlignment HeightSystem => VerticalAlignment.Top; @@ -251,8 +237,6 @@ string _levelVSMyAvatarName; AvatarWww _levelVSTargetAvatarWww; string _levelVSTargetAvatarName; - string _avatarLevelVSCountText; - string _targetLevelVSCountText; LevelVSLevelIDItem _levelVSLevelIDItem; bool _isLevelVSLoading; @@ -729,12 +713,6 @@ }); } LevelVSLevelIDItemValue = LevelVSLevelIDItemCollection.FirstOrDefault(); - - var twilightWwwAvatarLevelVSs = twilightWwwAvatarLevelVSMap.Where(pair => pair.Key != "*").Select(pair => pair.Value).ToArray(); - var avatarLevelVSCount = twilightWwwAvatarLevelVSs.Sum(twilightWwwAvatarLevelVS => twilightWwwAvatarLevelVS.avatarLevelVSCount); - var targetLevelVSCount = twilightWwwAvatarLevelVSs.Sum(twilightWwwAvatarLevelVS => twilightWwwAvatarLevelVS.targetLevelVSCount); - AvatarLevelVSCountText = $"{avatarLevelVSCount}{(avatarLevelVSCount > targetLevelVSCount ? " 👑" : string.Empty)}"; - TargetLevelVSCountText = $"{targetLevelVSCount}{(targetLevelVSCount > avatarLevelVSCount ? " 👑" : string.Empty)}"; } IsLevelVSLoading = false; }