From 0a58b23d764c423f56457123505b3a598d66a605 Mon Sep 17 00:00:00 2001
From: uye <2396806385@qq.com>
Date: Thu, 27 Jul 2023 19:31:46 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E6=9C=AC=E5=9C=B0=E5=8C=96=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E9=94=99=E8=AF=AF/localization=20file=20error?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix #5671
---
 src/MaaWpfGui/Res/Localizations/en-us.xaml |  2 +-
 src/MaaWpfGui/Res/Localizations/ja-jp.xaml | 42 +++++++++++-----------
 src/MaaWpfGui/Res/Localizations/ko-kr.xaml |  1 +
 src/MaaWpfGui/Res/Localizations/zh-cn.xaml |  2 +-
 4 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml
index 8958f34e36..27f6de5c0f 100644
--- a/src/MaaWpfGui/Res/Localizations/en-us.xaml
+++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml
@@ -205,7 +205,7 @@
     <system:String x:Key="RoguelikeTheme">I.S. Theme</system:String>
     <system:String x:Key="RoguelikeThemePhantom">Phantom</system:String>
     <system:String x:Key="RoguelikeThemeMizuki">Mizuki</system:String>
-    <system:String x:Key="RoguelikeThemeSami"></system:String>
+    <system:String x:Key="RoguelikeThemeSami">Sami(Official translation to be updated)</system:String>
     <system:String x:Key="Strategy">Strategy</system:String>
     <system:String x:Key="StartTimesLimit">Stops after starting N times</system:String>
     <system:String x:Key="GoldTimesLimit">Stops after investing N times</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
index 623b939222..0b64a52e57 100644
--- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
@@ -282,7 +282,7 @@
     <system:String x:Key="ShutdownWithoutPersist">シャットダウン（1回のみ）</system:String>
     <system:String x:Key="LinkStart">Link Start!</system:String>
     <system:String x:Key="Stop">止める</system:String>
-    <!--  FightSettings  -->
+    <!--  戦闘設定  -->
     <system:String x:Key="UseSanityPotion">理性剤使用数</system:String>
     <system:String x:Key="UseOriginitePrime">割る源石の数*</system:String>
     <system:String x:Key="PerformBattles">周回数指定</system:String>
@@ -329,7 +329,7 @@
     <system:String x:Key="Pormpt1">月曜です。殲滅作戦がリセットされています〜</system:String>
     <system:String x:Key="Pormpt2">日曜です。殲滅作戦は忘れてないですか〜</system:String>
     <!--  UIの表示バランス大丈夫？  -->
-    <!--  PR-C (Pio/Sup Chip)  -->
+    <!--  Logs  -->
     <system:String x:Key="ConnectingToEmulator">エミュレータ接続中……</system:String>
     <system:String x:Key="UnselectedTask">タスクが選択されていません</system:String>
     <system:String x:Key="Running">動作中……</system:String>
@@ -345,10 +345,10 @@
     <system:String x:Key="ShutdownPrompt">ヒント</system:String>
     <system:String x:Key="HibernatePrompt">完了しました。休止状態にしようとしています</system:String>
     <system:String x:Key="AnnihilationTaskFailed">殲滅戦に失敗、代替ステージを使用しますが、一部の戦闘設定が有効ではありません</system:String>
-    <!--  PR-C (Pio/Sup Chip)  -->
+    <!--  Logs  -->
     <!--  動作不明  -->
     <system:String x:Key="Toolbox">ツールボックス</system:String>
-    <!--  Depot  -->
+    <!--  公開求人  -->
     <system:String x:Key="RecruitmentRecognition">公開求人認識</system:String>
     <system:String x:Key="RecruitmentRecognitionTip">ヒント: スタート画面の公開求人とは、別々の機能になっています。使用する前にゲームの公開求人を手動で開いてください</system:String>
     <system:String x:Key="AutoSettingTime">募集期間を自動的に設定する</system:String>
@@ -359,15 +359,15 @@
     <system:String x:Key="AutoSelectLevel5Tags">星5タグを自動的に選択する</system:String>
     <system:String x:Key="AutoSelectLevel6Tags">星6タグを自動的に選択する</system:String>
     <system:String x:Key="StartToRecruit">認識開始</system:String>
-    <!--  Depot  -->
-    <!--  Depot  -->
+    <!--  公開求人  -->
+    <!--  倉庫アイテム認識  -->
     <system:String x:Key="DepotRecognition">倉庫アイテム認識</system:String>
     <system:String x:Key="DepotRecognitionTip">この機能はまだテスト版です。エラーが発生/統計情報に問題があれば、debug/depotフォルダを圧縮し、issueを提出してください~</system:String>
     <system:String x:Key="StartToDepotRecognition">認識開始</system:String>
     <system:String x:Key="ExportToArkplanner">Arkplannerへ出力</system:String>
     <system:String x:Key="ExportToLolicon">Loliconへ出力</system:String>
     <system:String x:Key="CopiedToClipboard">クリップボードへコピー</system:String>
