diff --git a/README.md b/README.md
index a162c38173..8f6fcdb086 100644
--- a/README.md
+++ b/README.md
@@ -85,9 +85,9 @@ MAA 的意思是 MAA Assistant Arknights
## 外服支持
- 国际服(美服)
- 支持基本的刷理智、访问好友、领取奖励、自动肉鸽(测试版本)、公招识别,请参考 [说明](resource/global/YoStarEN/readme.md)
+ 支持基本的刷理智、信用购物、访问好友、领取奖励、自动肉鸽(测试版本)、公招识别,请参考 [说明](resource/global/YoStarEN/readme.md)
- 日服
- 支持基本的刷理智、自动公招、访问好友、领取奖励、自动肉鸽(测试版本)、公招识别,请参考 [说明](resource/global/YoStarJP/readme.md)
+ 支持基本的刷理智、信用购物、自动公招、访问好友、领取奖励、自动肉鸽(测试版本)、公招识别,请参考 [说明](resource/global/YoStarJP/readme.md)
- 韩服
支持基本的刷理智功能,请参考 [说明](resource/global/YoStarKR/readme.md)
- 繁中服
diff --git a/README_en-US.md b/README_en-US.md
index c39f4efbcd..335a745e17 100644
--- a/README_en-US.md
+++ b/README_en-US.md
@@ -85,9 +85,9 @@ Please refer to: [FAQ](docs/en-us/1.2-FAQ.md)
## Supports for overseas clients
- Global(EN) Client
- Supports basic features like Combat, Visiting, Collocting, Auto Roguelike(beta), Recruitment calculate, etc. See also [README](resource/global/YoStarEN/readme.md)
+ Supports basic features like Combat, Credit Shopping, Visiting, Collocting, Auto Roguelike(beta), Recruitment calculate, etc. See also [README](resource/global/YoStarEN/readme.md)
- JP Client
- Supports basic features like Combat, Auto Recruiting, Visiting, Collocting, Auto Roguelike(beta), Recruitment calculate, etc. See also [README](resource/global/YoStarJP/readme.md)
+ Supports basic features like Combat, Credit Shopping, Auto Recruiting, Visiting, Collocting, Auto Roguelike(beta), Recruitment calculate, etc. See also [README](resource/global/YoStarJP/readme.md)
- KR Client
Supports basic features like Combat, etc. See also [README](resource/global/YoStarKR/readme.md)
- ZH_CHT Client
diff --git a/README_ja-JP.md b/README_ja-JP.md
index b5d7d957f0..75d0c13b5b 100644
--- a/README_ja-JP.md
+++ b/README_ja-JP.md
@@ -84,10 +84,10 @@ UIを見れば使い方もすぐ分かる!
## サーバーに応じてサポートされる機能
- アメリカサーバー
- 作戦、戦友訪問、レワード収集、統合戦略(ベータ版)、公開求人認識の機能がサポートされている。
+ 作戦、戦友訪問、FP交換所、レワード収集、統合戦略(ベータ版)、公開求人認識の機能がサポートされている。
サポート内容については[README](resource/global/YoStarEN/readme.md)を参照してください。
- 日本サーバー
- 作戦、自動公開求人、戦友訪問、レワード収集、統合戦略(ベータ版)、公開求人認識の機能がサポートされている。
+ 作戦、自動公開求人、戦友訪問、FP交換所、レワード収集、統合戦略(ベータ版)、公開求人認識の機能がサポートされている。
サポート内容については[README](resource/global/YoStarJP/readme.md)を参照してください。
- 韓国サーバー
基本的な作戦機能のみサポートされている。
diff --git a/README_zh-TW.md b/README_zh-TW.md
index 1308d9f869..1c66b4c28e 100644
--- a/README_zh-TW.md
+++ b/README_zh-TW.md
@@ -85,9 +85,9 @@ MAA 的意思是 MAA Assistant Arknights
## 外服支援
- 國際服(美服)
- 支援基本的刷理智、訪問好友、領取獎勵、自動肉鴿(測試版本)、公招辨識,請參考 [說明](resource/global/YoStarEN/readme.md)
+ 支援基本的刷理智、信用購物、訪問好友、領取獎勵、自動肉鴿(測試版本)、公招辨識,請參考 [說明](resource/global/YoStarEN/readme.md)
- 日服
- 支援基本的刷理智、自動公招、訪問好友、領取獎勵、自動肉鴿(測試版本)、公招辨識,請參考 [說明](resource/global/YoStarJP/readme.md)
+ 支援基本的刷理智、信用購物、自動公招、訪問好友、領取獎勵、自動肉鴿(測試版本)、公招辨識,請參考 [說明](resource/global/YoStarJP/readme.md)
- 韓服
支援基本的刷理智功能,請參考 [說明](resource/global/YoStarKR/readme.md)
- 繁中服
diff --git a/resource/global/YoStarEN/readme.md b/resource/global/YoStarEN/readme.md
index be878dc765..619491826c 100644
--- a/resource/global/YoStarEN/readme.md
+++ b/resource/global/YoStarEN/readme.md
@@ -9,7 +9,8 @@
- 刷理智(仅支持选择`当前关卡`)
- 使用理智药恢复理智
- 使用源石恢复理智
-- 刷理智指定
+- 刷理智指定次数
+- 信用购物(使用英文商品名)
- 访问好友
- 领取日常奖励
- 公招计算
@@ -25,6 +26,7 @@ Now supports:
- Restore with potion
- Restore with Originite
- Set the max number of auto battles
+- Credit Shopping (with English trade names)
- Friends visit
- Award collect
- Recruitment calculate
diff --git a/resource/global/YoStarEN/resource/tasks.json b/resource/global/YoStarEN/resource/tasks.json
index dadbe12450..a4db251b36 100644
--- a/resource/global/YoStarEN/resource/tasks.json
+++ b/resource/global/YoStarEN/resource/tasks.json
@@ -235,6 +235,56 @@
]
]
},
+ "Mall": {
+ "algorithm": "OcrDetect",
+ "action": "ClickSelf",
+ "text": [
+ "Store"
+ ],
+ "roi": [
+ 640,
+ 360,
+ 640,
+ 360
+ ],
+ "next": [
+ "CreditStoreOcr",
+ "Mall",
+ "ReturnToMallCloseAnno",
+ "TodaysSuppliesToMall"
+ ]
+ },
+ "CreditStoreOcr": {
+ "algorithm": "OcrDetect",
+ "text": [
+ "Credit Store"
+ ],
+ "roi": [
+ 1000,
+ 0,
+ 280,
+ 300
+ ],
+ "action": "ClickSelf",
+ "next": [
+ "CollectCredit",
+ "CreditStoreFailed",
+ "Stop"
+ ]
+ },
+ "CreditShop-NoMoney": {
+ "algorithm": "OcrDetect",
+ "text": [
+ "Insufficient Credit",
+ "Unable to"
+ ],
+ "roi": [
+ 940,
+ 60,
+ 339,
+ 110
+ ]
+ },
"Award": {
"template": "Task.png",
"action": "ClickSelf",
diff --git a/resource/global/YoStarEN/resource/template/CollectCredit.png b/resource/global/YoStarEN/resource/template/CollectCredit.png
new file mode 100644
index 0000000000..747368ba81
Binary files /dev/null and b/resource/global/YoStarEN/resource/template/CollectCredit.png differ
diff --git a/resource/global/YoStarEN/resource/template/CreditStoreFailed.png b/resource/global/YoStarEN/resource/template/CreditStoreFailed.png
new file mode 100644
index 0000000000..c94dc292cc
Binary files /dev/null and b/resource/global/YoStarEN/resource/template/CreditStoreFailed.png differ
diff --git a/resource/global/YoStarEN/resource/template/SoldOut.png b/resource/global/YoStarEN/resource/template/SoldOut.png
new file mode 100644
index 0000000000..aeb9a44314
Binary files /dev/null and b/resource/global/YoStarEN/resource/template/SoldOut.png differ
diff --git a/resource/global/YoStarJP/readme.md b/resource/global/YoStarJP/readme.md
index 2820ac54b9..0767b1fb06 100644
--- a/resource/global/YoStarJP/readme.md
+++ b/resource/global/YoStarJP/readme.md
@@ -12,6 +12,7 @@
- 刷理智指定次数
- 自动公招
- 访问好友
+- 信用商店(使用日文输入商品名)
- 领取日常奖励
- 公招计算
- 无限刷肉鸽(测试功能)
@@ -28,6 +29,7 @@ Supported features:
- Set the max number of auto battles
- Auto recruiting
- Visiting friend's infrastructure
+- Credit Shopping (with Japanese trade names)
- Collecting daily quest awards
- Recruitment calculate
- Auto Roguelike (beta)
@@ -44,6 +46,7 @@ Supported features:
- 自動戦闘の最大回数を指定する
- 自動公開求人
- 戦友訪問
+- FP交換所 (with Japanese trade names)
- デイリーリクエストのアワードを収集する
- 公開求人の計算
- 自動統合戦略(ベータ版)
diff --git a/resource/global/YoStarJP/resource/tasks.json b/resource/global/YoStarJP/resource/tasks.json
index 5af295428b..33b8dd667e 100644
--- a/resource/global/YoStarJP/resource/tasks.json
+++ b/resource/global/YoStarJP/resource/tasks.json
@@ -237,6 +237,56 @@
]
]
},
+ "Mall": {
+ "algorithm": "OcrDetect",
+ "action": "ClickSelf",
+ "text": [
+ "購買部"
+ ],
+ "roi": [
+ 640,
+ 360,
+ 640,
+ 360
+ ],
+ "next": [
+ "CreditStoreOcr",
+ "Mall",
+ "ReturnToMallCloseAnno",
+ "TodaysSuppliesToMall"
+ ]
+ },
+ "CreditStoreOcr": {
+ "algorithm": "OcrDetect",
+ "text": [
+ "FP交換所"
+ ],
+ "roi": [
+ 1000,
+ 0,
+ 280,
+ 300
+ ],
+ "action": "ClickSelf",
+ "next": [
+ "CollectCredit",
+ "CreditStoreFailed",
+ "Stop"
+ ]
+ },
+ "CreditShop-NoMoney": {
+ "algorithm": "OcrDetect",
+ "text": [
+ "足りません",
+ "FPが"
+ ],
+ "roi": [
+ 940,
+ 60,
+ 339,
+ 110
+ ]
+ },
"Award": {
"template": "Task.png",
"action": "ClickSelf",
diff --git a/resource/global/YoStarJP/resource/template/CollectCredit.png b/resource/global/YoStarJP/resource/template/CollectCredit.png
new file mode 100644
index 0000000000..9352992cfb
Binary files /dev/null and b/resource/global/YoStarJP/resource/template/CollectCredit.png differ
diff --git a/resource/global/YoStarJP/resource/template/CreditStoreFailed.png b/resource/global/YoStarJP/resource/template/CreditStoreFailed.png
new file mode 100644
index 0000000000..13bafecb16
Binary files /dev/null and b/resource/global/YoStarJP/resource/template/CreditStoreFailed.png differ
diff --git a/resource/global/YoStarJP/resource/template/SoldOut.png b/resource/global/YoStarJP/resource/template/SoldOut.png
new file mode 100644
index 0000000000..dca470f5e2
Binary files /dev/null and b/resource/global/YoStarJP/resource/template/SoldOut.png differ
diff --git a/resource/tasks.json b/resource/tasks.json
index 6d68a5a2cb..d164db6e85 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -3851,10 +3851,10 @@
"CreditStoreFailed": {
"action": "DoNothing",
"roi": [
- 76,
- 44,
- 144,
- 127
+ 0,
+ 45,
+ 216,
+ 124
],
"next": [
"CreditStoreOcr"
diff --git a/resource/template/BuyIt.png b/resource/template/BuyIt.png
index f622d7ddce..4d1d1487ed 100644
Binary files a/resource/template/BuyIt.png and b/resource/template/BuyIt.png differ
diff --git a/src/MeoAsstGui/Resources/Localizations/en-us.xaml b/src/MeoAsstGui/Resources/Localizations/en-us.xaml
index a0158d9233..8cad7d2b91 100644
--- a/src/MeoAsstGui/Resources/Localizations/en-us.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/en-us.xaml
@@ -144,6 +144,8 @@
Social Point shopping
Whitelist (split by semicolon)
Blacklist (split by semicolon)
+ Recruitment Permit;LMD
+ Carbon;Furniture Part
Would you like a drink🍷? doctor
Ignore blacklist if credit overflow
diff --git a/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml b/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml
index 04d3a0f3e3..52a2615472 100644
--- a/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml
@@ -140,9 +140,11 @@
純正源石使用確認画面で理性が1回復するのを待って、純正源石を使用します
FP交換
- 優先購入(中国名/セミコロンで区切)
+ 優先購入(OCR/セミコロンで区切)
- ブラックリスト(中国名/セミコロンで区切)
+ ブラックリスト(OCR/セミコロンで区切)
+ 求人票;龍門幣
+ 炭素材;家具
飲み物はいかがですか🍷?ドクター
diff --git a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
index 83f2ef06dc..7f4b74da94 100644
--- a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
@@ -147,6 +147,8 @@
信用购物
优先购买 子串即可 分号分隔
黑名单 子串即可 分号分隔
+ 招聘许可;龙门币
+ 碳;家具
要来一杯美酒吗🍷?博士
信用溢出时无视黑名单
diff --git a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs
index 617523a89b..5d756421f1 100644
--- a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs
+++ b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs
@@ -933,7 +933,7 @@ namespace MeoAsstGui
}
}
- private string _creditFirstList = ViewStatusStorage.Get("Mall.CreditFirstListNew", "招聘许可;龙门币");
+ private string _creditFirstList = ViewStatusStorage.Get("Mall.CreditFirstListNew", Localization.GetString("HighPriorityDefault"));
///
/// Gets or sets the priority item list of credit shop.
@@ -948,7 +948,7 @@ namespace MeoAsstGui
}
}
- private string _creditBlackList = ViewStatusStorage.Get("Mall.CreditBlackListNew", "碳;家具");
+ private string _creditBlackList = ViewStatusStorage.Get("Mall.CreditBlackListNew", Localization.GetString("BlacklistDefault"));
///
/// Gets or sets the blacklist of credit shop.