feat: Suppots ALL client like EN, JP, KR, ZH_TW, Suppots basic function of JP client

README-en.md

@@ -73,8 +73,10 @@ Please refer to: [FAQ](docs/en/FAQ.md)
 
 ## Supports for overseas servers
 
-- YoStarEN Server  
-  Supports basic features like Combat, Recruiting, etc. See also [README](resource/global/YoStarEN/readme.md)
+- EN Server  
+  Supports basic features like Combat, Recruiting, Visiting, Collocting, etc. See also [README](resource/global/YoStarEN/readme.md)
+- JP Server  
+  Supports basic features like Combat, etc.  See also [README](resource/global/YoStarJP/readme.md)
 - Other servers  
   TODO
 

README.md

@@ -81,8 +81,10 @@ MAA 的意思是 MAA Assistant Arknights
 ## 外服支持
 
 - 国际服（美服）  
-  支持基本的刷理智、公招识别功能，请参考 [说明](resource/global/YoStarEN/readme.md)
-- 其他服  
+  支持基本的刷理智、公招识别、访问好友、领取奖励功能，请参考 [说明](resource/global/YoStarEN/readme.md)
+- 日服  
+  支持基本的刷理智功能，请参考 [说明](resource/global/YoStarJP/readme.md)
+- 其他服
   计划适配中……
 
 ## 主要关联项目

resource/config.json

@@ -26,7 +26,10 @@
     "intent": {
         "Official": "com.hypergryph.arknights/com.u8.sdk.U8UnityContext",
         "Bilibili": "com.hypergryph.arknights.bilibili/com.u8.sdk.SplashActivity",
-        "YoStarEN": "com.YoStarEN.Arknights/com.u8.sdk.U8UnityContext"
+        "YoStarEN": "com.YoStarEN.Arknights/com.u8.sdk.U8UnityContext",
+        "YoStarJP": "com.YoStarJP.Arknights/com.u8.sdk.U8UnityContext",
+        "YoStarKR": "com.YoStarKR.Arknights/com.u8.sdk.U8UnityContext",
+        "txwy": "tw.txwy.and.arknights/com.u8.sdk.U8UnityContext"
     },
     "connection": {
         "General": {

resource/global/YoStarEN/readme.md

@@ -1,8 +1,8 @@
-# YoStarEN server
+# YoStarEN client
 
 ## 国际服（美服）
 
-请进入 `设置` - `启动设置` - `客户端版本` 选择 `悠星国际服`
+请进入 `设置` - `启动设置` - `客户端版本` 选择 `国际服`
 
 目前支持：  
 
@@ -11,8 +11,10 @@
 - 使用源石恢复理智
 - 指定次数
 - 公招计算
+- 访问好友
+- 领取日常奖励
 
-## YoStarEN
+## Global (EN)
 
 Please go to `Settings` - `Startup Settings` - `Client Version` and select `YoStarEN`
 
@@ -23,3 +25,5 @@ Now supports:
 - Restore with Originite
 - Set the max number of auto battles
 - Recruitment calculate
+- Friends visit
+- Award collect

resource/global/YoStarEN/resource/tasks.json

@@ -59,48 +59,6 @@
             "ClickCorner"
         ]
     },
-    "TodaysSupplies": {
-        "algorithm": "OcrDetect",
-        "text": [
-            "Resource Today"
-        ],
-        "action": "ClickRect",
-        "specificRect": [
-            1000,
-            1,
-            270,
-            340
-        ],
-        "roi": [
-            500,
-            50,
-            300,
-            150
-        ],
-        "next": [
-            "CloseAnno",
-            "Terminal"
-        ]
-    },
-    "GoLastBattle": {
-        "algorithm": "OcrDetect",
-        "text": [
-            "recent",
-            "stage"
-        ],
-        "roi": [
-            900,
-            500,
-            280,
-            100
-        ],
-        "action": "ClickSelf",
-        "next": [
-            "UsePrts",
-            "UsePrts-StageSN",
-            "StartButton1"
-        ]
-    },
     "VisitNextOcr": {
         "algorithm": "OcrDetect",
         "text": [
@@ -153,24 +111,6 @@
             "ReturnToHome"
         ]
     },
-    "MallLoading": {
-        "algorithm": "OcrDetect",
-        "action": "DoNothing",
-        "text": [
-            "Submitting",
-            "feedback"
-        ],
-        "roi": [
-            700,
-            600,
-            300,
-            120
-        ],
-        "next": [
-            "MallLoading",
-            "CreditStoreOcr"
-        ]
-    },
     "RecruitTags": {
         "algorithm": "OcrDetect",
         "text": [],
@@ -295,81 +235,6 @@
             ]
         ]
     },
