From a4ae1c875ec438733fc00c303b4436b361f79747 Mon Sep 17 00:00:00 2001 From: uye <2396806385@qq.com> Date: Sun, 6 Nov 2022 15:32:09 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E9=A1=B6?= =?UTF-8?q?=E9=85=8D=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 --- resource/custom_infrast/153_layout_3_times_pre_day.json | 4 ++-- resource/custom_infrast/243_layout_3_times_pre_day.json | 2 +- resource/custom_infrast/252_layout_3_times_pre_day.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resource/custom_infrast/153_layout_3_times_pre_day.json b/resource/custom_infrast/153_layout_3_times_pre_day.json index 816399d984..361f9008cf 100644 --- a/resource/custom_infrast/153_layout_3_times_pre_day.json +++ b/resource/custom_infrast/153_layout_3_times_pre_day.json @@ -223,7 +223,7 @@ "hire": [ { "operators": [ - "艾雅法拉" + "斥罪" ] } ], @@ -372,4 +372,4 @@ } } ] -} +} \ No newline at end of file diff --git a/resource/custom_infrast/243_layout_3_times_pre_day.json b/resource/custom_infrast/243_layout_3_times_pre_day.json index 132f2eb88e..7c0b8dbb53 100644 --- a/resource/custom_infrast/243_layout_3_times_pre_day.json +++ b/resource/custom_infrast/243_layout_3_times_pre_day.json @@ -225,7 +225,7 @@ "hire": [ { "operators": [ - "艾雅法拉" + "斥罪" ] } ], diff --git a/resource/custom_infrast/252_layout_3_times_pre_day.json b/resource/custom_infrast/252_layout_3_times_pre_day.json index 4e3965e6b7..9d6eac0151 100644 --- a/resource/custom_infrast/252_layout_3_times_pre_day.json +++ b/resource/custom_infrast/252_layout_3_times_pre_day.json @@ -218,7 +218,7 @@ "hire": [ { "operators": [ - "艾雅法拉" + "斥罪" ] } ], @@ -367,4 +367,4 @@ } } ] -} +} \ No newline at end of file From 0357ecaaaa257ab2533e748f893e6c822026e010 Mon Sep 17 00:00:00 2001 From: uye <99072975+ABA2396@users.noreply.github.com> Date: Sun, 6 Nov 2022 15:49:24 +0800 Subject: [PATCH 2/4] =?UTF-8?q?Update=203.6-=E5=9F=BA=E5=BB=BA=E6=8E=92?= =?UTF-8?q?=E7=8F=AD=E5=8D=8F=E8=AE=AE.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix #2625 --- docs/3.6-基建排班协议.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/3.6-基建排班协议.md b/docs/3.6-基建排班协议.md index 1273cc881b..121610844b 100644 --- a/docs/3.6-基建排班协议.md +++ b/docs/3.6-基建排班协议.md @@ -1,6 +1,6 @@ # 基建排班协议 -`resource/custom_infrast/*.json` 的使用方法及各字段说明 +`resource/custom_infrast/*.json` 的使用方法及各字段说明。**因 json 不支持注释，使用下方示例时需将注释删除** ## 完整字段一览 From c386de674f32fb5455013ec8b1bb9114dc859ab3 Mon Sep 17 00:00:00 2001 From: zzyyyl Date: Sun, 6 Nov 2022 15:49:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20beta.3=20?= =?UTF-8?q?=E6=89=93=E5=BC=80=E5=8D=B3=E9=97=AA=E9=80=80=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAsstGui/ViewModels/VersionUpdateViewModel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MeoAsstGui/ViewModels/VersionUpdateViewModel.cs b/src/MeoAsstGui/ViewModels/VersionUpdateViewModel.cs index 73a299de09..fedde5c00a 100644 --- a/src/MeoAsstGui/ViewModels/VersionUpdateViewModel.cs +++ b/src/MeoAsstGui/ViewModels/VersionUpdateViewModel.cs @@ -797,7 +797,7 @@ namespace MeoAsstGui version = _curVersion; } - if (isStdVersion(version)) + if (isDebugVersion(version)) { return false; } From c20e467ffceb419155eb7426aa99a7d27337774b Mon Sep 17 00:00:00 2001 From: zzyyyl Date: Sun, 6 Nov 2022 16:01:23 +0800 Subject: [PATCH 4/4] docs: update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e8478f154..072c0b0cdc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,3 +3,5 @@ - 优化 界面 首次启动时报错弹窗提示 @MistEO - 修复 内测版 检查更新功能不正确的问题 @MistEO - 重构 Task 部分解析逻辑 @zzyyyl +- 优化 自定义基建 内置作业 @ABA2396 +- 修复 启动时闪退的问题 @zzyyyl \ No newline at end of file