From ae005500a7bcd4b943ffe87a273e0efd3a80b1ac Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Sun, 18 Sep 2022 23:44:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=9F=BA=E5=BB=BA=E4=B8=8D=E9=80=89=E6=8B=A9=E2=80=9D?=
 =?UTF-8?q?=E6=8A=80=E8=83=BD=E2=80=9C=E6=8E=92=E5=BA=8F=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/tasks.json                           |  11 ++++
 .../InfrastOperListTabSkillUnClicked.png      | Bin 0 -> 1171 bytes
 src/MeoAssistant/InfrastAbstractTask.cpp      |  14 ++++-
 src/MeoAssistant/InfrastAbstractTask.h        |   2 +-
 src/MeoAssistant/InfrastDormTask.cpp          |   4 +-
 src/MeoAsstGui/Helper/AsstProxy.cs            |   4 ++
 .../Resources/Localizations/en-us.xaml        |   2 +-
 .../Resources/Localizations/ja-jp.xaml        |  49 ++++++++++++------
 .../Resources/Localizations/zh-cn.xaml        |   4 +-
 9 files changed, 66 insertions(+), 24 deletions(-)
 create mode 100644 resource/template/InfrastOperListTabSkillUnClicked.png

diff --git a/resource/tasks.json b/resource/tasks.json
index 6b9c1003f3..0b25d6b4a6 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -5829,6 +5829,17 @@
             "ClueGiveTo1stConfirm"
         ]
     },