-    <!--  Annihilation task failed, will try to use alternate stage, some combat settings will not be effective  -->
+    <!--  倉庫アイテム認識  -->
     <!--  馴染みのあるステージ名での表記  -->
     <system:String x:Key="OperBoxRecognition">オペレーター</system:String>
     <system:String x:Key="OperBoxRecognitionTip">この機能はまだテスト中です。もし統計情報に問題があれば、debug/depotフォルダを圧縮し、issueを提出してください~</system:String>
@@ -375,13 +375,13 @@
     <system:String x:Key="StartToOperBoxRecognition">認識開始</system:String>
     <system:String x:Key="OperBoxCopyToClipboard">クリップボードにコピー</system:String>
     <!--  Please use the "Operator" to get information  -->
-    <!--  Please use the "Operator" to get information  -->
+    <!--  VideoRecognition  -->
     <system:String x:Key="VideoRecognition">映像</system:String>
     <system:String x:Key="StartToVideoRecognition">認識を始める</system:String>
     <system:String x:Key="OpenVideoRecognitionResult">ディレクトリを開く</system:String>
     <system:String x:Key="VideoRecognitionTips" xml:space="preserve">映像認識のために、「自動戦闘」ページを開き、映像をドラッグしてください。\n
 映像の解像度は16: 9である必要があり、黒枠、エミュレータ枠、特殊な形状、画面効果などが無いことを確認してください。</system:String>
-    <!--  Open Directory  -->
+    <!--  VideoRecognition  -->
     <system:String x:Key="Gacha">ガチャ</system:String>
     <system:String x:Key="GachaOnce">ガチャを一回引く</system:String>
     <system:String x:Key="GachaTenTimes">10回ガチャ</system:String>
@@ -536,12 +536,12 @@
     <system:String x:Key="TryToStartEmulator">エミュレータを起動しようとしています</system:String>
     <system:String x:Key="RestartADB">ADBの再起動を試みています</system:String>
     <system:String x:Key="CheckSettings">接続設定を確認するか、エミュレータとADBを再起動するか、コンピューターを再起動してください</system:String>
-    <!--  Recruitment Results:  -->
-    <!--  Where use it?  -->
+    <!--  AsstProxy  -->
+    <!--  TrayIcon  -->
     <system:String x:Key="ForceShow">MAAの強制表示</system:String>
     <system:String x:Key="Exit">終了</system:String>
-    <!--  ログ  -->
-    <!--  abort upload to Penguins statistics  -->
+    <!--  TrayIcon  -->
+    <!--  About  -->
     <system:String x:Key="Website">MAA公式サイト</system:String>
     <system:String x:Key="Github">ソースコード: GitHub</system:String>
     <system:String x:Key="PrtsPlus">自動攻略ファイルシェアWebサイト</system:String>
@@ -552,8 +552,8 @@
     <system:String x:Key="Telegram">Telegram</system:String>
     <system:String x:Key="Help">よくある質問</system:String>
     <system:String x:Key="Issue">フィードバック</system:String>
-    <!--  Medicine used  -->
-    <!--  Medicine used  -->
+    <!--  About  -->
+    <!--  自動募集設定  -->
     <system:String x:Key="AutoRefresh">星3タグを自動的に更新する</system:String>
     <system:String x:Key="AutoUseExpedited">緊急招集票を自動的に使用*</system:String>
     <system:String x:Key="Level3UseShortTime">星3タグを7:40に設定する</system:String>
@@ -566,21 +566,19 @@
     <system:String x:Key="AutoSelectLevel5">星5を自動的に確認する</system:String>
     <system:String x:Key="AutoSelectLevel6">星6を自動的に確認する</system:String>
     <system:String x:Key="Level1Tip">チェックの際に星1タグが特定された場合、募集はスキップされ、チェックされていない場合、星1タグは無視されます。</system:String>
-    <!--  Game crashed pending restart  -->
-    <!--  AsstProxy  -->
+    <!--  自動募集設定  -->
     <system:String x:Key="BuyWineOnAprilFoolsDay">尊敬なるドクター、クロージャ様のお店で「イソプロピルアルコール」の新しいリストがあると聞いたことがありませんか？一緒に確認しませんか？</system:String>
     <system:String x:Key="Burping">うぅ……オエッ</system:String>
     <system:String x:Key="DrunkAndStaggering">あれ、ドクター。どうしてそんなフラフラと歩いておられるのですか？</system:String>
     <system:String x:Key="Hangover">つ、次は飲みすぎないようにしないと……</system:String>
     <system:String x:Key="HelloWorld">Hello World!</system:String>
-    <!--  TrayIcon  -->
-    <!--  TrayIcon  -->
+    <!--  VersionUpdatePopup  -->
     <system:String x:Key="UpdateNotificationOK">OK!</system:String>
     <system:String x:Key="VersionUpdated">バージョンが更新されました</system:String>
     <system:String x:Key="VersionUpdatedTo" xml:space="preserve">バージョン: </system:String>
-    <!--  About  -->
-    <!--  About  -->
+    <!--  VersionUpdatePopup  -->
+    <!--  RootViewModel  -->
     <system:String x:Key="ConfirmExitTitle">MAAがタスクを実行しています</system:String>
     <system:String x:Key="ConfirmExitText">終了しますか？</system:String>
