From 8e7db984065687e96d6fd0cf973ce5b76a2eaaa3 Mon Sep 17 00:00:00 2001 From: MistEO Date: Fri, 18 Nov 2022 22:20:41 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E9=87=8D=E5=91=BD=E5=90=8D=E5=86=85?= =?UTF-8?q?=E7=BD=AE=E5=9F=BA=E5=BB=BA=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 10 +++------- docs/3.6-基建排班协议.md | 4 ++-- docs/ja-jp/3.6-インフラスケジュール設定.md | 4 ++-- ...imes_pre_day.json => 153_layout_3_times_a_day.json} | 0 ...imes_pre_day.json => 243_layout_3_times_a_day.json} | 0 ...imes_per_day.json => 243_layout_4_times_a_day.json} | 0 ...imes_pre_day.json => 252_layout_3_times_a_day.json} | 0 ....json => 333_layout_for_Orundum_3_times_a_day.json} | 2 +- src/MeoAsstGui/ViewModels/SettingsViewModel.cs | 10 +++++----- 9 files changed, 13 insertions(+), 17 deletions(-) rename resource/custom_infrast/{153_layout_3_times_pre_day.json => 153_layout_3_times_a_day.json} (100%) rename resource/custom_infrast/{243_layout_3_times_pre_day.json => 243_layout_3_times_a_day.json} (100%) rename resource/custom_infrast/{243_layout_4_times_per_day.json => 243_layout_4_times_a_day.json} (100%) rename resource/custom_infrast/{252_layout_3_times_pre_day.json => 252_layout_3_times_a_day.json} (100%) rename resource/custom_infrast/{333_layout_for_Orundum_3_times_pre_day.json => 333_layout_for_Orundum_3_times_a_day.json} (99%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09a86bc4e7..773201339a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,5 @@ **若更新后滑动操作没反应、自动战斗没反应、肉鸽不上人等，请进入 `设置` - `连接设置` - `强制替换 ADB`** -- Support Annihilation Combat for the JP client (But without testing). @MistEO @wallsman -- 微调 自动战斗 操作延迟 @MistEO -- 修复 肉鸽 关卡识别错误时狂吃内存的问题 @zzyyyl -- 修复 macOS 配置错误无法连接的问题 @hguandl -- 修复 强制替换 adb 第二次及之后操作报错的问题 @MistEO -- 优化 日志打印 @horror-proton -- 更新文档 @MistEO +- 修复 使用中文路径时，minitouch 出现的一系列错误 @MistEO +- 修复 使用竖屏、旋转 180° 等时，minitouch 的操作错误 @MistEO +- 优化 自定义基建 内置作业，新增 diff --git a/docs/3.6-基建排班协议.md b/docs/3.6-基建排班协议.md index 2508e3e183..b7e2f1052b 100644 --- a/docs/3.6-基建排班协议.md +++ b/docs/3.6-基建排班协议.md @@ -107,5 +107,5 @@ ## 举例 -[243 极限效率，一天三换](../resource/custom_infrast/243_layout_3_times_pre_day.json) -[153 极限效率，一天三换](../resource/custom_infrast/153_layout_3_times_pre_day.json) +[243 极限效率，一天三换](../resource/custom_infrast/243_layout_3_times_a_day.json) +[153 极限效率，一天三换](../resource/custom_infrast/153_layout_3_times_a_day.json) diff --git a/docs/ja-jp/3.6-インフラスケジュール設定.md b/docs/ja-jp/3.6-インフラスケジュール設定.md index 7458fce9dd..acf901c2ed 100644 --- a/docs/ja-jp/3.6-インフラスケジュール設定.md +++ b/docs/ja-jp/3.6-インフラスケジュール設定.md @@ -104,5 +104,5 @@ ## サンプル -[243 効率最高，一日三回](../resource/custom_infrast/243_layout_3_times_pre_day.json) -[153 効率最高，一日三回](../resource/custom_infrast/153_layout_3_times_pre_day.json) +[243 効率最高，一日三回](../resource/custom_infrast/243_layout_3_times_a_day.json) +[153 効率最高，一日三回](../resource/custom_infrast/153_layout_3_times_a_day.json) diff --git a/resource/custom_infrast/153_layout_3_times_pre_day.json b/resource/custom_infrast/153_layout_3_times_a_day.json similarity index 100% rename from resource/custom_infrast/153_layout_3_times_pre_day.json rename to resource/custom_infrast/153_layout_3_times_a_day.json diff --git a/resource/custom_infrast/243_layout_3_times_pre_day.json b/resource/custom_infrast/243_layout_3_times_a_day.json similarity index 100% rename from resource/custom_infrast/243_layout_3_times_pre_day.json rename to resource/custom_infrast/243_layout_3_times_a_day.json diff --git a/resource/custom_infrast/243_layout_4_times_per_day.json b/resource/custom_infrast/243_layout_4_times_a_day.json similarity index 100% rename from resource/custom_infrast/243_layout_4_times_per_day.json rename to resource/custom_infrast/243_layout_4_times_a_day.json diff --git a/resource/custom_infrast/252_layout_3_times_pre_day.json b/resource/custom_infrast/252_layout_3_times_a_day.json similarity index 100% rename from resource/custom_infrast/252_layout_3_times_pre_day.json rename to resource/custom_infrast/252_layout_3_times_a_day.json diff --git a/resource/custom_infrast/333_layout_for_Orundum_3_times_pre_day.json b/resource/custom_infrast/333_layout_for_Orundum_3_times_a_day.json similarity index 99% rename from resource/custom_infrast/333_layout_for_Orundum_3_times_pre_day.json rename to resource/custom_infrast/333_layout_for_Orundum_3_times_a_day.json index d55683ac2d..f411563df5 100644 --- a/resource/custom_infrast/333_layout_for_Orundum_3_times_pre_day.json +++ b/resource/custom_infrast/333_layout_for_Orundum_3_times_a_day.json @@ -363,7 +363,7 @@ "room": "manufacture", "order": "post" }, - "name": "C组 12H", + "name": "C 组 12H", "description": "高效率组", "description_post": "下次换班请在约12小时后进行" } diff --git a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs index 29a0903d18..db1bfdf62c 100644 --- a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs +++ b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs @@ -148,11 +148,11 @@ namespace MeoAsstGui DefaultInfrastList = new List { new CombData { Display = Localization.GetString("UserDefined"), Value = _userDefined }, - new CombData { Display = Localization.GetString("153_3"), Value = "153_layout_3_times_pre_day.json" }, - new CombData { Display = Localization.GetString("243_3"), Value = "243_layout_3_times_pre_day.json" }, - new CombData { Display = Localization.GetString("243_4"), Value = "243_layout_4_times_per_day.json" }, - new CombData { Display = Localization.GetString("252_3"), Value = "252_layout_3_times_pre_day.json" }, - new CombData { Display = Localization.GetString("333_3"), Value = "333_layout_for_Orundum_3_times_pre_day.json" }, + new CombData { Display = Localization.GetString("153_3"), Value = "153_layout_3_times_a_day.json" }, + new CombData { Display = Localization.GetString("243_3"), Value = "243_layout_3_times_a_day.json" }, + new CombData { Display = Localization.GetString("243_4"), Value = "243_layout_4_times_a_day.json" }, + new CombData { Display = Localization.GetString("252_3"), Value = "252_layout_3_times_a_day.json" }, + new CombData { Display = Localization.GetString("333_3"), Value = "333_layout_for_Orundum_3_times_a_day.json" }, }; UsesOfDronesList = new List