From a461ce11d45e6e47ef62e11f2936f38fccf0462d Mon Sep 17 00:00:00 2001 From: MistEO Date: Sat, 24 Sep 2022 23:53:39 +0800 Subject: [PATCH] feat: support credit shopping for JP and EN clients --- README.md | 4 +- README_en-US.md | 4 +- README_ja-JP.md | 4 +- README_zh-TW.md | 4 +- resource/global/YoStarEN/readme.md | 4 +- resource/global/YoStarEN/resource/tasks.json | 50 ++++++++++++++++++ .../resource/template/CollectCredit.png | Bin 0 -> 1980 bytes .../resource/template/CreditStoreFailed.png | Bin 0 -> 4069 bytes .../YoStarEN/resource/template/SoldOut.png | Bin 0 -> 6144 bytes resource/global/YoStarJP/readme.md | 3 ++ resource/global/YoStarJP/resource/tasks.json | 50 ++++++++++++++++++ .../resource/template/CollectCredit.png | Bin 0 -> 2837 bytes .../resource/template/CreditStoreFailed.png | Bin 0 -> 2884 bytes .../YoStarJP/resource/template/SoldOut.png | Bin 0 -> 6596 bytes resource/tasks.json | 8 +-- resource/template/BuyIt.png | Bin 5165 -> 16115 bytes .../Resources/Localizations/en-us.xaml | 2 + .../Resources/Localizations/ja-jp.xaml | 6 ++- .../Resources/Localizations/zh-cn.xaml | 2 + .../ViewModels/SettingsViewModel.cs | 4 +- 20 files changed, 128 insertions(+), 17 deletions(-) create mode 100644 resource/global/YoStarEN/resource/template/CollectCredit.png create mode 100644 resource/global/YoStarEN/resource/template/CreditStoreFailed.png create mode 100644 resource/global/YoStarEN/resource/template/SoldOut.png create mode 100644 resource/global/YoStarJP/resource/template/CollectCredit.png create mode 100644 resource/global/YoStarJP/resource/template/CreditStoreFailed.png create mode 100644 resource/global/YoStarJP/resource/template/SoldOut.png diff --git a/README.md b/README.md index 48d3a9ae29..7119e1e1f5 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 e7c002067a..93f7435995 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 7d893a7c99..5c5c024912 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 160635e2a0..6dc5bf0d8a 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 0000000000000000000000000000000000000000..747368ba81b978a30fa14f72b826931cdf0306cd GIT binary patch literal 1980 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 literal 0 HcmV?d00001 diff --git a/resource/global/YoStarEN/resource/template/SoldOut.png b/resource/global/YoStarEN/resource/template/SoldOut.png new file mode 100644 index 0000000000000000000000000000000000000000..aeb9a4431425f9cc0c8ce111d204da23cb0d6480 GIT binary patch literal 6144 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 U`819WPR9_-Yc^(8NW#Pa08CSbDgXcg literal 0 HcmV?d00001 diff --git a/resource/global/YoStarJP/resource/template/SoldOut.png b/resource/global/YoStarJP/resource/template/SoldOut.png new file mode 100644 index 0000000000000000000000000000000000000000..dca470f5e253cbf0c40947f4c782251dc4d6dfbb GIT binary patch literal 6596 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 literal 5165 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 R|GjwtxQdo?m7-Pn{{U(s+G79! diff --git a/src/MeoAsstGui/Resources/Localizations/en-us.xaml b/src/MeoAsstGui/Resources/Localizations/en-us.xaml index 63cc84c774..caeded08df 100644 --- a/src/MeoAsstGui/Resources/Localizations/en-us.xaml +++ b/src/MeoAsstGui/Resources/Localizations/en-us.xaml @@ -143,6 +143,8 @@ Social Point shopping Whitelist (split by semicolon) Blacklist (split by semicolon) + Recruitment Permit;LMD + Carbon;Furniture Part Would you like a drink🍷? doctor Drone Usage diff --git a/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml b/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml index 3352526ece..1b00a5cf02 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 0b500a0e3a..15fddef03f 100644 --- a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml +++ b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml @@ -143,6 +143,8 @@ 信用购物 优先购买 子串即可 分号分隔 黑名单 子串即可 分号分隔 + 招聘许可;龙门币 + 碳;家具 要来一杯美酒吗🍷?博士 无人机用途 diff --git a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs index ce8765373a..a7b116b796 100644 --- a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs +++ b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs @@ -918,7 +918,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. @@ -933,7 +933,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.