-    <!--  AutoRecruitSettings  -->
+    <!--  RootViewModel  -->
 </ResourceDictionary>
diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
index ccd8c4b8e7..3841991726 100644
--- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
@@ -581,6 +581,7 @@ OF-1을 해금하지 않았다면 선택하지 말아 주세요.</system:String>
     <system:String x:Key="VersionUpdatedTo" xml:space="preserve">버전: </system:String>
     <!--  VersionUpdatePopup  -->
     <!--  VersionUpdatePopup  -->
+    <!--  RootViewModel  -->
     <system:String x:Key="ConfirmExitTitle">MAA가 작업을 진행 중입니다</system:String>
     <system:String x:Key="ConfirmExitText">정말로 종료하시겠습니까?</system:String>
     <!--  RootViewModel  -->
diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
index 9ed1f710cd..f367e09466 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
@@ -245,7 +245,7 @@
     <system:String x:Key="MainViewButtonFeature">主界面可选择按钮功能</system:String>
     <system:String x:Key="CustomStageCode">手动输入关卡名</system:String>
     <system:String x:Key="CustomStageCodeTip" xml:space="preserve">支持大部分主线关卡名与原列表的关卡名（如4-10、AP-5、H10-1-Hard）
-可在关卡结尾输入"Normal/Hard"表示需要切换标准与磨难难度</system:String>
+可在关卡结尾输入「Normal/Hard」表示需要切换标准与磨难难度</system:String>
     <system:String x:Key="AutoDetectConnection">自动检测连接</system:String>
     <system:String x:Key="AutoDetectConnectionTip">每次检测完成后会自动取消勾选，若需要重新检测可再次勾选，若反复连接失败可勾选始终自动检测连接</system:String>
     <system:String x:Key="AlwaysAutoDetectConnection">每次重新检测</system:String>

From 5f5e1f296a3c86f82a5b9d8a2df2bb016643789d Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Thu, 27 Jul 2023 20:07:36 +0800
Subject: [PATCH 2/3] =?UTF-8?q?chore:=20=E7=95=8C=E9=9D=A2=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E6=94=B9=E4=B8=BA=20mumu=206?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/Res/Localizations/en-us.xaml | 2 +-
 src/MaaWpfGui/Res/Localizations/ja-jp.xaml | 2 +-
 src/MaaWpfGui/Res/Localizations/ko-kr.xaml | 2 +-
 src/MaaWpfGui/Res/Localizations/zh-cn.xaml | 2 +-
 src/MaaWpfGui/Res/Localizations/zh-tw.xaml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml
index 27f6de5c0f..862801b577 100644
--- a/src/MaaWpfGui/Res/Localizations/en-us.xaml
+++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml
@@ -62,7 +62,7 @@
     <system:String x:Key="CustomizeInfrastSelectionEmpty">Custom Base infrastructure selection is empty. Please check your configuration or turn off the Custom Base function.</system:String>
     <system:String x:Key="General">General Mode</system:String>
     <system:String x:Key="BlueStacks">BlueStacks</system:String>
-    <system:String x:Key="MuMuEmulator">MuMu Emulator</system:String>
+    <system:String x:Key="MuMuEmulator">MuMu Emulator 6</system:String>
     <system:String x:Key="MuMuEmulator12">MuMu Emulator 12</system:String>
     <system:String x:Key="LDPlayer">LD Player</system:String>
     <system:String x:Key="Nox">Nox</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
index 0b64a52e57..7fca940164 100644
--- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
@@ -62,7 +62,7 @@
     <system:String x:Key="CustomizeInfrastSelectionEmpty">カスタム施設設定が空です。設定を確認するか、カスタマイズ機能をオフにしてください。</system:String>
     <system:String x:Key="General">一般モード</system:String>
     <system:String x:Key="BlueStacks">BlueStacks</system:String>
-    <system:String x:Key="MuMuEmulator">MuMuPlayer</system:String>
+    <system:String x:Key="MuMuEmulator">MuMuPlayer 6</system:String>
     <system:String x:Key="MuMuEmulator12">MuMuPlayer 12</system:String>
     <system:String x:Key="LDPlayer">LDPlayer</system:String>
     <system:String x:Key="Nox">NoxPlayer</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
index 3841991726..b6a2d49816 100644
--- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
@@ -62,7 +62,7 @@
     <system:String x:Key="CustomizeInfrastSelectionEmpty">커스텀 시설 설정 선택이 비어 있습니다. 구성을 확인하거나 사용자 정의 기능을 끄십시오.</system:String>
     <system:String x:Key="General">일반 모드</system:String>
     <system:String x:Key="BlueStacks">BlueStacks</system:String>
-    <system:String x:Key="MuMuEmulator">MuMu Player</system:String>
+    <system:String x:Key="MuMuEmulator">MuMu Player 6</system:String>
     <system:String x:Key="MuMuEmulator12">MuMu Player 12</system:String>
     <system:String x:Key="LDPlayer">LD Player</system:String>
     <system:String x:Key="Nox">Nox</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
