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

feat: 干员识别支持显示精英化等级与潜能

Browse Source
This commit is contained in:
uye
2026-02-01 19:59:08 +08:00
parent 102aa5dc85
commit dd9ce36953
14 changed files with 131 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/MaaWpfGui/MaaWpfGui.csproj
View File

@@ -93,6 +93,7 @@
<Resource Include="Res\Backgrounds\*" />
<Resource Include="Res\Img\*" />
<Resource Include="Res\Img\EasterEgg\*" />
<Resource Include="Res\Img\Operator\*" />
<None Include="..\..\README.md" Pack="True" PackagePath="/" />
</ItemGroup>

BIN
src/MaaWpfGui/Res/Img/Operator/Elite_0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/MaaWpfGui/Res/Img/Operator/Elite_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
src/MaaWpfGui/Res/Img/Operator/Elite_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
src/MaaWpfGui/Res/Img/Operator/Potential_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 625 B

BIN
src/MaaWpfGui/Res/Img/Operator/Potential_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 732 B

BIN
src/MaaWpfGui/Res/Img/Operator/Potential_3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 786 B

BIN
src/MaaWpfGui/Res/Img/Operator/Potential_4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 758 B

BIN
src/MaaWpfGui/Res/Img/Operator/Potential_5.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 681 B

BIN
src/MaaWpfGui/Res/Img/Operator/Potential_6.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

4
src/MaaWpfGui/Res/Themes/Dark.xaml
View File

@@ -92,8 +92,8 @@
<SolidColorBrush x:Key="Star3OperatorLogBrushPotentialFull" Color="#6666CCFF" />
<SolidColorBrush x:Key="Star4OperatorLogBrush" Color="#BB88FF" />
<SolidColorBrush x:Key="Star4OperatorLogBrushPotentialFull" Color="#66BB88FF" />
<SolidColorBrush x:Key="Star5OperatorLogBrush" Color="#FFBB55" />
<SolidColorBrush x:Key="Star5OperatorLogBrushPotentialFull" Color="#66FFBB55" />
<SolidColorBrush x:Key="Star5OperatorLogBrush" Color="#EED694" />
<SolidColorBrush x:Key="Star5OperatorLogBrushPotentialFull" Color="#66EED694" />
<SolidColorBrush x:Key="Star6OperatorLogBrush" Color="Orange" />
<SolidColorBrush x:Key="Star6OperatorLogBrushPotentialFull" Color="#66FFA500" />

4
src/MaaWpfGui/Res/Themes/Light.xaml
View File

@@ -74,8 +74,8 @@
<SolidColorBrush x:Key="Star3OperatorLogBrushPotentialFull" Color="#663399FF" />
<SolidColorBrush x:Key="Star4OperatorLogBrush" Color="#9966FF" />
<SolidColorBrush x:Key="Star4OperatorLogBrushPotentialFull" Color="#669966FF" />
<SolidColorBrush x:Key="Star5OperatorLogBrush" Color="#FFAA33" />
<SolidColorBrush x:Key="Star5OperatorLogBrushPotentialFull" Color="#66FFAA33" />
<SolidColorBrush x:Key="Star5OperatorLogBrush" Color="#EED904" />
<SolidColorBrush x:Key="Star5OperatorLogBrushPotentialFull" Color="#66EED904" />
<SolidColorBrush x:Key="Star6OperatorLogBrush" Color="DarkOrange" />
<SolidColorBrush x:Key="Star6OperatorLogBrushPotentialFull" Color="#66FF8C00" />

79
src/MaaWpfGui/ViewModels/UI/ToolboxViewModel.cs
View File

