diff --git a/resource/tasks.json b/resource/tasks.json index b3f4a0dc16..1d51bce46b 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -1923,6 +1923,13 @@ "AP-5@SwipeToTheLeft" ] }, + "SK-5": { + "baseTask": "ResourceStages", + "next": [ + "SK5@StageSK", + "SK-5@SwipeToTheLeft" + ] + }, "PR-A-1": { "baseTask": "ResourceStages", "Doc": "医疗/重装", @@ -2107,6 +2114,9 @@ "StageAP": { "baseTask": "StageEntries" }, + "StageSK": { + "baseTask": "StageEntries" + }, "StagePR-A": { "baseTask": "StageEntries" }, @@ -2155,6 +2165,12 @@ "AP-5" ] }, + "SK5@Stage": { + "baseTask": "ResourceStageLevel5", + "text": [ + "SK-5" + ] + }, "PR-A-1@Stage": { "baseTask": "ChipStageLevel1", "text": [ diff --git a/resource/template/StageAP5.png b/resource/template/StageAP5.png deleted file mode 100644 index ef63adb7c5..0000000000 Binary files a/resource/template/StageAP5.png and /dev/null differ diff --git a/resource/template/StageCA5.png b/resource/template/StageCA5.png deleted file mode 100644 index f7454686b8..0000000000 Binary files a/resource/template/StageCA5.png and /dev/null differ diff --git a/resource/template/StageCE5.png b/resource/template/StageCE5.png deleted file mode 100644 index 2dcff0817e..0000000000 Binary files a/resource/template/StageCE5.png and /dev/null differ diff --git a/resource/template/StageCE6.png b/resource/template/StageCE6.png deleted file mode 100644 index bfbfb20355..0000000000 Binary files a/resource/template/StageCE6.png and /dev/null differ diff --git a/resource/template/StageLS5.png b/resource/template/StageLS5.png deleted file mode 100644 index e954721369..0000000000 Binary files a/resource/template/StageLS5.png and /dev/null differ diff --git a/resource/template/StageLS6.png b/resource/template/StageLS6.png deleted file mode 100644 index b4d112f7dc..0000000000 Binary files a/resource/template/StageLS6.png and /dev/null differ diff --git a/resource/template/StageSK.png b/resource/template/StageSK.png new file mode 100644 index 0000000000..233634fe9c Binary files /dev/null and b/resource/template/StageSK.png differ diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml index 22e607b97c..2b887cf5be 100644 --- a/src/MaaWpfGui/Res/Localizations/en-us.xaml +++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml @@ -310,6 +310,7 @@ AP-5 CA-5 LS-6 + SK-5 Med/Def Ⅰ Med/Def Ⅱ @@ -532,7 +533,7 @@ - Dear doctor, ever heard of the new listings of "isopropyl alcohol" in Ms. Closure's store? let's check it out? + Dear doctor, ever heard of the new listings of "isopropyl alcohol" in Ms. Closure's store? let's check it out? Ugh... Ehem Ah, doctor. Why do you sway, so much in your movement today? I must not drink, drink so much next time... diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml index 8c8de0137a..951843254e 100644 --- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml +++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml @@ -310,6 +310,8 @@ 作戦記録-6(LS-6) + 炭素材-5(SK-5) + 医療/重装SoC・初 医療/重装SoC・中 diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml index e273c1f093..dbc8c4b86d 100644 --- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml +++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml @@ -292,6 +292,7 @@ AP-5 (구매증명서) CA-5 (스킬개론) LS-6 (작전기록) + SK-5 (카본) PR-A-1 (메딕/디펜더) PR-A-2 (메딕/디펜더) diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml index df7b356c3c..9ee1676977 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml @@ -313,6 +313,7 @@ 红票-5 技能-5 经验-6/5 + 碳-5 奶/盾芯片 奶/盾芯片组 diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml index 4c35d3dca3..ab45e9de2f 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml @@ -247,6 +247,7 @@ 紅票-5 技能-5 經驗-6/5 + 碳-5 奶/盾晶片 奶/盾晶片組 diff --git a/src/MaaWpfGui/Services/StageManager.cs b/src/MaaWpfGui/Services/StageManager.cs index 14524e9a12..b60e7dc654 100644 --- a/src/MaaWpfGui/Services/StageManager.cs +++ b/src/MaaWpfGui/Services/StageManager.cs @@ -277,9 +277,7 @@ namespace MaaWpfGui.Services { "AP-5", new StageInfo("AP-5", "APTip", new[] { DayOfWeek.Monday, DayOfWeek.Thursday, DayOfWeek.Saturday, DayOfWeek.Sunday }, resourceCollection) }, { "CA-5", new StageInfo("CA-5", "CATip", new[] { DayOfWeek.Tuesday, DayOfWeek.Wednesday, DayOfWeek.Friday, DayOfWeek.Sunday }, resourceCollection) }, { "LS-6", new StageInfo("LS-6", "LSTip", new DayOfWeek[] { }, resourceCollection) }, - - // 碳本没做导航,只显示关卡提示 - { "SK-5", new StageInfo("SK-5", "SKTip", new[] { DayOfWeek.Monday, DayOfWeek.Wednesday, DayOfWeek.Friday, DayOfWeek.Saturday }, resourceCollection) { IsHidden = true } }, + { "SK-5", new StageInfo("SK-5", "SKTip", new[] { DayOfWeek.Monday, DayOfWeek.Wednesday, DayOfWeek.Friday, DayOfWeek.Saturday }, resourceCollection) }, // 剿灭模式 { "Annihilation", new StageInfo { Display = LocalizationHelper.GetString("Annihilation"), Value = "Annihilation" } },