index f367e09466..6d77278364 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
@@ -62,7 +62,7 @@
     <system:String x:Key="CustomizeInfrastSelectionEmpty">自定义设施配置选择为空，请检查配置或关闭自定义功能。</system:String>
     <system:String x:Key="General">通用模式</system:String>
     <system:String x:Key="BlueStacks">蓝叠模拟器</system:String>
-    <system:String x:Key="MuMuEmulator">MuMu 模拟器</system:String>
+    <system:String x:Key="MuMuEmulator">MuMu 模拟器 6</system:String>
     <system:String x:Key="MuMuEmulator12">MuMu 模拟器 12</system:String>
     <system:String x:Key="LDPlayer">雷电模拟器</system:String>
     <system:String x:Key="Nox">夜神模拟器</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
index c8c0b29501..9b9c1ebc23 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
@@ -62,7 +62,7 @@
     <system:String x:Key="CustomizeInfrastSelectionEmpty">自訂設施配置選擇為空，請檢查配置或關閉自訂功能。</system:String>
     <system:String x:Key="General">通用模式</system:String>
     <system:String x:Key="BlueStacks">藍疊模擬器</system:String>
-    <system:String x:Key="MuMuEmulator">MuMu 模擬器</system:String>
+    <system:String x:Key="MuMuEmulator">MuMu 模擬器 6</system:String>
     <system:String x:Key="MuMuEmulator12">MuMu 模擬器 12</system:String>
     <system:String x:Key="LDPlayer">雷電模擬器</system:String>
     <system:String x:Key="Nox">夜神模擬器</system:String>

From c9addf2791691e6252e344694c7e2f3e21285a22 Mon Sep 17 00:00:00 2001
From: Yumi0606 <136778556+Yumi0606@users.noreply.github.com>
Date: Thu, 27 Jul 2023 20:46:48 +0800
Subject: [PATCH 3/3] =?UTF-8?q?perf:=20=E8=BF=9B=E4=B8=80=E6=AD=A5?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B0=B4=E6=9C=88=E8=82=89=E9=B8=BD=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=85=B3=E5=8D=A1=E4=BD=9C=E6=88=98=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=20(#5663)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: MistEO <mistereo@hotmail.com>
---
 resource/roguelike/copilot.json | 579 +++++++++++++++++++++++---------
 1 file changed, 425 insertions(+), 154 deletions(-)

diff --git a/resource/roguelike/copilot.json b/resource/roguelike/copilot.json
index 0ae8aae473..31c7655ff5 100644
--- a/resource/roguelike/copilot.json
+++ b/resource/roguelike/copilot.json
@@ -1448,7 +1448,12 @@
         ],
         "deploy_plan": [
             {
-                "groups": ["控制", "召唤", "高台C", "术师", "狙击", "辅助"],
+                "groups": [ "辅助"],
+                "location": [5, 1],
+                "direction": "left"
+            },
+            {
+                "groups": ["控制", "召唤", "高台C", "术师", "狙击"],
                 "location": [5, 1],
                 "direction": "down"
             },
@@ -1632,8 +1637,8 @@
         "stage_name": "瞻前顾后",
         "replacement_home": [
             {
-                "location": [5, 5],
-                "direction": "left"
+                "location": [2, 5],
+                "direction": "up"
             }
         ],
         "deploy_plan": [
@@ -1649,13 +1654,13 @@
                     "异德",
                     "刺客"
                 ],
-                "location": [5, 5],
-                "direction": "left"
+                "location": [2, 5],
+                "direction": "up"
             },
             {
                 "groups": ["单奶", "群奶"],
-                "location": [7, 4],
-                "direction": "left"
+                "location": [1, 4],
+                "direction": "right"
             },
             {
                 "groups": ["高台C", "控制", "召唤", "术师", "狙击", "辅助"],
@@ -1674,8 +1679,8 @@
                     "重装",
                     "挡人先锋"
                 ],
-                "location": [6, 5],
-                "direction": "left"
+                "location": [3, 5],
+                "direction": "up"
             },
             {
                 "groups": [
@@ -1701,6 +1706,18 @@
                 ],
                 "location": [4, 5],
                 "direction": "left"
+            },
+            {
+                "groups": [
+                    "地面C",
+                    "异德",
+                    "地刺",
+                    "刺客",
+                    "挡人先锋",
+                    "其他地面"
+                ],
+                "location": [2, 5],
+                "direction": "up"
             }
         ]
     },
