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(style): Colored logs for I.S. (#11593)

Browse Source 
* feat: Colored logging for I.S. - Dark

* feat: Colored logging for I.S. - Light

* feat: Colored logging for I.S. - AsstProxy logic
This commit is contained in:
Constrat
2025-01-22 13:51:11 +01:00
committed by GitHub
parent 870f95da82
commit 52ba42df14
4 changed files with 74 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/MaaWpfGui/Constants/UILogColor.cs
View File

@@ -69,6 +69,48 @@ namespace MaaWpfGui.Constants
/// </summary>
public const string LdSpecialScreenshot = "LdSpecialScreenshot";
// I.S. Colors
/// <summary>
/// The recommended color for success fights.
/// </summary>
public const string SuccessIS = "SuccessIS";
/// <summary>
/// The recommended color for Safe House events.
/// </summary>
public const string SafehouseIS = "SafehouseIS";
/// <summary>
/// The recommended color for Trader events.
/// </summary>
public const string TraderIS = "TraderIS";
/// <summary>
/// The recommended color for standard events.
/// </summary>
public const string EventIS = "EventIS";
/// <summary>
/// The recommended color for truth events.
/// </summary>
public const string TruthIS = "TruthIS";
/// <summary>
/// The recommended color for standard fights.
/// </summary>
public const string CombatIS = "CombatIS";
/// <summary>
/// The recommended color for emergency fights.
/// </summary>
public const string EmergencyIS = "EmergencyIS";
/// <summary>
/// The recommended color for boss fights.
/// </summary>
public const string BossIS = "BossIS";
// 颜色在MaaWpfGui\Res\Themes中定义
// Brush are defined in MaaWpfGui\Res\Themes
}

20
src/MaaWpfGui/Main/AsstProxy.cs
View File

@@ -1134,46 +1134,46 @@ namespace MaaWpfGui.Main
/* 肉鸽相关 */
case "ExitThenAbandon":
Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("ExplorationAbandoned"));
Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("ExplorationAbandoned"), UiLogColor.Error);
break;
// case "StartAction":
// Instances.TaskQueueViewModel.AddLog("开始战斗");
// break;
case "MissionCompletedFlag":
Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("FightCompleted"));
Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("FightCompleted"), UiLogColor.SuccessIS);
break;
case "MissionFailedFlag":
Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("FightFailed"));
Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("FightFailed"), UiLogColor.Error);
break;
case "StageTraderEnter":
Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("Trader"));
Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("Trader"), UiLogColor.TraderIS);
break;
case "StageSafeHouseEnter":
Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("SafeHouse"));
Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("SafeHouse"), UiLogColor.SafehouseIS);
break;
case "StageFilterTruthEnter":
Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("FilterTruth"));
Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("FilterTruth"), UiLogColor.TruthIS);
break;
// case "StageBoonsEnter":
// Instances.TaskQueueViewModel.AddLog("古堡馈赠");
// break;
case "StageCombatDpsEnter":
Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("CombatDps"));
Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("CombatDps"), UiLogColor.CombatIS);
break;
case "StageEmergencyDps":
Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("EmergencyDps"));
Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("EmergencyDps"), UiLogColor.EmergencyIS);
break;
case "StageDreadfulFoe":
case "StageDreadfulFoe-5Enter":
Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("DreadfulFoe"));
Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("DreadfulFoe"), UiLogColor.BossIS);
break;
case "StageTraderInvestSystemFull":
@@ -1491,7 +1491,7 @@ namespace MaaWpfGui.Main
break;
case "RoguelikeEvent":
Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("RoguelikeEvent") + $" {subTaskDetails!["name"]}");
Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("RoguelikeEvent") + $" {subTaskDetails!["name"]}", UiLogColor.EventIS);
break;
case "FoldartalGainOcrNextLevel":

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

@@ -45,4 +45,15 @@
<SolidColorBrush x:Key="DownloadLogBrush" Color="Violet" />
<SolidColorBrush x:Key="MuMuSpecialScreenshot" Color="#02BFFF" />
<SolidColorBrush x:Key="LdSpecialScreenshot" Color="#6666FF" />
<!-- UiLogColor - I.S. -->
<SolidColorBrush x:Key="SuccessIS" Color="LimeGreen" />
<SolidColorBrush x:Key="SafehouseIS" Color="DodgerBlue" />
<SolidColorBrush x:Key="TraderIS" Color="MediumSeaGreen" />
<SolidColorBrush x:Key="EventIS" Color="LightSkyBlue" />
<SolidColorBrush x:Key="TrustIS" Color="SlateGray"/>
<SolidColorBrush x:Key="CombatIS" Color="DarkOrange" />
<SolidColorBrush x:Key="EmergencyIS" Color="MediumVioletRed" />
<SolidColorBrush x:Key="BossIS" Color="Firebrick " />
</ResourceDictionary>

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

@@ -27,4 +27,15 @@
<SolidColorBrush x:Key="DownloadLogBrush" Color="BlueViolet" />
<SolidColorBrush x:Key="MuMuSpecialScreenshot" Color="#02BFFF" />
<SolidColorBrush x:Key="LdSpecialScreenshot" Color="#6666FF" />
<!-- UiLogColor - I.S. -->
<SolidColorBrush x:Key="SuccessIS" Color="LimeGreen" />
<SolidColorBrush x:Key="SafehouseIS" Color="DodgerBlue" />
<SolidColorBrush x:Key="TraderIS" Color="MediumSeaGreen" />
<SolidColorBrush x:Key="EventIS" Color="LightSkyBlue" />
<SolidColorBrush x:Key="TrustIS" Color="SlateGray"/>
<SolidColorBrush x:Key="CombatIS" Color="DarkOrange" />
<SolidColorBrush x:Key="EmergencyIS" Color="MediumVioletRed" />
<SolidColorBrush x:Key="BossIS" Color="Firebrick " />
</ResourceDictionary>