-    "RecruitLoading": {
-        "algorithm": "OcrDetect",
-        "action": "DoNothing",
-        "text": [
-            "Submitting",
-            "feedback"
-        ],
-        "roi": [
-            700,
-            600,
-            300,
-            120
-        ],
-        "next": [
-            "RecruitLoading",
-            "Stop"
-        ]
-    },
-    "InfrastReward": {
-        "algorithm": "OcrDetect",
-        "text": [
-            "Collectable",
-            "Orders",
-            "Acquired",
-            "Trust"
-        ],
-        "action": "ClickSelf",
-        "roi": [
-            0,
-            600,
-            800,
-            118
-        ],
-        "cache": false,
-        "next": [
-            "InfrastReward",
-            "InfrastExitReward"
-        ]
-    },
-    "InfrastStationedInfo": {
-        "algorithm": "OcrDetect",
-        "action": "ClickSelf",
-        "cache": false,
-        "text": [
-            "Operator"
-        ],
-        "roi": [
-            0,
-            0,
-            150,
-            720
-        ],
-        "rearDelay": 1000,
-        "next": [
-            "InfrastEnterOperList"
-        ]
-    },
-    "InfrastEnterOperList": {
-        "algorithm": "OcrDetect",
-        "cache": false,
-        "action": "ClickSelf",
-        "text": [
-            "Morale",
-            "Resting",
-            "Working",
-            "Assign"
-        ],
-        "roi": [
-            800,
-            0,
-            480,
-            650
-        ],
-        "rearDelay": 1000
-    },
     "Award": {
         "template": "Task.png",
         "action": "ClickSelf",

resource/global/YoStarJP/readme.md

@@ -0,0 +1,34 @@
+# YoStarJP client
+
+## 日服
+
+请进入 `设置` - `启动设置` - `客户端版本` 选择 `日服`
+
+目前支持：  
+
+- 刷理智（仅支持选择`当前关卡`）
+- 使用理智药恢复理智
+- 使用源石恢复理智
+- 指定次数
+
+## Japanese
+
+Please go to `Settings` - `Startup Settings` - `Client Version` and select `YoStarJP`
+
+Now supports:  
+
+- Auto battle (only supports selecting `current stage`)
+- Restore with potion
+- Restore with Originite
+- Set the max number of auto battles
+
+## 日本
+
+「設定」-「スタートアップ設定」-「クライアントバージョン」に移動し、「YoStarJP」を選択してください
+
+現在サポートされています：
+
+- オートバトラー（「現在のステージ」の選択のみをサポート）
+- ポーションで復元
+- Originiteで復元
+- 自動戦闘の最大数を設定します

resource/global/YoStarJP/resource/PaddleOCR/det/version.txt

@@ -0,0 +1 @@
+Multilingual_PP-OCRv3_det_infer

resource/global/YoStarJP/resource/PaddleOCR/dict_version.txt

@@ -0,0 +1 @@
+japan_dict.txt

resource/global/YoStarJP/resource/PaddleOCR/rec/version.txt

@@ -0,0 +1 @@
+japan_PP-OCRv3_rec_infer

resource/global/YoStarJP/resource/tasks.json

@@ -0,0 +1,62 @@
+{
+    "StartButton1": {
+        "algorithm": "OcrDetect",
+        "text": [
+            "行動開始"
+        ],
+        "preDelay": 500,
+        "roi": [
+            1000,
+            600,
+            280,
+            120
+        ],
+        "exceededNext": [
+            "StageSNReturnFlag",
+            "Stop"
+        ],
+        "action": "ClickSelf",
+        "next": [
+            "StartButton2",
+            "UseMedicine",
+            "UseStone",
+            "NoStone",
+            "OfflineConfirm"
+        ]
+    },
+    "PRTS": {
+        "algorithm": "OcrDetect",
+        "text": [
+            "残り配置可能数"
+        ],
+        "roi": [
+            0,
+            500,
+            1280,
+            220
+        ],
+        "action": "DoNothing",
+        "rearDelay": 5000,
+        "next": [
+            "PRTS",
+            "PRTS3",
+            "EndOfAction",
+            "PrtsErrorConfirm",
+            "OfflineConfirm",
+            "WaitAfterPRTS"
+        ]
+    },
+    "EndOfAction": {
+        "Doc": "This task registered the StageDropsTaskPlugin",
+        "roi": [
+            791,
+            410,
+            296,
+            145
+        ],
+        "action": "DoNothing",
+        "next": [
+            "ClickCorner"
+        ]
+    }
+}

resource/global/YoStarKR/PaddleOCR/det/version.txt

@@ -0,0 +1 @@
+Multilingual_PP-OCRv3_det_infer

resource/global/YoStarKR/PaddleOCR/dict_version.txt

@@ -0,0 +1 @@
+korean_dict.txt

resource/global/YoStarKR/PaddleOCR/rec/version.txt

@@ -0,0 +1 @@
+korean_PP-OCRv3_rec_infer

resource/global/txwy/PaddleOCR/det/version.txt

@@ -0,0 +1 @@
+Multilingual_PP-OCRv3_det_infer

resource/global/txwy/PaddleOCR/dict_version.txt

@@ -0,0 +1 @@
+chinese_cht_dict.txt

resource/global/txwy/PaddleOCR/rec/version.txt

@@ -0,0 +1 @@
+chinese_cht_PP-OCRv3_rec_infer

src/MeoAsstGui/Helper/AsstProxy.cs

@@ -93,36 +93,58 @@ namespace MeoAsstGui
             }
         }
 