@@ -1717,21 +1734,6 @@
             }
         ],
         "deploy_plan": [
-            {
-                "groups": ["异德", "刺客"],
-                "location": [6, 1],
-                "direction": "right"
-            },
-            {
-                "groups": ["异德", "刺客"],
-                "location": [2, 6],
-                "direction": "left"
-            },
-            {
-                "groups": ["挡人先锋", "投锋", "重装"],
-                "location": [6, 4],
-                "direction": "left"
-            },
             {
                 "groups": [
                     "百嘉",
@@ -1740,12 +1742,29 @@
                     "号角",
                     "挡人先锋",
                     "重装",
-                    "其他地面",
-                    "异德",
-                    "刺客"
+                    "其他地面"
+                    
                 ],
                 "location": [7, 4],
                 "direction": "left"
+            },{
+                "groups": ["异德", "刺客"],
+                "location": [6, 1],
+                "direction": "right"
+            },
+            {
+                "groups": [
+                "挡人先锋", 
+                "投锋",
+                "百嘉",
+                "基石",
+                "地面C",
+                "号角",
+                "挡人先锋",
+                "重装",
+                "其他地面"],
+                "location": [6, 4],
+                "direction": "left"
             },
             {
                 "groups": [
@@ -1766,6 +1785,12 @@
                 "location": [6, 5],
                 "direction": "left"
             },
+            {
+                "groups": ["异德", "刺客"],
+                "location": [2, 6],
+                "direction": "left",
+                "condition": [5,7]
+            },
             {
                 "groups": ["玛恩纳"],
                 "location": [5, 4],
@@ -1858,7 +1883,14 @@
                 "direction": "left"
             },
             {
-                "groups": ["玛恩纳"],
+                "groups": ["玛恩纳",
+                "地刺",
+                "重装",
+                "异德",
+                "刺客",
+                "挡人先锋",
+                "地面C",
+                "其他地面"],
                 "location": [5, 5],
                 "direction": "up"
             },
@@ -1883,6 +1915,33 @@
                 ],
                 "location": [5, 3],
                 "direction": "down"
+            },
+            {
+                "groups": ["玛恩纳",
+                "地刺",
+                "重装",
+                "异德",
+                "刺客",
+                "挡人先锋",
+                "地面C",
+                "其他地面"],
+                "location": [5, 5],
+                "direction": "up"
+            },
+            {
+                "groups": [
+                    "百嘉",
+                    "基石",
+                    "地面C",
+                    "号角",
+                    "挡人先锋",
+                    "重装",
+                    "其他地面",
+                    "异德",
+                    "刺客"
+                ],
+                "location": [7, 5],
+                "direction": "left"
             }
         ]
     },
@@ -2234,24 +2293,13 @@
         "deploy_plan": [
             {
                 "groups": [
-                    "百嘉",
-                    "基石",
                     "地面C",
-                    "号角",
-                    "挡人先锋",
-                    "重装",
-                    "其他地面",
-                    "异德",
-                    "刺客"
+                    "百嘉"
+                    
                 ],
-                "location": [4, 5],
+                "location": [4, 4],
                 "direction": "up"
             },
-            {
-                "groups": ["召唤", "高台C", "控制", "术师", "狙击", "辅助"],
-                "location": [5, 4],
-                "direction": "left"
-            },
             {
                 "groups": [
                     "基石",
@@ -2264,9 +2312,14 @@
                     "挡人先锋",
                     "其他地面"
                 ],
-                "location": [4, 4],
+                "location": [4, 5],
                 "direction": "up"
             },
+            {
+                "groups": ["召唤", "高台C", "控制", "术师", "狙击", "辅助"],
+                "location": [5, 4],
+                "direction": "left"
+            },
             {
                 "groups": ["单奶", "群奶"],
                 "location": [6, 4],
@@ -2793,8 +2846,8 @@
                     "异德",
                     "刺客"
                 ],
-                "location": [5, 3],
-                "direction": "right"
+                "location": [3, 4],
+                "direction": "up"
             },
             {
                 "groups": ["单奶", "群奶"],
@@ -2806,6 +2859,21 @@
                 "location": [3, 3],
                 "direction": "right"
             },
