From 5dc3512bb8cbe39223ff20cd7a404b2737b00cef Mon Sep 17 00:00:00 2001
From: uye <99072975+ABA2396@users.noreply.github.com>
Date: Sat, 26 Oct 2024 18:42:04 +0800
Subject: [PATCH 1/6] =?UTF-8?q?perf:=20=E5=85=B3=E5=8D=A1=E5=AF=BC?=
=?UTF-8?q?=E8=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
resource/tasks.json | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/resource/tasks.json b/resource/tasks.json
index c2008aa8a1..790a260a0b 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -96,7 +96,7 @@
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": [],
- "roi": [142, 43, 210, 274],
+ "roi": [142, 43, 250, 150],
"next": ["#back", "#self", "Stop"]
},
"ClickChapter1": {
@@ -113,15 +113,15 @@
},
"ToChapter1": {
"algorithm": "JustReturn",
- "next": ["ClickChapter1@ClickChapter2@ClickChapter3", "ClickChapter1@ClickChapter2", "ClickChapter1"]
+ "next": ["ClickChapter1@ClickChapter2@ClickChapter3", "ClickChapter1@ClickChapter2", "ClickChapter1", "Stop"]
},
"ToChapter2": {
"algorithm": "JustReturn",
- "next": ["ClickChapter2@ClickChapter3", "ClickChapter2"]
+ "next": ["ClickChapter2@ClickChapter3", "ClickChapter2", "Stop"]
},
"ToChapter3": {
"algorithm": "JustReturn",
- "next": ["ClickChapter3"]
+ "next": ["ClickChapter3", "Stop"]
},
"EpisodeOcrReplace": {
"Doc": "base_task",
From 2f6a6dfafcd0fee44eca889d5926d720c34ef04d Mon Sep 17 00:00:00 2001
From: uye <99072975+ABA2396@users.noreply.github.com>
Date: Sat, 26 Oct 2024 18:55:18 +0800
Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=E8=B4=AD=E7=89=A9=E5=8D=A1=E5=9C=A8?=
=?UTF-8?q?=E7=A1=AE=E8=AE=A4=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
resource/tasks.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/resource/tasks.json b/resource/tasks.json
index 790a260a0b..40952096c3 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -3471,7 +3471,7 @@
"roi": [544, 0, 210, 201],
"maskRange": [1, 255],
"action": "ClickRect",
- "specificRect": [645, 665],
+ "specificRect": [645, 665, 0, 0],
"postDelay": 1500,
"next": ["CreditShop-Bought", "Stop"]
},
From 22c26483dcdb3217a94dc619f564df83a32297a7 Mon Sep 17 00:00:00 2001
From: uye <99072975+ABA2396@users.noreply.github.com>
Date: Sat, 26 Oct 2024 19:24:34 +0800
Subject: [PATCH 3/6] =?UTF-8?q?chore:=20=E4=BF=AE=E6=94=B9=20QQ=20?=
=?UTF-8?q?=E7=BE=A4=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/MaaWpfGui/Res/Localizations/ja-jp.xaml | 2 +-
src/MaaWpfGui/Res/Localizations/zh-cn.xaml | 2 +-
src/MaaWpfGui/Res/Localizations/zh-tw.xaml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
index 50a714566e..908a862559 100644
--- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
@@ -679,7 +679,7 @@ C:\\leidian\\LDPlayer9
ファイルが占有されています。コンピュータを再起動して再試行してください。
リンクを開けませんでした。Windows 設定に移動してデフォルトのブラウザを選択してください。
GitHub issueを作成する
- QQグループに参加して問題をフィードバックする
+ QQグループに入ります
エラー情報をコピーする
diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
index cb0bffaee8..e6d49d8d69 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
@@ -678,7 +678,7 @@ C:\\leidian\\LDPlayer9。\n
文件被占用，请重启电脑后重试。
打开链接失败，请前往「Windows 设置」选择默认浏览器。
创建 GitHub issue
- 加入QQ群反馈问题
+ 加入 QQ 群
复制错误信息
diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
index f3acb08426..7ed124bf82 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
@@ -678,7 +678,7 @@ C:\\leidian\\LDPlayer9。\n
檔被佔用，請重開電腦後重試。
打開連結失敗，請前往「Windows 設置」選擇默認瀏覽器。
建立 GitHub issue
- 加入 QQ 群反應問題
+ 加入 QQ 群
複製錯誤資訊
From cdb7e781bfb00717e2ee24a3381931232a7b214e Mon Sep 17 00:00:00 2001
From: uye <99072975+ABA2396@users.noreply.github.com>
Date: Sat, 26 Oct 2024 19:34:25 +0800
Subject: [PATCH 4/6] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=E6=8F=8F?=
=?UTF-8?q?=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/MaaWpfGui/Res/Localizations/zh-cn.xaml | 2 +-
src/MaaWpfGui/Res/Localizations/zh-tw.xaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
index e6d49d8d69..4bb3342104 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
@@ -802,7 +802,7 @@ C:\\leidian\\LDPlayer9。\n
正在尝试启动模拟器
正在尝试重启 ADB Server
正在尝试关闭并重启 ADB 进程
- 请检查连接设置或尝试重启模拟器与 ADB 或重启电脑
+ 请「检查连接设置」或「尝试重启模拟器与 ADB」或「重启电脑」
强制显示MAA
diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
index 7ed124bf82..c809a9bd27 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
@@ -802,7 +802,7 @@ C:\\leidian\\LDPlayer9。\n
正在嘗試啟動模擬器
正在嘗試重開 ADB 伺服器
正在嘗試重開 ADB 程式
- 請檢查連接設定、嘗試重開模擬器與 ADB 或重開電腦
+ 請「檢查連接設定」、「嘗試重開模擬器與 ADB」或「重開電腦」
強制顯示 MAA
From 9f24927367fd9d5c70faf20b4fce5d9a676c4c56 Mon Sep 17 00:00:00 2001
From: Alisa
Date: Sat, 26 Oct 2024 19:59:02 +0800
Subject: [PATCH 5/6] i18n: Translations update from MAA Weblate (#10930)
i18n: Translated using Weblate (Japanese)
Currently translated at 97.4% (575 of 590 strings)
Translation: MAA Assistant Arknights/Glossary
Translate-URL: https://weblate.maa-org.net/projects/maa/glossary/ja/
Co-authored-by: SplendidNova
---
docs/glossary/ja-jp.json | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/docs/glossary/ja-jp.json b/docs/glossary/ja-jp.json
index 05e624626f..15ce7b8c25 100644
--- a/docs/glossary/ja-jp.json
+++ b/docs/glossary/ja-jp.json
@@ -249,7 +249,7 @@
"char_4077_palico": "テラ大陸調査団",
"char_4091_ulika": "U-Official",
"char_4093_frston": "Friston-3",
- "char_4136_phonor": ""
+ "char_4136_phonor": "PhonoR-0"
},
"2": {
"char_009_12fce": "12F",
@@ -460,7 +460,7 @@
"char_1024_hbisc2": "濯塵ハイビスカス",
"char_1027_greyy2": "承曦グレイ",
"char_1030_noirc2": "レウスSノイルホーン",
- "char_1036_fang2": "",
+ "char_1036_fang2": "歴陣鋭槍フェン",
"char_4006_melnte": "メラナイト",
"char_4013_kjera": "イェラ",
"char_4014_lunacu": "ルナカブ",
@@ -569,7 +569,7 @@
"char_1032_excu2": "聖約イグゼキュター",
"char_1033_swire2": "琳琅スワイヤー",
"char_1034_jesca2": "滌火ジェシカ",
- "char_1035_wisdel": "",
+ "char_1035_wisdel": "ウィシャデル",
"char_2012_typhon": "ティフォン",
"char_2013_cerber": "ケオベ",
"char_2014_nian": "ニェン",
@@ -599,8 +599,8 @@
"char_4121_zuole": "ズオ・ラウ",
"char_4123_ela": "Ela",
"char_4132_ascln": "アスカロン",
- "char_4133_logos": "",
- "char_4134_cetsyr": "",
+ "char_4133_logos": "ロゴス",
+ "char_4134_cetsyr": "シヴィライト・エテルナ",
"char_4138_narant": "",
"char_4141_marcil": "",
"char_4145_ulpia": "",
From dcfe9510d2a87795245787e49ffbb80a360d8c8d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 26 Oct 2024 21:50:09 +0800
Subject: [PATCH 6/6] docs: Auto Update Changelogs of v5.8.1 (#10934)
* docs: Auto Generate Changelog of Release v5.8.1
* docs: Update CHANGELOG.md
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
---
CHANGELOG.md | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f88d7b99b7..7d3640092c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## v5.8.0
+## v5.8.1
### 演进之美，越进越美 | Highlight
@@ -53,6 +53,8 @@
### 改进 | Improved
+* 优化描述 @ABA2396
+* 关卡导航 @ABA2396
* 支持mumu后台保活，通过包名获取display_id @ABA2396
* IS Phantom Update 雕匠与石像.json (#10829) @Daydreamer114
* 更新肉鸽 ew 优先级 (#10830) @Daydreamer114
@@ -66,6 +68,7 @@
### 修复 | Fix
+* 购物卡在确认界面 @ABA2396
* b服支持多分辨率多 dpi 登录 (#10817) @ABA2396
* 关卡导航失败 @ABA2396
* 无法导航至关卡9-19刷理智 @ABA2396
@@ -115,6 +118,8 @@
### 其他 | Other
+* Translations update from MAA Weblate (#10930) @AlisaAkiron
+* 修改 QQ 群文案 @ABA2396
* mumu display id error if startup ark manually (#10787) @MistEO
* mumu display id error when ark not startup (#10786) @MistEO
* 移除无效的try-catch @status102