-        private string _curResource = "";
+        private string _curResource = "_Unloaded";
 
         public bool LoadGlobalResource()
         {
-            bool loaded = true;
             var settingsModel = _container.Get<SettingsViewModel>();
-            if (_curResource.Length == 0
-                && settingsModel.ClientType == "YoStarEN"
-                && _curResource != settingsModel.ClientType)
+            if (settingsModel.ClientType == _curResource)
             {
-                loaded = AsstLoadResource(System.IO.Directory.GetCurrentDirectory() + "\\resource\\global\\YoStarEN");
-                _curResource = "YoStarEN";
+                return true;
             }
-            // 这种是手贱看国际服点了一下，又点回官服的
-            else if (_curResource.Length != 0
-                && (settingsModel.ClientType == "Official" || settingsModel.ClientType == "Bilibili" || settingsModel.ClientType == String.Empty))
+
+            bool loaded = true;
+            if (settingsModel.ClientType == String.Empty
+                || settingsModel.ClientType == "Official" || settingsModel.ClientType == "Bilibili")
             {
+                // The resources of Official and Bilibili are the same
+                if (_curResource == "Official" || _curResource == "Bilibili")
+                {
+                    return true;
+                }
                 loaded = AsstLoadResource(System.IO.Directory.GetCurrentDirectory());
-                _curResource = "";
+            }
+            else if (_curResource == "Official" || _curResource == "Bilibili")
+            {
+                // Load basic resources for CN client first
+                // Then load global incremental resources
+                loaded = AsstLoadResource(System.IO.Directory.GetCurrentDirectory() + "\\resource\\global\\" + settingsModel.ClientType);
+            }
+            else
+            {
+                // Load basic resources for CN client first
+                // Then load global incremental resources
+                loaded = AsstLoadResource(System.IO.Directory.GetCurrentDirectory())
+                    && AsstLoadResource(System.IO.Directory.GetCurrentDirectory() + "\\resource\\global\\" + settingsModel.ClientType);
+            }
+
+            if (loaded)
+            {
+                if (settingsModel.ClientType == String.Empty)
+                {
+                    _curResource = "Official";
+                }
+                else
+                {
+                    _curResource = settingsModel.ClientType;
+                }
             }
             return loaded;
         }
 
         public void Init()
         {
-            // basic resource for CN client
-            bool loaded = AsstLoadResource(System.IO.Directory.GetCurrentDirectory());
-            _curResource = "";
-
-            loaded = LoadGlobalResource();
+            bool loaded = LoadGlobalResource();
 
             _handle = AsstCreateEx(_callback, IntPtr.Zero);
 

src/MeoAsstGui/ViewModels/RootViewModel.cs

@@ -32,8 +32,8 @@ namespace MeoAsstGui
         {
             _trayIcon = new TrayIcon();
             CheckAndUpdateNow();
-            InitProxy();
             InitViewModels();
+            InitProxy();
             ShowUpdateOrDownload();
         }
 

src/MeoAsstGui/ViewModels/SettingsViewModel.cs

@@ -143,7 +143,10 @@ namespace MeoAsstGui
                 new CombData { Display = "不选择", Value = "" },
                 new CombData { Display = "官服", Value = "Official" },
                 new CombData { Display = "Bilibili服", Value = "Bilibili" },
-                new CombData { Display = "悠星国际服 (YoStarEN)", Value = "YoStarEN" }
+                new CombData { Display = "国际服 (YoStarEN)", Value = "YoStarEN" },
+                new CombData { Display = "日服 (YoStarJP)", Value = "YoStarJP" },
+                new CombData { Display = "韩服 (YoStarKR)", Value = "YoStarKR" },
+                new CombData { Display = "繁中服 (txwy)", Value = "txwy" }
             };
         }