+            {
+                "groups": [
+                    "基石",
+                    "玛恩纳",
+                    "号角",
+                    "地面C",
+                    "地刺",
+                    "刺客",
+                    "重装",
+                    "投锋",
+                    "挡人先锋"
+                ],
+                "location": [3, 3],
+                "direction": "right"
+            },
             {
                 "groups": [
                     "基石",
@@ -3408,39 +3476,39 @@
         "deploy_plan": [
             {
                 "groups": ["挡人先锋", "投锋"],
+                "location": [3, 3],
+                "direction": "up"
+            },
+            {
+                "groups": [
+                    "百嘉",
+                    "基石",
+                    "地面C",
+                    "号角",
+                    "挡人先锋",
+                    "重装",
+                    "其他地面",
+                    "异德",
+                    "刺客"
+                ],
+                "location": [4, 4],
+                "direction": "up"
+            },
+            {
+                "groups": [
+                    "百嘉",
+                    "基石",
+                    "地面C",
+                    "号角",
+                    "挡人先锋",
+                    "重装",
+                    "其他地面",
+                    "异德",
+                    "刺客"
+                ],
                 "location": [3, 4],
                 "direction": "up"
             },
-            {
-                "groups": [
-                    "百嘉",
-                    "基石",
-                    "地面C",
-                    "号角",
-                    "挡人先锋",
-                    "重装",
-                    "其他地面",
-                    "异德",
-                    "刺客"
-                ],
-                "location": [4, 5],
-                "direction": "up"
-            },
-            {
-                "groups": [
-                    "百嘉",
-                    "基石",
-                    "地面C",
-                    "号角",
-                    "挡人先锋",
-                    "重装",
-                    "其他地面",
-                    "异德",
-                    "刺客"
-                ],
-                "location": [3, 5],
-                "direction": "up"
-            },
             {
                 "groups": [
                     "玛恩纳",
@@ -3450,7 +3518,19 @@
                     "号角",
                     "重装"
                 ],
-                "location": [4, 4],
+                "location": [4, 5],
+                "direction": "up"
+            },
+            {
+                "groups": [
+                    "玛恩纳",
+                    "基石",
+                    "挡人先锋",
+                    "地面C",
+                    "号角",
+                    "重装"
+                ],
+                "location": [3, 5],
                 "direction": "up"
             },
             {
@@ -3479,6 +3559,15 @@
                 "direction": "right",
                 "condition": [12, 20]
             },
+            {
+                "groups": [
+                    "挡人先锋",
+                    "地面C",
+                    "重装"
+                ],
+                "location": [2, 4],
+                "direction": "right"
+            },
             {
                 "groups": [
                     "召唤",
@@ -3554,7 +3643,7 @@
                 "direction": "right"
             },
             {
-                "groups": ["召唤"],
+                "groups": ["召唤","高台C", "控制", "狙击", "术师", "辅助"],
                 "location": [7, 3],
                 "direction": "down"
             },
@@ -3575,12 +3664,12 @@
             },
             {
                 "groups": ["单奶", "群奶"],
-                "location": [5, 5],
-                "direction": "right"
+                "location": [6, 2],
+                "direction": "down"
             },
             {
                 "groups": ["高台C", "控制", "狙击", "术师", "辅助"],
-                "location": [7, 5],
+                "location": [4, 2],
                 "direction": "left"
             },
             {
@@ -3589,14 +3678,27 @@
                 "direction": "up"
             },
             {
-                "groups": ["高台C", "控制", "狙击", "术师", "辅助"],
-                "location": [4, 4],
-                "direction": "left"
+                "groups": ["控制", "狙击"],
+                "location": [4, 3],
+                "direction": "down"
             },
             {
                 "groups": ["异德", "刺客", "其他地面"],
                 "location": [1, 2],
                 "direction": "up"
+            },
+            {
+                "groups": [
+                    "基石",
+                    "地面C",
+                    "挡人先锋",
+                    "重装",
+                    "其他地面",
+                    "异德",
+                    "刺客"
+                ],
+                "location": [5, 4],
+                "direction": "right"
             }
         ]
     },
@@ -3605,17 +3707,20 @@
         "replacement_home": [
             {
                 "location": [5, 4],
-                "direction": "right"
+                "direction": "up"
             },
             {
                 "location": [6, 4],
                 "direction": "right"
+            },{
+                "location": [6, 5],
+                "direction": "right"
             }
         ],
         "deploy_plan": [
             {
-                "groups": ["挡人先锋"],
-                "location": [5, 3],
+                "groups": ["挡人先锋","投锋"],
+                "location": [6, 5],
                 "direction": "right"
             },
             {
@@ -3631,25 +3736,33 @@
                     "刺客"
                 ],
                 "location": [5, 4],
-                "direction": "right"
+                "direction": "up"
+            },
+            {
+                "groups": ["单奶", "群奶"],
+                "location": [5, 6],
+                "direction": "up"
             },
             {
                 "groups": ["召唤"],
                 "location": [4, 5],
                 "direction": "left"
             },
-            {
-                "groups": ["投锋"],
-                "location": [6, 3],
-                "direction": "right"
-            },
             {
                 "groups": ["玛恩纳"],
                 "location": [5, 5],
                 "direction": "up"
             },
             {
-                "groups": ["号角"],
+                "groups": ["百嘉",
+                "基石",
+                "地面C",
+                "号角",
+                "挡人先锋",
+                "重装",
+                "其他地面",
+                "异德",
+                "刺客"],
                 "location": [5, 5],
                 "direction": "right"
             },
@@ -3663,31 +3776,33 @@
                 "location": [7, 4],
                 "direction": "right"
             },
-            {
-                "groups": ["单奶", "群奶"],
-                "location": [5, 6],
-                "direction": "up"
-            },
             {
                 "groups": ["单奶", "群奶"],
                 "location": [4, 5],
                 "direction": "up"
             },
-            {
-                "groups": ["挡人先锋", "地面C", "重装", "地刺", "其他地面"],
-                "location": [6, 5],
-                "direction": "right"
-            },
-            {
-                "groups": ["高台C", "控制", "狙击", "术师", "辅助"],
-                "location": [6, 6],
-                "direction": "up"
-            },
             {
                 "groups": ["高台C", "控制", "狙击", "术师", "辅助"],
                 "location": [4, 3],
                 "direction": "right"
             },
