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

Revert "fix: 未开放关卡不重置 (#15647)"

Browse Source 
This reverts commit 92c6a9c30f.
This commit is contained in:
status102
2026-02-10 20:15:48 +08:00
parent 3623b3addf
commit 9fdf78c109
10 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MaaWpfGui/Configuration/Converter/FightTaskStageResetModeConverter.cs
View File

@@ -63,7 +63,7 @@ internal class FightTaskStageResetModeConverter : JsonConverter<Root>
}
else
{
fightTask.StageResetMode = FightStageResetMode.DoNotReset;
fightTask.StageResetMode = FightStageResetMode.Current;
}
}
}

2
src/MaaWpfGui/Configuration/Single/MaaTask/FightTask.cs
View File

@@ -128,7 +128,7 @@ public class FightTask : BaseTask, IJsonOnDeserialized
/// </summary>
public bool HideSeries { get; set; }
public FightStageResetMode StageResetMode { get; set; } = FightStageResetMode.DoNotReset;
public FightStageResetMode StageResetMode { get; set; } = FightStageResetMode.Current;
/// <summary>
/// Gets or sets a value indicating whether 是否启用周计划

5
src/MaaWpfGui/Constants/Enums/FightStageResetMode.cs
View File

@@ -24,9 +24,4 @@ public enum FightStageResetMode
/// 无效关卡
/// </summary>
Invalid,
/// <summary>
/// 不重置
/// </summary>
DoNotReset,
}

2
src/MaaWpfGui/Helper/ConfigConverter.cs
View File

@@ -212,7 +212,7 @@ public class ConfigConverter
ConfigurationHelper.DeleteValue(ConfigurationKeys.HideUnavailableStage);
ConfigurationHelper.DeleteValue(ConfigurationKeys.CustomStageCode);
ConfigurationHelper.DeleteValue(ConfigurationKeys.UseAlternateStage);
fightTask.StageResetMode = fightTask.UseOptionalStage ? FightStageResetMode.Invalid : FightStageResetMode.DoNotReset;
fightTask.StageResetMode = fightTask.UseOptionalStage ? FightStageResetMode.Invalid : FightStageResetMode.Current;
if (fightTask.Series > 6)
{

1
src/MaaWpfGui/Res/Localizations/en-us.xaml
View File

@@ -749,7 +749,6 @@ Do not adjust the proxy multiplier setting in the game</system:String>
<!--<system:String x:Key="LastBattle">Last Battle</system:String>-->
<system:String x:Key="DefaultStage">Cur/Last</system:String>
<system:String x:Key="InvalidStage">Invalid</system:String>
<system:String x:Key="DoNotResetStage">Do Not Reset</system:String>
<system:String x:Key="ClosedStage">The event is not open</system:String>
<system:String x:Key="UnsupportedStages">Unsupported stages</system:String>
<system:String x:Key="LowVersion">Old Version, Update required</system:String>

1
src/MaaWpfGui/Res/Localizations/ja-jp.xaml
View File

@@ -750,7 +750,6 @@ C:\\leidian\\LDPlayer9
<!--<system:String x:Key="LastBattle">上次作战</system:String>-->
<system:String x:Key="DefaultStage">現在/前回</system:String>
<system:String x:Key="InvalidStage">無効なレベル</system:String>
<system:String x:Key="DoNotResetStage">リセットしない</system:String>
<system:String x:Key="ClosedStage">ステージが未公開か既に終了している</system:String>
<system:String x:Key="UnsupportedStages">未サポートステージ</system:String>
<system:String x:Key="LowVersion">バージョンの更新が必要</system:String>

1
src/MaaWpfGui/Res/Localizations/ko-kr.xaml
View File

@@ -751,7 +751,6 @@ C:\\leidian\\LDPlayer9
<system:String x:Key="LastBattle">최근 작전</system:String>-->
<system:String x:Key="DefaultStage">현재/최근</system:String>
<system:String x:Key="InvalidStage">잘못된 스테이지</system:String>
<system:String x:Key="DoNotResetStage">리셋 안 함</system:String>
<system:String x:Key="ClosedStage">미개방 스테이지</system:String>
<system:String x:Key="UnsupportedStages">미지원 스테이지</system:String>
<system:String x:Key="LowVersion">낮은 버전</system:String>

1
src/MaaWpfGui/Res/Localizations/zh-cn.xaml
View File

@@ -750,7 +750,6 @@ C:\\leidian\\LDPlayer9。\n
<!--<system:String x:Key="LastBattle">上次作战</system:String>-->
<system:String x:Key="DefaultStage">当前/上次</system:String>
<system:String x:Key="InvalidStage">无效关卡</system:String>
<system:String x:Key="DoNotResetStage">不重置</system:String>
<system:String x:Key="ClosedStage">活动未开放</system:String>
<system:String x:Key="UnsupportedStages">不支持的关卡</system:String>
<system:String x:Key="LowVersion">版本过低</system:String>

1
src/MaaWpfGui/Res/Localizations/zh-tw.xaml
View File

@@ -750,7 +750,6 @@ C:\\leidian\\LDPlayer9\n
<!--<system:String x:Key="LastBattle">上次作戰</system:String>-->
<system:String x:Key="DefaultStage">目前/上次</system:String>
<system:String x:Key="InvalidStage">無效關卡</system:String>
<system:String x:Key="DoNotResetStage">不重置</system:String>
<system:String x:Key="ClosedStage">活動未開放</system:String>
<system:String x:Key="UnsupportedStages">不支援的關卡</system:String>
<system:String x:Key="LowVersion">版本過低</system:String>

8
src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs
View File

@@ -556,7 +556,7 @@ public class FightSettingsUserControlModel : TaskSettingsViewModel
if (value)
{
UseAlternateStage = false;
StageResetMode = FightStageResetMode.DoNotReset;
StageResetMode = FightStageResetMode.Current;
}
if (update)
{
@@ -570,7 +570,6 @@ public class FightSettingsUserControlModel : TaskSettingsViewModel
[
new() { Display = LocalizationHelper.GetString("DefaultStage"), Value = FightStageResetMode.Current },
new() { Display = LocalizationHelper.GetString("InvalidStage"), Value = FightStageResetMode.Invalid },
new() { Display = LocalizationHelper.GetString("DoNotResetStage"), Value = FightStageResetMode.DoNotReset },
];
public FightStageResetMode StageResetMode
@@ -798,11 +797,6 @@ public class FightSettingsUserControlModel : TaskSettingsViewModel
var stage = task.StagePlan[i];
if (stage != InvalidStage.Value && !stageList.Any(p => p.Value == stage))
{
if (task.StageResetMode == FightStageResetMode.DoNotReset)
{
// 不重置，跳过
continue;
}
task.StagePlan[i] = task.StageResetMode switch {
FightStageResetMode.Current => string.Empty,
FightStageResetMode.Invalid => InvalidStage.Value,