Merge pull request #1930 from MaaAssistantArknights/feat/more_overseas_support

feat: support more features for overseas clients

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)
 - 繁中服  

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  

README_ja-JP.md

@@ -84,10 +84,10 @@ UIを見れば使い方もすぐ分かる！
 ## サーバーに応じてサポートされる機能
 
 - アメリカサーバー  
-  作戦、戦友訪問、レワード収集、統合戦略（ベータ版）、公開求人認識の機能がサポートされている。  
+  作戦、戦友訪問、FP交換所、レワード収集、統合戦略（ベータ版）、公開求人認識の機能がサポートされている。  
   サポート内容については[README](resource/global/YoStarEN/readme.md)を参照してください。
 - 日本サーバー  
-  作戦、自動公開求人、戦友訪問、レワード収集、統合戦略（ベータ版）、公開求人認識の機能がサポートされている。  
+  作戦、自動公開求人、戦友訪問、FP交換所、レワード収集、統合戦略（ベータ版）、公開求人認識の機能がサポートされている。  
   サポート内容については[README](resource/global/YoStarJP/readme.md)を参照してください。
 - 韓国サーバー  
   基本的な作戦機能のみサポートされている。  

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)
 - 繁中服  

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

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",

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)
 - デイリーリクエストのアワードを収集する
 - 公開求人の計算
 - 自動統合戦略（ベータ版）

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": [
+            "足りません",
+            "FＰが"
+        ],
+        "roi": [
+            940,
+            60,
+            339,
+            110
+        ]
+    },
     "Award": {
         "template": "Task.png",
         "action": "ClickSelf",

resource/tasks.json

@@ -3851,10 +3851,10 @@
     "CreditStoreFailed": {
         "action": "DoNothing",
         "roi": [
-            76,
-            44,
-            144,
-            127
+            0,
+            45,
+            216,
+            124
         ],
         "next": [
             "CreditStoreOcr"

src/MeoAsstGui/Resources/Localizations/en-us.xaml

@@ -144,6 +144,8 @@
     <system:String x:Key="SocialPtShop">Social Point shopping</system:String>
     <system:String x:Key="HighPriority">Whitelist (split by semicolon)</system:String>
     <system:String x:Key="Blacklist">Blacklist (split by semicolon)</system:String>
+    <system:String x:Key="HighPriorityDefault">Recruitment Permit;LMD</system:String>
+    <system:String x:Key="BlacklistDefault">Carbon;Furniture Part</system:String>
     <system:String x:Key="Drink">Would you like a drink🍷? doctor</system:String>
     <system:String x:Key="ForceShoppingIfCreditFull">Ignore blacklist if credit overflow</system:String>
 

src/MeoAsstGui/Resources/Localizations/ja-jp.xaml

@@ -140,9 +140,11 @@
     <system:String x:Key="DrGrandetTip">純正源石使用確認画面で理性が1回復するのを待って、純正源石を使用します</system:String>
 
     <system:String x:Key="SocialPtShop">FP交換</system:String>
-    <system:String x:Key="HighPriority">優先購入（中国名/セミコロンで区切）</system:String>
+    <system:String x:Key="HighPriority">優先購入（OCR/セミコロンで区切）</system:String>
     <!--日本語名は未対応？-->
-    <system:String x:Key="Blacklist">ブラックリスト（中国名/セミコロンで区切）</system:String>
+    <system:String x:Key="Blacklist">ブラックリスト（OCR/セミコロンで区切）</system:String>
+    <system:String x:Key="HighPriorityDefault">求人票；龍門幣</system:String>
+    <system:String x:Key="BlacklistDefault">炭素材；家具</system:String>
     <!--日本語名は未対応？-->
     <system:String x:Key="Drink">飲み物はいかがですか🍷？ドクター</system:String>
 

src/MeoAsstGui/Resources/Localizations/zh-cn.xaml

@@ -147,6 +147,8 @@
     <system:String x:Key="SocialPtShop">信用购物</system:String>
     <system:String x:Key="HighPriority">优先购买 子串即可 分号分隔</system:String>
     <system:String x:Key="Blacklist">黑名单 子串即可 分号分隔</system:String>
+    <system:String x:Key="HighPriorityDefault">招聘许可；龙门币</system:String>
+    <system:String x:Key="BlacklistDefault">碳；家具</system:String>
     <system:String x:Key="Drink">要来一杯美酒吗🍷？博士</system:String>
     <system:String x:Key="ForceShoppingIfCreditFull">信用溢出时无视黑名单</system:String>
 

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"));
 
         /// <summary>
         /// 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"));
 
         /// <summary>
         /// Gets or sets the blacklist of credit shop.