+            {
+                "groups": ["挡人先锋", "地面C", "重装", "地刺",
+                           "异德", "刺客", "其他地面"],
+                "location": [5, 3],
+                "direction": "right"
+            },
+            {
+                "groups": ["挡人先锋", "地面C", "重装", "地刺",
+                           "异德", "刺客", "其他地面"],
+                "location": [6, 5],
+                "direction": "right"
+            },
+            {
+                "groups": ["高台C", "控制", "狙击", "术师", "辅助","单奶", "群奶"],
+                "location": [6, 6],
+                "direction": "up"
+            },
             {
                 "groups": ["异德", "刺客", "其他地面"],
                 "location": [2, 6],
@@ -3710,18 +3825,8 @@
                 "direction": "up"
             },
             {
-                "groups": [
-                    "百嘉",
-                    "基石",
-                    "地面C",
-                    "号角",
-                    "挡人先锋",
-                    "重装",
-                    "其他地面",
-                    "异德",
-                    "刺客"
-                ],
-                "location": [8, 3],
+                "groups": ["高台C", "控制", "狙击", "术师"],
+                "location": [8, 2],
                 "direction": "left"
             },
             {
@@ -3729,11 +3834,6 @@
                 "location": [8, 4],
                 "direction": "left"
             },
-            {
-                "groups": ["投锋", "挡人先锋"],
-                "location": [1, 4],
-                "direction": "up"
-            },
             {
                 "groups": ["玛恩纳", "基石", "地面C", "地刺"],
                 "location": [7, 3],
@@ -3750,8 +3850,23 @@
                     "辅助",
                     "其他高台"
                 ],
-                "location": [8, 2],
-                "direction": "down"
+                "location": [8, 4],
+                "direction": "up"
+            },
+            {
+                "groups": [
+                    "百嘉",
+                    "基石",
+                    "地面C",
+                    "号角",
+                    "挡人先锋",
+                    "重装",
+                    "其他地面",
+                    "异德",
+                    "刺客"
+                ],
+                "location": [8, 3],
+                "direction": "left"
             },
             {
                 "groups": ["高台C", "控制", "狙击", "术师", "辅助", "其他高台"],
@@ -3767,6 +3882,21 @@
                 "groups": ["异德", "刺客", "其他地面"],
                 "location": [6, 5],
                 "direction": "left"
+            },
+            {
+                "groups": [
+                    "百嘉",
+                    "基石",
+                    "地面C",
+                    "号角",
+                    "挡人先锋",
+                    "重装",
+                    "其他地面",
+                    "异德",
+                    "刺客"
+                ],
+                "location": [8, 3],
+                "direction": "left"
             }
         ]
     },
@@ -4071,14 +4201,19 @@
                 "location": [1, 4],
                 "direction": "right"
             },
+            {
+                "groups": ["狙击", "术师"],
+                "location": [3, 3],
+                "direction": "left"
+            },
             {
                 "groups": ["单奶", "群奶"],
                 "location": [1, 3],
                 "direction": "right"
             },
             {
-                "groups": ["高台C", "控制", "召唤", "狙击", "术师", "辅助"],
-                "location": [3, 3],
+                "groups": ["地面C"],
+                "location": [3, 4],
                 "direction": "right"
             },
             {
@@ -4091,6 +4226,16 @@
                 "location": [3, 2],
                 "direction": "down"
             },
+            {
+                "groups": ["重装"],
+                "location": [5, 4],
+                "direction": "right"
+            },
+            {
+                "groups": ["高台C", "控制", "狙击", "召唤", "术师", "辅助"],
+                "location": [3, 3],
+                "direction": "right"
+            },
             {
                 "groups": ["高台C", "控制", "狙击", "召唤", "术师", "辅助"],
                 "location": [4, 5],
@@ -4143,6 +4288,12 @@
                 "location": [6, 3],
                 "direction": "up"
             }
+        ],
+        "retreat_plan": [
+            {
+                "location": [3, 3],
+                "condition": [9, 10]
+            }
         ]
     },
     {
@@ -4316,7 +4467,7 @@
                 "direction": "left"
             },
             {
-                "groups": ["百嘉", "基石", "异德"],
+                "groups": ["百嘉", "基石", "异德","地面C"],
                 "location": [3, 4],
                 "direction": "left"
             },
@@ -4364,18 +4515,10 @@
                 "direction": "left"
             },
             {
-                "groups": [
-                    "基石",
-                    "挡人先锋",
-                    "地面C",
-                    "重装",
-                    "地刺",
-                    "异德",
-                    "刺客",
-                    "其他地面"
-                ],
-                "location": [3, 4],
-                "direction": "left"
+                "groups": ["异德", "刺客"],
+                "location": [2, 3],
+                "direction": "down",
+                "condition": [17, 23]
             },
             {
                 "groups": [
@@ -4390,6 +4533,19 @@
                 ],
                 "location": [2, 4],
                 "direction": "left"
+            },
+            {
+                "groups": [
+                    "高台C",
+                    "控制",
+                    "召唤",
+                    "狙击",
+                    "术师",
+                    "辅助"
+                    
+                ],
+                "location": [5, 5],
+                "direction": "right"
             }
         ]
     },
@@ -4552,19 +4708,24 @@
                 "location": [7, 3],
                 "direction": "left"
             },