+    "InfrastOperListTabSkillUnClicked": {
+        "action": "ClickSelf",
+        "roi": [
+            818,
+            0,
+            128,
+            115
+        ],
+        "templThreshold": 0.7,
+        "rearDelay": 1500
+    },
     "BattleStageName": {
         "algorithm": "OcrDetect",
         "cache": false,
diff --git a/resource/template/InfrastOperListTabSkillUnClicked.png b/resource/template/InfrastOperListTabSkillUnClicked.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e99e5bbb27a19f8e37a200aa6b62c4823655700
GIT binary patch
literal 1171
zcmV;E1Z?|>P)<h;3K|Lk000e1NJLTq000~S000jN0ssI2cr7^g000D9Nkl<ZI1#PE
z?MoUD902g|fmm)?Ahu>gVd!mkJ8QwNSfkz<trydwZs06dF9H>M(-Fz&Wg~KpJw$|h
zVm7QjXl!n<MJ$YwMYW=J>;cj+i=$GR<&~^%ApBr|!0+=xu3WhS|2G83aj{rzFc^G3
zUox45ob%_;-@kv~@AvQQ?7%<r^Yb+tO*kBmMxy|bmzSs0>6Vw5zkmM@|3GjYM^V)6
zcHg^qFA|AB&V>sX-o1O*+1a_ex(feLtJQsdeZ9TCIF9@M{-dL#@$qq|(>XmoU0q!*
z5C~>xXE}~Ta2!Wb)a`bgOr}gGqgJZ{prD|jqod>X>(}vk8~_#;7JmHrQBqR!{Q2{6
zIP7pZhK7dX@%W=hkH*KxfByU_&IyG=Po6wEIXOW-efm^UQ6ZDbB9X|(#zt{*F#z!S
z{Hs^5(lnh;rvbp{^Ucl8ktBKd?%iL%ex074ibSGw=gxI^ciU{XgM))WAh5Esl1wI9
zmOVQ=Lr9X8%jIotZ4^Z<EG(?AuLD4Fad99Juvjc>Yij^-mQz<(CzHt-hDjt6*=)9{
zsVN)|_w@8o6!rG)TL94Mbfu-GPoF+TR4NsUq7+4$Os04|e*OA&KA&G$SlH9k<8U~l
z(J0HZOG`^E%St4Y_V#x8Pdc4;I-R4VqX4kJzK$RWK@juv^LD!(QK?iYih4XAyWO5h
zB&=4eL?VeqB9K#3Qi34JojZ5-_xCXjqbTa-%a<(6DwRrwLebLF(%jr!Q&aQj&mRCt
zrBZL+ykQsy85kI7Y-}V5Vt04f@Aq$SZ+CZhcXoC%3?mQ-1_uXsc6Mww8^>`NhEWtX
zIXRihWH1a<C=@!K?%A_v6B833KYlDKDw0a2G))5lGBq_N6bfr=YrDF-R##W^^72MT
zM!tRfHZ(M((P+$Ov(;*)X&L}3D=R6AdiClR%d$$PQZAPp3<j^)`{BcfR4R4r)~(~?
zW0E8ji3CCrM0t6+%jGheOwni*L6B?Lu04GCaAsyktyYhXjk(=!j^h9T!!W1Q>G61u
zj*e6+6^`S2z258f^7;JD&CSoBKZio0y}dmEK&q;$P!x5!Tqct#8jS*gNF?g-@2{(?
zqiNb|wI&h?$iXm-qNrdnczk@UP$<gE%Jh1@*Xs=g0zRKFo6Rbf%8H7L_wU~$_4W0a
zFJFHA_;G7%E5~sJL1?vFp-{NExOn5njaV$^^ZCAh{d#b4fMMA1@UTv&V_8<K)f$aP
zgTdhOc!I&;)YKFJ+`fIgp`oF*wH0x@-AzqRzkmO>SS%z-R#sMi`SN9AVj>ocUAlCs
zt*x!5re=D2+HSWimCE7aVWZJ#Hk%28plO;U$p;S})YsP^9v%XKKp=SW;>Fn57;^LG
zO|e+a<XpUX5dav5;W!R*cs!m|D$QgvdwY9Ap%BBcm6esUva*7Lf~~EsWHKof3MCQ=
lkH-UmY&IK<#ZFF6{sQaa8%pcDc&Y#Z002ovPDHLkV1kJ`HVyy)

literal 0
HcmV?d00001

diff --git a/src/MeoAssistant/InfrastAbstractTask.cpp b/src/MeoAssistant/InfrastAbstractTask.cpp
index 31a514d209..303aca0f54 100644
--- a/src/MeoAssistant/InfrastAbstractTask.cpp
+++ b/src/MeoAssistant/InfrastAbstractTask.cpp
@@ -152,10 +152,22 @@ void asst::InfrastAbstractTask::await_swipe()
     sleep(extra_delay);
 }
 
-bool asst::InfrastAbstractTask::swipe_and_select_custom_opers()
+bool asst::InfrastAbstractTask::swipe_and_select_custom_opers(bool order_by_skill)
 {
     LogTraceFunction;
 
+    {
+        json::value cb_info = basic_info_with_what("CustomInfrastRoomOperators");
+        auto& details = cb_info["details"];
+        details["names"] = json::array(m_current_room_custom_config.names);
+        details["candidates"] = json::array(m_current_room_custom_config.candidates);
+        callback(AsstMsg::SubTaskExtraInfo, cb_info);
+    }
+
+    if (order_by_skill) {
+        ProcessTask(*this, { "InfrastOperListTabSkillUnClicked", "Stop" }).run();
+    }
+
     while (true) {
         if (need_exit()) {
             return false;
diff --git a/src/MeoAssistant/InfrastAbstractTask.h b/src/MeoAssistant/InfrastAbstractTask.h
index 5d9adc6fb7..4169b64250 100644
--- a/src/MeoAssistant/InfrastAbstractTask.h
+++ b/src/MeoAssistant/InfrastAbstractTask.h
@@ -37,7 +37,7 @@ namespace asst
         void async_swipe_of_operlist(bool reverse = false);
         void await_swipe();
         bool is_use_custom_config();
-        bool swipe_and_select_custom_opers();
+        bool swipe_and_select_custom_opers(bool order_by_skill = true);
         bool select_custom_opers();
 
         virtual bool click_bottom_left_tab(); // 点击进入设施后，左下角的tab（我也不知道这玩意该叫啥）
diff --git a/src/MeoAssistant/InfrastDormTask.cpp b/src/MeoAssistant/InfrastDormTask.cpp
index a995df9b0f..9c0530e4a4 100644
--- a/src/MeoAssistant/InfrastDormTask.cpp
+++ b/src/MeoAssistant/InfrastDormTask.cpp
@@ -47,7 +47,7 @@ bool asst::InfrastDormTask::_run()
         click_clear_button();
 
         if (is_use_custom_config()) {
-            swipe_and_select_custom_opers();
+            swipe_and_select_custom_opers(false);
         }
         else {
             opers_choose();
@@ -218,4 +218,4 @@ bool asst::InfrastDormTask::opers_choose()
 //
 //     ProcessTask task(*this, { "InfrastDormConfirmButton" });
 //     return task.run();
-// }
\ No newline at end of file
+// }
diff --git a/src/MeoAsstGui/Helper/AsstProxy.cs b/src/MeoAsstGui/Helper/AsstProxy.cs
index b693d6ccf1..e6bbf1fca9 100644
--- a/src/MeoAsstGui/Helper/AsstProxy.cs
+++ b/src/MeoAsstGui/Helper/AsstProxy.cs
@@ -909,6 +909,10 @@ namespace MeoAsstGui
                 case "UnsupportedLevel":
                     copilotModel.AddLog(Localization.GetString("UnsupportedLevel"), LogColor.Error);
                     break;
+
+                case "CustomInfrastRoomOperators":
+                    mainModel.AddLog(subTaskDetails["names"].ToString());
+                    break;
             }
         }
 
diff --git a/src/MeoAsstGui/Resources/Localizations/en-us.xaml b/src/MeoAsstGui/Resources/Localizations/en-us.xaml
index 9584f61ea4..65816cbbd8 100644
--- a/src/MeoAsstGui/Resources/Localizations/en-us.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/en-us.xaml
@@ -259,7 +259,7 @@
     <!--  Recruitment Recognition  -->
 
     <!--  Depot Recognition  -->
-    <system:String x:Key="DepotRecognition">Depot tool alpha</system:String>
+    <system:String x:Key="DepotRecognition">Depot tool beta</system:String>
     <system:String x:Key="DepotRecognitionTip">This function is still a test version, please check if the recognition result is correct before using it. If there is an error, please submit the issue by compressing the debug/depot folder in the working path.</system:String>
     <system:String x:Key="BeganToDepotRecognition">Start to identify</system:String>
     <system:String x:Key="ExportToArkplanner">Export to Arkplanner</system:String>
diff --git a/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml b/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml
index e9a070783a..ca98d0ca34 100644
--- a/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml
@@ -36,7 +36,8 @@
     <system:String x:Key="OriginStone">製造所-源石の欠片</system:String>
     <system:String x:Key="Chip">製造所-中級SoC</system:String>
     <system:String x:Key="DormTrustEnabled">宿舎の空き位置で信頼を上げる</system:String>
-    <system:String x:Key="DormFilterNotStationedEnabled">作業中のオペレーターを宿舎に移動しない</system:String><!--現状動作不明のため対応次第訳修正-->
+    <system:String x:Key="DormFilterNotStationedEnabled">作業中のオペレーターを宿舎に移動しない</system:String>
+    <!--現状動作不明のため対応次第訳修正-->
     <system:String x:Key="OriginiumShardAutoReplenishment">源石の欠片は自動で補充する</system:String>
 
     <system:String x:Key="General">一般モード</system:String>
@@ -134,15 +135,18 @@
     <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="Blacklist">ブラックリスト（中国名/セミコロンで区切）</system:String><!--日本語名は未対応？-->
+    <system:String x:Key="HighPriority">優先購入（中国名/セミコロンで区切）</system:String>
+    <!--日本語名は未対応？-->
+    <system:String x:Key="Blacklist">ブラックリスト（中国名/セミコロンで区切）</system:String>
+    <!--日本語名は未対応？-->
     <system:String x:Key="Drink">飲み物はいかがですか🍷？ドクター</system:String>
 
     <system:String x:Key="DroneUsage">ドローンの使用</system:String>
 
     <system:String x:Key="MinimizeToTray">最小化した際にトレイに表示</system:String>
     <system:String x:Key="SystemNotification">重要な通知をポップアップする</system:String>
-    <system:String x:Key="UseAlternateStage">代替ステージを選択可能にする</system:String><!--現状動作内容不明のため翻訳修正候補-->
+    <system:String x:Key="UseAlternateStage">代替ステージを選択可能にする</system:String>
+    <!--現状動作内容不明のため翻訳修正候補-->
     <system:String x:Key="HideUnavailableStage">当日開放されないステージを隠す</system:String>
     <system:String x:Key="MainViewButtonFeature">スタート画面に表示する便利ボタン</system:String>
     <system:String x:Key="CustomStageCode">ステージ名を入力する</system:String>
@@ -183,12 +187,15 @@
     <system:String x:Key="ExitMAAAndCloseEmulatorAndHibernate">MAAとエミューレータを終了し、PCをスリープさせる*</system:String>
     <system:String x:Key="Shutdown">シャットダウン*</system:String>
 
-    <system:String x:Key="LinkStart">Link Start!</system:String><!--分かりやすく動作開始でも良い気はする-->
+    <system:String x:Key="LinkStart">Link Start!</system:String>
+    <!--分かりやすく動作開始でも良い気はする-->
     <system:String x:Key="Stop">止める</system:String>
 
     <!--  戦闘設定  -->
-    <system:String x:Key="UseSanityPotion">理性剤使用数</system:String><!--UIの表示バランス大丈夫？-->
-    <system:String x:Key="UseOriginitePrime">割る源石の数*</system:String><!--UIの表示バランス大丈夫？-->
+    <system:String x:Key="UseSanityPotion">理性剤使用数</system:String>
+    <!--UIの表示バランス大丈夫？-->
+    <system:String x:Key="UseOriginitePrime">割る源石の数*</system:String>
+    <!--UIの表示バランス大丈夫？-->
     <system:String x:Key="PerformBattles">周回数指定*</system:String>
     <system:String x:Key="AssignedMaterial">素材を限定</system:String>
     <system:String x:Key="Quantity">ドロップ数</system:String>
@@ -199,12 +206,17 @@
     <!--<system:String x:Key="CurrentStage">現在ステージ</system:String>
     <system:String x:Key="LastBattle">前回ステージ</system:String>-->
     <system:String x:Key="DefaultStage">現在/前回</system:String>
-    <system:String x:Key="ClosedStage">イベント終了</system:String><!--動作不明-->
+    <system:String x:Key="ClosedStage">イベント終了</system:String>
+    <!--動作不明-->
     <system:String x:Key="1-7">1-7</system:String>
-    <system:String x:Key="CE-6">龍門幣-6/5(CE-6)</system:String><!--馴染みのあるステージ名での表記-->
-    <system:String x:Key="AP-5">購買資格証-5(AP-5)</system:String><!--馴染みのあるステージ名での表記-->
-    <system:String x:Key="CA-5">アーツ学-5(CA-5)</system:String><!--馴染みのあるステージ名での表記-->
-    <system:String x:Key="LS-6">作戦記録-6/5(LS-6)</system:String><!--馴染みのあるステージ名での表記-->
+    <system:String x:Key="CE-6">龍門幣-6/5(CE-6)</system:String>
+    <!--馴染みのあるステージ名での表記-->
+    <system:String x:Key="AP-5">購買資格証-5(AP-5)</system:String>
+    <!--馴染みのあるステージ名での表記-->
+    <system:String x:Key="CA-5">アーツ学-5(CA-5)</system:String>
+    <!--馴染みのあるステージ名での表記-->
+    <system:String x:Key="LS-6">作戦記録-6/5(LS-6)</system:String>
+    <!--馴染みのあるステージ名での表記-->
 
     <system:String x:Key="PR-A-1">医療/重装SoC・初</system:String>
     <system:String x:Key="PR-A-2">医療/重装SoC・中</system:String>
@@ -259,7 +271,7 @@
     <!--  公開求人認識  -->
 
     <!--  倉庫アイテム認識  -->
-    <system:String x:Key="DepotRecognition">倉庫アイテム認識 Alpha</system:String>
+    <system:String x:Key="DepotRecognition">倉庫アイテム認識 beta</system:String>
     <system:String x:Key="DepotRecognitionTip">この機能はまだテスト版です。倉庫を開いた後、素材のタブを選択してから認識を行い、結果が正しいかどうか確認してください。エラーが発生した場合は、debug/depotフォルダを作業パスに圧縮して、issueを提出してください。</system:String>
     <system:String x:Key="BeganToDepotRecognition">認識開始</system:String>
     <system:String x:Key="ExportToArkplanner">Arkplannerへ出力</system:String>
@@ -278,12 +290,14 @@
     <system:String x:Key="SelectTheFile">ファイル選択</system:String>
     <system:String x:Key="SelectTheFileTip">攻略ファイルはマウスで直接ドラッグして取り込むことがきます(oﾟvﾟ)ノ</system:String>
     <system:String x:Key="AutoSquad">自動編成</system:String>
-    <system:String x:Key="AutoSquadTip">自動編成では、一時的に「戦術要員」オペレーターを認識できません</system:String><!--現状動作内容不明のため翻訳修正候補-->
+    <system:String x:Key="AutoSquadTip">自動編成では、一時的に「戦術要員」オペレーターを認識できません</system:String>
+    <!--現状動作内容不明のため翻訳修正候補-->
 
     <system:String x:Key="Start">開始</system:String>
 
     <system:String x:Key="CopilotJSONSharing">攻略ファイル・シェアステーション</system:String>
-    <system:String x:Key="VideoLink">ビデオハイパーリンク</system:String><!--Where use it?-->
+    <system:String x:Key="VideoLink">ビデオハイパーリンク</system:String>
+    <!--Where use it?-->
 
     <!--  ログ  -->
     <system:String x:Key="CopilotTip">ヒント：</system:String>
@@ -322,7 +336,8 @@
     <system:String x:Key="AllTasksComplete">すべてのタスクが完了しました！</system:String>
     <system:String x:Key="FailedToOpenClient">クライアントを開くのに失敗しました。構成ファイルを確認してください</system:String>
     <system:String x:Key="ErrorOccurred">エラー発生</system:String>
-    <system:String x:Key="HasReturned">戻った</system:String><!--内容不明のため翻訳修正候補-->
+    <system:String x:Key="HasReturned">戻った</system:String>
+    <!--内容不明のため翻訳修正候補-->
     <system:String x:Key="DropRecognitionError">ドロップ認識エラー</system:String>
     <system:String x:Key="GiveUpUploadingPenguins">Penguin-Statsへのアップロードをあきらめました</system:String>
     <system:String x:Key="TheEX">ステージ報酬がないため停止します</system:String>
@@ -410,4 +425,4 @@
     <system:String x:Key="Hangover">つ、次は飲みすぎないようにしないと……</system:String>
     <system:String x:Key="HelloWorld">Hello World!</system:String>
     <!--  EasterEggs  -->
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
index 8950126345..4ec01141fa 100644
--- a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
@@ -38,7 +38,7 @@
     <system:String x:Key="DormTrustEnabled">宿舍空余位置蹭信赖</system:String>
     <system:String x:Key="DormFilterNotStationedEnabled">不将已进驻的干员放入宿舍</system:String>
     <system:String x:Key="OriginiumShardAutoReplenishment">源石碎片自动补货</system:String>
-    <system:String x:Key="CustomInfrastEnabled">启用自定义基建配置</system:String>
+    <system:String x:Key="CustomInfrastEnabled">启用自定义基建配置（Alpha）</system:String>
     <system:String x:Key="CustomInfrastFile">自定义基建配置文件</system:String>
     <system:String x:Key="CustomInfrastFileParseFailed">自定义基建配置文件解析错误！</system:String>
     <system:String x:Key="CustomInfrastTitle">自定义基建配置：</system:String>
@@ -264,7 +264,7 @@
     <!--  公招识别  -->
 
     <!--  仓库识别  -->
-    <system:String x:Key="DepotRecognition">仓库识别 Alpha</system:String>
+    <system:String x:Key="DepotRecognition">仓库识别 beta</system:String>
     <system:String x:Key="DepotRecognitionTip">该功能尚处于测试阶段，请检查结果是否准确再行使用。若有误，欢迎打包 debug/depot 文件夹后向我们提交 issue ~</system:String>
     <system:String x:Key="BeganToDepotRecognition">开始识别</system:String>
     <system:String x:Key="ExportToArkplanner">导出至企鹅物流刷图规划</system:String>