@@ -910,15 +910,21 @@ public class ToolboxViewModel : Screen
set => SetAndNotify(ref _operBoxInfo, value);
}
private List<OperBoxData.OperData> _operBoxDataArray = [];
/// <summary>
/// Gets OperBoxDataArray from OperBoxHaveList for backward compatibility
/// </summary>
[Obsolete("Use OperBoxHaveList instead")]
public List<OperBoxData.OperData> OperBoxDataArray
{
get => _operBoxDataArray;
set {
SetAndNotify(ref _operBoxDataArray, value);
_operBoxPotential = null; // reset
}
get => [.. OperBoxHaveList.Select(op => new OperBoxData.OperData {
Id = op.Id,
Name = op.Name,
Rarity = op.Rarity,
Elite = op.Elite,
Level = op.Level,
Potential = op.Potential,
Own = true,
})];
}
private Dictionary<string, int>? _operBoxPotential;
@@ -931,12 +937,12 @@ public class ToolboxViewModel : Screen
return _operBoxPotential;
}
_operBoxPotential = OperBoxDataArray.ToDictionary(oper => oper.Id, oper => oper.Potential);
_operBoxPotential = OperBoxHaveList.ToDictionary(oper => oper.Id, oper => oper.Potential);
return _operBoxPotential;
}
}
public class Operator(string id, string name, int rarity)
public class Operator(string id, string name, int rarity, int elite = 0, int level = 0, int potential = 0)
{
[JsonProperty("id")]
public string Id { get; } = id;
@@ -947,6 +953,34 @@ public class ToolboxViewModel : Screen
[JsonProperty("rarity")]
public int Rarity { get; } = rarity;
[JsonProperty("elite")]
public int Elite { get; } = elite;
[JsonProperty("level")]
public int Level { get; } = level;
[JsonProperty("potential")]
public int Potential { get; } = potential;
public string RarityStars => IsPallas ? LocalizationHelper.GetPallasString(6, 6) : new('★', Rarity);
/// <summary>
/// Gets the path to the Elite icon image
/// </summary>
public string EliteIconPath => $"/Res/Img/Operator/Elite_{Elite}.png";
/// <summary>
/// Gets the path to the Potential icon image
/// </summary>
public string PotentialIconPath => Potential > 0 && Potential <= 6
? $"/Res/Img/Operator/Potential_{Potential}.png"
: "/Res/Img/Operator/Potential_1.png";
/// <summary>
/// Gets the resource key based on rarity
/// </summary>
public string RarityColorResourceKey => IsPallas ? "HiddenMedalBrush" : $"Star{Rarity}OperatorLogBrush";
public bool Equals(Operator? other) => other != null && Name == other.Name && Rarity == other.Rarity;
public override bool Equals(object? obj) => obj is Operator other && Equals(other);
@@ -954,6 +988,8 @@ public class ToolboxViewModel : Screen
public override int GetHashCode() => HashCode.Combine(Id, Name, Rarity);
public override string ToString() => $"{Name} (★{Rarity})";
private bool IsPallas => Id == "char_485_pallas";
}
private ObservableCollection<Operator> _operBoxHaveList = [];
@@ -998,16 +1034,15 @@ public class ToolboxViewModel : Screen
return;
}
OperBoxDataArray = ownOpers;
var ids = ownOpers.Select(o => o.Id).ToHashSet();
var operDataMap = ownOpers.ToDictionary(o => o.Id);
foreach (var (id, oper) in DataHelper.Operators)
{
if (DataHelper.IsCharacterAvailableInClient(oper, SettingsViewModel.GameSettings.ClientType))
{
var name = DataHelper.GetLocalizedCharacterName(oper) ?? "???";
if (ids.Contains(id))
if (operDataMap.TryGetValue(id, out var operData))
{
OperBoxHaveList.Add(new Operator(id, name, oper.Rarity));
OperBoxHaveList.Add(new Operator(id, name, oper.Rarity, operData.Elite, operData.Level, operData.Potential));
if (id == "char_485_pallas")
{
@@ -1050,7 +1085,7 @@ public class ToolboxViewModel : Screen
if (_tempOperHaveSet.Add(oper.Id))
{
var name = DataHelper.GetLocalizedCharacterName(DataHelper.Operators.FirstOrDefault(i => i.Key == oper.Id).Value) ?? "???";
OperBoxHaveList.Add(new Operator(oper.Id, name, oper.Rarity));
OperBoxHaveList.Add(new Operator(oper.Id, name, oper.Rarity, oper.Elite, oper.Level, oper.Potential));
if (oper.Id == "char_485_pallas")
{
AchievementTrackerHelper.Instance.Unlock(AchievementIds.WarehouseKeeper);
@@ -1079,7 +1114,6 @@ public class ToolboxViewModel : Screen
}
OperBoxInfo = $"{LocalizationHelper.GetString("IdentificationCompleted")}\n{LocalizationHelper.GetString("OperBoxRecognitionTip")}";
OperBoxDataArray = ownOpers;
SaveOperBoxDetails(ownOpers);
_tempOperHaveSet = [];
return true;
@@ -1119,13 +1153,13 @@ public class ToolboxViewModel : Screen
[UsedImplicitly]
public void ExportOperBox()
{
if (OperBoxDataArray.Count == 0)
if (OperBoxHaveList.Count == 0)
{
return;
}
var exportList = new List<OperBoxData.OperData>();
var userOperMap = OperBoxDataArray.ToDictionary(op => op.Id);
var userOperMap = OperBoxHaveList.ToDictionary(op => op.Id);
foreach (var (operId, operInfo) in DataHelper.Operators)
{
@@ -1137,7 +1171,15 @@ public class ToolboxViewModel : Screen
var operName = DataHelper.GetLocalizedCharacterName(operInfo) ?? "???";
if (userOperMap.TryGetValue(operId, out var value))
{
exportList.Add(value);
exportList.Add(new OperBoxData.OperData() {
Id = value.Id,
Name = value.Name,
Rarity = value.Rarity,
Elite = value.Elite,
Level = value.Level,
Potential = value.Potential,
Own = true,
});
}
else
{
@@ -1145,6 +1187,7 @@ public class ToolboxViewModel : Screen
Id = operId,
Name = operName,
Rarity = operInfo.Rarity,
Own = false,
});
}
}

79
src/MaaWpfGui/Views/UI/ToolboxView.xaml
View File

@@ -255,13 +255,20 @@
BorderBrush="{DynamicResource BorderBrush}"
BorderThickness="1"
CornerRadius="4">
<controls:TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="13"
Text="{Binding Name}"
TextAlignment="Center"
TextWrapping="Wrap" />
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<controls:TextBlock
HorizontalAlignment="Center"
FontSize="13"
Text="{Binding Name}"
TextAlignment="Center"
TextWrapping="Wrap" />
<controls:TextBlock
HorizontalAlignment="Center"
uiBehaviors:ResourceReferenceHelper.ForegroundResourceKey="{Binding RarityColorResourceKey}"
FontSize="11"
Text="{Binding RarityStars}"
TextAlignment="Center" />
</StackPanel>
</Border>
</DataTemplate>
</ItemsControl.ItemTemplate>
@@ -290,13 +297,57 @@
BorderBrush="{DynamicResource BorderBrush}"
BorderThickness="1"
CornerRadius="4">
<controls:TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="13"
Text="{Binding Name}"
TextAlignment="Center"
TextWrapping="Wrap" />
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<controls:TextBlock
HorizontalAlignment="Center"
FontSize="13"
Text="{Binding Name}"
TextAlignment="Center"
TextWrapping="Wrap" />
<controls:TextBlock
HorizontalAlignment="Center"
uiBehaviors:ResourceReferenceHelper.ForegroundResourceKey="{Binding RarityColorResourceKey}"
FontSize="11"
Text="{Binding RarityStars}"
TextAlignment="Center" />
<StackPanel
Margin="0,0,0,0"
HorizontalAlignment="Center"
Orientation="Horizontal">
<Image
Width="18"
Height="18"
Source="{Binding EliteIconPath}"
Stretch="Uniform"
ToolTip="{Binding Elite}">
<Image.Effect>
<DropShadowEffect
BlurRadius="8"
Opacity="0.5"
ShadowDepth="2"
Color="Black" />
</Image.Effect>
</Image>
<controls:TextBlock
Margin="2.5,0"
VerticalAlignment="Center"
FontSize="11"
Text="{Binding Level, StringFormat={}Lv.{0}}" />
<Image
Width="18"
Height="18"
Source="{Binding PotentialIconPath}"
ToolTip="{Binding Potential}">
<Image.Effect>
<DropShadowEffect
BlurRadius="8"
Opacity="0.5"
ShadowDepth="2"
Color="Black" />
</Image.Effect>
</Image>
</StackPanel>
</StackPanel>
</Border>
</DataTemplate>
</ItemsControl.ItemTemplate>