+            {
+                "groups": ["异德", "刺客","挡人先锋","地面C"],
+                "location": [1, 1],
+                "direction": "right"
+            },
             {
                 "groups": ["控制"],
-                "location": [5, 2],
+                "location": [6, 2],
                 "direction": "down"
             },
             {
-                "groups": ["群奶"],
-                "location": [6, 2],
+                "groups": ["群奶","单奶"],
+                "location": [8, 2],
                 "direction": "left"
             },
             {
                 "groups": ["单奶"],
-                "location": [7, 2],
+                "location": [9, 2],
                 "direction": "left"
             },
             {
@@ -4573,14 +4734,15 @@
                 "direction": "down"
             },
             {
-                "groups": ["高台C", "控制", "狙击", "术师", "辅助"],
-                "location": [4, 2],
-                "direction": "down"
+                "groups": ["地面C"],
+                "location": [6, 3],
+                "direction": "left"
             },
+            
             {
                 "groups": ["号角", "重装"],
                 "location": [6, 3],
-                "direction": "left"
+                "direction": "down"
             },
             {
                 "groups": ["召唤"],
@@ -5255,7 +5417,75 @@
             }
         ],
         "deploy_plan": [
+            
             {
+                "Doc": "低难打法优先，异德打法全部在后面",
+                "groups": [
+                    "百嘉",
+                    "基石",
+                    "地面C",
+                    "号角",
+                    "挡人先锋",
+                    "重装",
+                    "其他地面",
+                    "异德",
+                    "刺客"
+                ],
+                "location": [5, 4],
+                "direction": "left"
+            },
+            {
+                "groups": [
+                    "控制",
+                    "狙击"
+                    ],
+                "location": [5, 3],
+                "direction": "left"
+            },
+            {
+                "groups": ["单奶", "群奶"],
+                "location": [6, 3],
+                "direction": "left"
+            },
+            {
+                "groups": [
+                    "重装",
+                    "基石",
+                    "挡人先锋",
+                    "地面C",
+                    "地刺",
+                    "其他地面"
+                ],
+                "location": [3, 2],
+                "direction": "left"
+            },
+            {
+                "groups": [
+                    "重装",
+                    "基石",
+                    "挡人先锋",
+                    "地面C",
+                    "地刺",
+                    "其他地面"
+                ],
+                "location": [3, 4],
+                "direction": "left"
+            },
+            {
+                "groups": [
+                    "高台C",
+                    "控制",
+                    "狙击",
+                    "术师",
+                    "召唤",
+                    "辅助",
+                    "其他高台"
+                    ],
+                "location": [5, 1],
+                "direction": "left"
+            },
+            {
+                "Doc": "异德打法开始",
                 "groups": ["挡人先锋", "投锋"],
                 "location": [8, 3],
                 "direction": "down"
@@ -5424,6 +5654,7 @@
         ],
         "deploy_plan": [
             {
+                "Doc": "加入了无玛打法",
                 "groups": ["投锋", "挡人先锋"],
                 "location": [2, 2],
                 "direction": "down"
@@ -5438,19 +5669,34 @@
                     "重装",
                     "其他地面"
                 ],
-                "location": [8, 5],
+                "location": [8, 4],
                 "direction": "up"
             },
             {
                 "groups": ["控制"],
                 "location": [9, 3],
+                "direction": "up"
+            },
+            {
+                "groups": [ "单奶"],
+                "location": [6, 5],
                 "direction": "left"
             },
+            {
+                "groups": [ "挡人先锋","重装"],
+                "location": [4, 4],
+                "direction": "up"
+            },
             {
                 "groups": ["群奶", "单奶"],
-                "location": [9, 4],
+                "location": [9, 3],
                 "direction": "left"
             },
+            {
+                "groups": ["异德", "刺客"],
+                "location": [3, 4],
+                "direction": "right"
+            },
             {
                 "groups": ["玛恩纳"],
                 "location": [8, 3],
@@ -5468,8 +5714,8 @@
             },
             {
                 "groups": ["异德", "刺客"],
-                "location": [2, 5],
-                "direction": "left"
+                "location": [3, 4],
+                "direction": "right"
             },
             {
                 "groups": [
@@ -6025,6 +6271,19 @@
                 "location": [4, 4],
                 "direction": "right"
             },
+            {
+                "groups": [
+                    "百嘉",
+                    "基石",
+                    "地面C",
+                    "挡人先锋",
+                    "重装",
+                    "地刺",
+                    "其他地面"
+                ],
+                "location": [5, 4],
+                "direction": "up"
+            },
             {
                 "groups": ["异德", "刺客"],
                 "location": [5, 3],
@@ -6087,6 +6346,18 @@
                 ],
                 "location": [2, 4],
                 "direction": "right"
+            },
+            {
+                "groups": ["异德", "刺客"],
+                "location": [5, 5],
+                "direction": "right",
+                "condition": [23, 24]
+            },
+            {
+                "groups": ["异德", "刺客"],
+                "location": [4, 5],
+                "direction": "right",
+                "condition": [24, 26]
             }
         ],
         "retreat_plan": [