From 5896b068ada120c526cea72ba6b5e6474c76a2e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=AB=E9=9B=A8?= <737345039@qq.com>
Date: Wed, 10 May 2023 21:14:31 +0800
Subject: [PATCH 1/3] =?UTF-8?q?chore:=20=E8=B0=83=E6=95=B4=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E8=BF=9E=E6=8E=A5=E8=AE=BE=E7=BD=AE=E8=87=B3=E5=8F=8C?=
 =?UTF-8?q?=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

相当于还原 6d737188f29eb2a8a3cd48beba64a4d92d42d8bf 的 ConnectSettingsUserControl.xaml
---
 .../ConnectSettingsUserControl.xaml           | 130 ++++++++++++++++--
 1 file changed, 116 insertions(+), 14 deletions(-)

diff --git a/src/MaaWpfGui/Views/UserControl/ConnectSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/ConnectSettingsUserControl.xaml
index 2cb36324ab..804c8ac621 100644
--- a/src/MaaWpfGui/Views/UserControl/ConnectSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/ConnectSettingsUserControl.xaml
@@ -29,16 +29,40 @@
             <RowDefinition />
             <RowDefinition />
             <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
         </Grid.RowDefinitions>
-        <controls:TextBlock
+        <StackPanel
             Grid.Row="0"
+            Grid.Column="1"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Orientation="Horizontal">
+            <CheckBox
+                Margin="10"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Content="{DynamicResource AutoDetectConnection}"
+                IsChecked="{Binding AutoDetectConnection}"
+                ToolTip="{DynamicResource AutoDetectConnectionTip}" />
+            <CheckBox
+                Margin="10"
+                VerticalAlignment="Center"
+                Content="{DynamicResource AlwaysAutoDetectConnection}"
+                IsChecked="{Binding AlwaysAutoDetectConnection}"
+                Visibility="{c:Binding AutoDetectConnection}" />
+        </StackPanel>
+        <controls:TextBlock
+            Grid.Row="1"
             Grid.Column="0"
             Margin="10"
             Block.TextAlignment="Center"
             Text="{DynamicResource ADBPath}"
             TextWrapping="Wrap" />
         <TextBox
-            Grid.Row="0"
+            Grid.Row="1"
             Grid.Column="1"
             Width="250"
             Height="30"
@@ -46,7 +70,7 @@
             IsEnabled="{c:Binding !AutoDetectConnection}"
             Text="{Binding AdbPath}" />
         <Button
-            Grid.Row="0"
+            Grid.Row="1"
             Grid.Column="2"
             Width="60"
             Height="30"
@@ -55,17 +79,95 @@
             Command="{s:Action SelectFile}"
             Content="{DynamicResource Select}"
             IsEnabled="{c:Binding !AutoDetectConnection}" />
-        <CheckBox
-            Grid.Row="1"
+
+        <controls:TextBlock
+            Grid.Row="2"
             Grid.Column="0"
-            Grid.ColumnSpan="2"
+            Margin="10"
+            Block.TextAlignment="Center"
+            Text="{DynamicResource ConnectionAddress}"
+            TextWrapping="Wrap" />
+        <ComboBox
+            Grid.Row="2"
+            Grid.Column="1"
+            Width="250"
+            Height="30"
+            Margin="10"
+            IsEditable="True"
+            IsEnabled="{c:Binding !AutoDetectConnection}"
+            ItemsSource="{Binding ConnectAddressHistory}"
+            Text="{Binding ConnectAddress, UpdateSourceTrigger=LostFocus}"
+            ToolTip="{DynamicResource ConnectionAddressTip}">
+            <ComboBox.ItemTemplate>
+                <DataTemplate>
+                    <Grid Width="{c:Binding ActualWidth - 20, RelativeSource={RelativeSource AncestorType=ComboBox}}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <TextBlock
+                            Grid.Column="0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Text="{Binding}" />
+                        <Button
+                            Grid.Column="1"
+                            HorizontalAlignment="Right"
+                            Command="{s:Action RemoveAddress_Click}"
+                            CommandParameter="{Binding}"
+                            Content="×"
+                            FontWeight="Bold" />
+                    </Grid>
+                </DataTemplate>
+            </ComboBox.ItemTemplate>
+        </ComboBox>
+
+        <controls:TextBlock
+            Grid.Row="3"
+            Grid.Column="0"
+            Margin="10"
+            Block.TextAlignment="Center"
+            Text="{DynamicResource ConnectionPreset}"
+            TextWrapping="Wrap" />
+        <ComboBox
+            Grid.Row="3"
+            Grid.Column="1"
+            Width="250"
+            Height="30"
+            Margin="10"
+            DisplayMemberPath="Display"
+            IsEnabled="{c:Binding !AutoDetectConnection}"
+            ItemsSource="{Binding ConnectConfigList}"
+            SelectedValue="{Binding ConnectConfig}"
+            SelectedValuePath="Value" />
+        <CheckBox
+            Grid.Row="4"
+            Grid.Column="0"
+            Grid.ColumnSpan="3"
+            Margin="15"
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
             Content="{DynamicResource RetryOnDisconnected}"
             IsChecked="{Binding RetryOnDisconnected}"
             ToolTip="{DynamicResource RetryOnDisconnectedTip}" />
+        <controls:TextBlock
+            Grid.Row="5"
+            Grid.Column="0"
+            VerticalAlignment="Center"
+            Text="{DynamicResource TouchMode}" />
+        <ComboBox
+            Grid.Row="5"
+            Grid.Column="1"
+            Width="250"
+            Height="30"
+            Margin="10"
+            DisplayMemberPath="Display"
+            IsHitTestVisible="{Binding Idle}"
+            ItemsSource="{Binding TouchModeList}"
+            SelectedValue="{Binding TouchMode}"
+            SelectedValuePath="Value" />
         <Button
-            Grid.Row="1"
+            Grid.Row="5"
             Grid.Column="2"
             Height="30"
             Margin="10"
@@ -73,7 +175,7 @@
             Command="{s:Action ReplaceADB}"
             Content="{DynamicResource ForcedReplaceADB}" />
         <CheckBox
-            Grid.Row="2"
+            Grid.Row="6"
             Grid.Column="0"
             Grid.ColumnSpan="2"
             Margin="80,10,10,10"
@@ -82,7 +184,7 @@
             Content="{DynamicResource KillAdbOnExit}"
             IsChecked="{Binding KillAdbOnExit}" />
         <CheckBox
-            Grid.Row="2"
+            Grid.Row="6"
             Grid.Column="1"
             Grid.ColumnSpan="2"
             Margin="160,10,10,10"
@@ -91,7 +193,7 @@
             Content="{DynamicResource AdbLiteEnabled}"
             IsChecked="{Binding AdbLiteEnabled}" />
         <CheckBox
-            Grid.Row="3"
+            Grid.Row="7"
             Grid.Column="0"
             Grid.ColumnSpan="3"
             Margin="10"
@@ -100,14 +202,14 @@
             Content="{DynamicResource DeploymentWithPause}"
             IsChecked="{Binding DeploymentWithPause}" />
         <controls:TextBlock
-            Grid.Row="4"
+            Grid.Row="8"
             Grid.Column="0"
             Margin="10"
             Block.TextAlignment="Center"
             Text="{DynamicResource StartsWithScript}"
             TextWrapping="Wrap" />
         <TextBox
-            Grid.Row="4"
+            Grid.Row="8"
             Grid.Column="1"
             Width="250"
             Height="30"
@@ -117,14 +219,14 @@
             PreviewDragOver="TextBox_PreviewDragOver"
             Text="{Binding StartsWithScript}" />
         <controls:TextBlock
-            Grid.Row="5"
+            Grid.Row="9"
             Grid.Column="0"
             Margin="10"
             Block.TextAlignment="Center"
             Text="{DynamicResource EndsWithScript}"
             TextWrapping="Wrap" />
         <TextBox
-            Grid.Row="5"
+            Grid.Row="9"
             Grid.Column="1"
             Width="250"
             Height="30"

From 224806b47be3b465538203f6f60199c70be69522 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=AB=E9=9B=A8?= <737345039@qq.com>
Date: Wed, 10 May 2023 21:36:29 +0800
Subject: [PATCH 2/3] =?UTF-8?q?chore:=20=E8=BF=98=E5=8E=9F=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E4=B8=AD=20=E4=BB=BB=E5=8A=A1=E8=AE=BE=E7=BD=AE=20-?=
 =?UTF-8?q?=20=E5=BC=80=E5=A7=8B=E5=94=A4=E9=86=92=20=E7=9A=84=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

相当于还原 ce09887799ae2bccfd22ea474537185a9f0d32cb 关于开始唤醒的描述
---
 docs/1.1-详细介绍.md                       | 2 +-
 docs/1.2-常见问题.md                       | 4 ++--
 docs/1.3-模拟器支持.md                     | 4 ++--
 docs/en-us/1.1-USER_MANUAL.md              | 2 +-
 docs/en-us/1.2-FAQ.md                      | 4 ++--
 docs/ja-jp/1.1-詳細説明.md                 | 2 +-
 docs/ja-jp/1.2-よくある質問.md             | 2 +-
 docs/zh-tw/1.1-詳細介紹.md                 | 2 +-
 docs/zh-tw/1.2-常見問題.md                 | 4 ++--
 src/MaaWpfGui/Res/Localizations/en-us.xaml | 4 ++--
 src/MaaWpfGui/Res/Localizations/ja-jp.xaml | 2 +-
 src/MaaWpfGui/Res/Localizations/ko-kr.xaml | 4 ++--
 src/MaaWpfGui/Res/Localizations/zh-cn.xaml | 4 ++--
 13 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/docs/1.1-详细介绍.md b/docs/1.1-详细介绍.md
index c56268f54d..6664d0e756 100644
--- a/docs/1.1-详细介绍.md
+++ b/docs/1.1-详细介绍.md
@@ -206,7 +206,7 @@
     # maybe more output like the above line
     ```
 
-  使用结果中 `127.0.0.1:[ADBPORT]` （替换 `[ADBPORT]` 为实际数字）作为模拟器 adb 实际连接地址填入 `任务设置` - `开始唤醒` - `连接地址`。
+  使用结果中 `127.0.0.1:[ADBPORT]` （替换 `[ADBPORT]` 为实际数字）作为模拟器 adb 实际连接地址填入 `设置` - `连接设置` - `连接地址`。
 
 ### 自动启动多开模拟器
 
diff --git a/docs/1.2-常见问题.md b/docs/1.2-常见问题.md
index 226673e035..a4732f4b38 100644
--- a/docs/1.2-常见问题.md
+++ b/docs/1.2-常见问题.md
@@ -73,7 +73,7 @@
 
     纯数字的默认端口可以直接使用 `127.0.0.1:[port]` 来连接，雷电模拟器进行了封装，也可以使用 `emulator-5554` 进行连接。
 
-    在 Windows `任务设置` - `开始唤醒` - `连接地址` 与 Mac 的 `设置` - `连接设置` - `连接地址` 配置中如果有情况需要修改则可以参照上表。
+    在 Windows 与 Mac 的 `设置` - `连接设置` - `连接地址` 配置中如果有情况需要修改则可以参照上表。
 
 - 多开情况
 
@@ -103,7 +103,7 @@
 
 与替换 adb 相比，更推荐使用 [自定义连接](1.1-详细介绍.md#自定义连接)，一劳永逸。<br>
 
-如果即使这样也无法正常使用，可将 `任务设置` - `开始唤醒` - `触控模式` 从 `Minitouch` 切换到 `MaaTouch` 再次尝试。由于 `Adb Input` 操作过于缓慢，请仅将其作为万不得已的模式。
+如果即使这样也无法正常使用，可将 `连接设置` - `触控模式` 从 `Minitouch` 切换到 `MaaTouch` 再次尝试。由于 `Adb Input` 操作过于缓慢，请仅将其作为万不得已的模式。
 
 ## 连接正常，但是操作卡顿、异常或频繁出错
 
diff --git a/docs/1.3-模拟器支持.md b/docs/1.3-模拟器支持.md
index 5e5552db31..645e234eb2 100644
--- a/docs/1.3-模拟器支持.md
+++ b/docs/1.3-模拟器支持.md
@@ -214,12 +214,12 @@ _典型的 `16:9` 比例的分辨率有 `3840*2160`、`2560*1440`、`1920*1080`
 ### 连接 MAA
 
 1. 将上文解压文件夹内的 `adb.exe` 路径填入 MAA `设置` - `连接设置` - `adb 路径` 中，可右键属性查看路径。
-2. 切换 MAA `任务设置` - `开始唤醒` - `连接配置` 为 `通用模式`。
+2. 切换 MAA `设置` - `连接设置` - `连接配置` 为 `通用模式`。
 3. 将游戏内设置中的 `异形屏UI适配` 一项调整为 0 以防止操作错位。
 
 #### 有线连接
 
-1. 将上文获取到的目标设备序列号填入 MAA `任务设置` - `开始唤醒` - `连接地址` 中。
+1. 将上文获取到的目标设备序列号填入 MAA `设置` - `连接设置` - `连接地址` 中。
 2. Link Start!
 3. 任务结束后还原设备分辨率。
 
diff --git a/docs/en-us/1.1-USER_MANUAL.md b/docs/en-us/1.1-USER_MANUAL.md
index d6eb0704c8..57274499a5 100644
--- a/docs/en-us/1.1-USER_MANUAL.md
+++ b/docs/en-us/1.1-USER_MANUAL.md
@@ -191,7 +191,7 @@ Note that clicking `General` `Advanced` will also switch `Task Settings`.
     # maybe more output like the above line
     ```
 
-  Use `127.0.0.1:[ADBPORT]` (replace `[ADBPORT]` with the actual number) in the results as the actual connection address of the emulator adb and fill it in `Task Settings` - `Login` - `Connection Address`.
+  Use `127.0.0.1:[ADBPORT]` (replace `[ADBPORT]` with the actual number) in the results as the actual connection address of the emulator adb and fill it in `Settings` - `Connection Settings` - `Connection Address`.
 
 ### Automatically Start Multiple Emulators
 
diff --git a/docs/en-us/1.2-FAQ.md b/docs/en-us/1.2-FAQ.md
index b9cc5933ac..b727853f28 100644
--- a/docs/en-us/1.2-FAQ.md
+++ b/docs/en-us/1.2-FAQ.md
@@ -73,7 +73,7 @@
 
     You can connect to emulators with purely numeric ports using `127.0.0.1:[port]`. LDPlayer emulator has its own wrapper, so you can also use `emulator-5554` to connect.
 
-    If you need to modify the connection settings in the `Task Settings` - `Login` - `Connection Address` on Windows or Mac, please refer to the table above.
+    If you need to modify the connection settings in the `Settings` - `Connection Settings` - `Connection Address` on Windows or Mac, please refer to the table above.
 
 - Multi-instance mode
 
@@ -101,7 +101,7 @@ The adb version packaged with some emulators is too old and does not support min
 
 The emulator will reset the ADB version after updating. If the problems occurs again, please repeat the above steps. Or you can try to use the [custom connection](1.1-USER_MANUAL.md#custom-connection) method to solve it once and for all.
 
-If it still doesn't work, please retry after switching to `MaaTouch` from `Minitouch` in `Task Settings` - `Login`.
+If it still doesn't work, please retry after switching to `MaaTouch` from `Minitouch` in `Settings` - `Connection Settings`.
 
 ## Connected successfully, but actions are slow or error are frequent
 
diff --git a/docs/ja-jp/1.1-詳細説明.md b/docs/ja-jp/1.1-詳細説明.md
index 2ab2b927ca..a4c6c39834 100644
--- a/docs/ja-jp/1.1-詳細説明.md
+++ b/docs/ja-jp/1.1-詳細説明.md
@@ -236,7 +236,7 @@ Windows MAAには「設定」タブの他に「タスク設定」もあります
     # maybe more output like the above line
     ```
 
-  結果の `127.0.0.1：[ADBPORT]`（[ADBPORT]を実際の数字に置き換える）をエミュレータadbの実際の接続アドレスとして、「タスク設定」-「ウェイクアップ」-「接続アドレス」に入力します。
+  結果の `127.0.0.1：[ADBPORT]`（[ADBPORT]を実際の数字に置き換える）をエミュレータadbの実際の接続アドレスとして、「設定」-「接続設定」-「接続アドレス」に入力します。
 
 ### マルチインスタンスでのシミュレーターの自動起動
 
diff --git a/docs/ja-jp/1.2-よくある質問.md b/docs/ja-jp/1.2-よくある質問.md
index ea327783fb..8db1e28fc5 100644
--- a/docs/ja-jp/1.2-よくある質問.md
+++ b/docs/ja-jp/1.2-よくある質問.md
@@ -51,7 +51,7 @@ Windows Serverまたは、その他の簡素化されたシステムを使用し
 
     純粋な数字のデフォルトポートは`127.0.0.1:[port]`で直接接続できます。雷電エミュレータはカプセル化されていますが、`emulator-5554`を使用して接続することもできます。
 
-    Windows の「タスク設定」-「ウェイクアップ」-「接続アドレス」および Mac の「設定」-「接続設定」-「接続アドレス」の構成で変更が必要な場合は、上記の表を参照してください。
+    WindowsとMacの「設定」-「接続設定」-「接続アドレス」の構成で変更が必要な場合は、上記の表を参照してください。
 
 - マルチインスタンスの場合
 
diff --git a/docs/zh-tw/1.1-詳細介紹.md b/docs/zh-tw/1.1-詳細介紹.md
index 49a302d241..04f09e4a5b 100644
--- a/docs/zh-tw/1.1-詳細介紹.md
+++ b/docs/zh-tw/1.1-詳細介紹.md
@@ -206,7 +206,7 @@
     # maybe more output like the above line
     ```
 
-  使用結果中 `127.0.0.1:[ADBPORT]` （替換 `[ADBPORT]` 為實際數字）作為模擬器 adb 實際連接地址填入 `任務設置` - `開始喚醒` - `連接地址`。
+  使用結果中 `127.0.0.1:[ADBPORT]` （替換 `[ADBPORT]` 為實際數字）作為模擬器 adb 實際連接地址填入 `設置` - `連接設置` - `連接地址`。
 
 ### 自動啟動多開模擬器
 
diff --git a/docs/zh-tw/1.2-常見問題.md b/docs/zh-tw/1.2-常見問題.md
index ab0d156b5e..bb758eccf3 100644
--- a/docs/zh-tw/1.2-常見問題.md
+++ b/docs/zh-tw/1.2-常見問題.md
@@ -52,7 +52,7 @@
 
     純數字的默認端口可以直接使用 `127.0.0.1:[port]` 來連接，雷電模擬器進行了封裝，也可以使用 `emulator-5554` 進行連接。
 
-    在 Windows `任務設置` - `開始喚醒` - `連接地址` 與 Mac 的 `設置` - `連接設置` - `連接地址` 配置中如果有情況需要修改則可以參照上表。
+    在 Windows 與 Mac 的 `設置` - `連接設置` - `連接地址` 配置中如果有情況需要修改則可以參照上表。
 
 - 多開情況
 
@@ -78,7 +78,7 @@
 - 請使用管理員權限打開 MAA，點擊 MAA 設置 - 連接設置 - 強制替換 ADB （建議關閉模擬器並重啟 MAA 後再操作，不然可能替換不正確）
 - 模擬器更新後會重置 adb 版本，如更新後沒有反應，請再次強制替換 ADB
 - 與替換 adb 相比，更推薦使用 [自定義連接](1.1-詳細介紹.md#自定義連接)，一勞永逸。
-- 如果即使這樣也無法正常使用，請將 `任務設置` - `開始喚醒` - `觸控模式` 切換為 `Adb Input (相容模式)`。由於 `Adb Input` 操作過於緩慢，請僅將其作為萬不得已的模式。
+- 如果即使這樣也無法正常使用，請將 `連接設置-觸控模式` 切換為 `Adb Input (相容模式)`。由於 `Adb Input` 操作過於緩慢，請僅將其作為萬不得已的模式。
 
 ## 連接正常，偶爾能點幾下，然後就卡住了，或者任務出錯了
 
diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml
index 6e5c0674ad..44b0820e81 100644
--- a/src/MaaWpfGui/Res/Localizations/en-us.xaml
+++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml
@@ -358,7 +358,7 @@
     <system:String x:Key="ConnectingToEmulator">Connecting to emulator...</system:String>
     <system:String x:Key="UnselectedTask">Unselected task</system:String>
     <system:String x:Key="Running">Running...</system:String>
-    <system:String x:Key="AdbReplacementTips">If all stuck, plz go to Settings - Connection Settings - Forced Replace ADB File, or turn on Compatibility Touch Mode in Task Settings - Login (not recommended).</system:String>
+    <system:String x:Key="AdbReplacementTips">If all stuck, plz go to Settings - Connection Settings - Forced Replace ADB File, or turn on Compatibility Touch Mode (not recommended).</system:String>
     <system:String x:Key="Stopping">Stopping...</system:String>
     <system:String x:Key="Stopped">Has stopped</system:String>
     <system:String x:Key="UnknownErrorOccurs">Unknown error occurred</system:String>
@@ -486,7 +486,7 @@ The video resolution is required to be 16:9, and there are no interference facto
     <system:String x:Key="ReconnectSuccess">Reconnect succeeded. Continue the task</system:String>
     <system:String x:Key="ReconnectFailed">Reconnect failed. The connection is down!</system:String>
     <system:String x:Key="ScreencapFailed">Screencap failed. If it happens repeatedly, try restarting or changing the emulator.</system:String>
-    <system:String x:Key="TouchModeNotAvailable">Touch mode is not available, please enter Task Settings - Login to change other touch modes</system:String>
+    <system:String x:Key="TouchModeNotAvailable">Touch mode is not available, please enter Settings - Connection Settings to change other touch modes</system:String>
     <system:String x:Key="IdentifyTheMistakes">Identify error</system:String>
     <system:String x:Key="TaskError" xml:space="preserve">Task error: </system:String>
     <system:String x:Key="CombatError">Combat error</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
index 8f31cb18c3..ed29b7988a 100644
--- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
@@ -357,7 +357,7 @@
     <system:String x:Key="ConnectingToEmulator">エミュレータ接続中……</system:String>
     <system:String x:Key="UnselectedTask">タスクが選択されていません</system:String>
     <system:String x:Key="Running">動作中……</system:String>
-    <system:String x:Key="AdbReplacementTips">もし全てでスタックする場合は、設定 - 接続設定 - ADBの強制置き換え、もしくは タスク設定 - ウェイクの開始 で互換性 タッチモード をチェックしてください（お勧めしない）。</system:String>
+    <system:String x:Key="AdbReplacementTips">もし全てでスタックする場合は、設定 - 接続設定 - ADBの強制置き換え、もしくは 互換性 タッチモード をチェックしてください（お勧めしない）。</system:String>
     <system:String x:Key="Stopping">動作停止中……</system:String>
     <system:String x:Key="Stopped">動作停止</system:String>
     <system:String x:Key="UnknownErrorOccurs">不明なエラーが発生しました</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
index 5777054523..5498ac1d76 100644
--- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
@@ -337,7 +337,7 @@
     <system:String x:Key="ConnectingToEmulator">에뮬레이터에 연결 중...</system:String>
     <system:String x:Key="UnselectedTask">선택된 작업이 없습니다</system:String>
     <system:String x:Key="Running">실행 중...</system:String>
-    <system:String x:Key="AdbReplacementTips">프로그램이 작동하지 않으면 설정 - 연결 설정 - ADB 강제 교체를 실행하거나 작업 설정 - 로그인 중 호환 터치 모드를 활성화해 주세요 (추천하지 않음).</system:String>
+    <system:String x:Key="AdbReplacementTips">프로그램이 작동하지 않으면 설정 - 연결 설정 - ADB 강제 교체를 실행하거나 호환 터치 모드를 활성화해 주세요 (추천하지 않음).</system:String>
     <system:String x:Key="Stopping">중지 중...</system:String>
     <system:String x:Key="Stopped">중지됨</system:String>
     <system:String x:Key="UnknownErrorOccurs">예상치 못한 오류가 발생했습니다</system:String>
@@ -432,7 +432,7 @@
     <system:String x:Key="ReconnectSuccess">다시 연결되었습니다. 작업을 계속합니다.</system:String>
     <system:String x:Key="ReconnectFailed">다시 연결하지 못했습니다. 연결 해제되었습니다!</system:String>
     <system:String x:Key="ScreencapFailed">스크린샷 캡처에 실패했습니다. 반복적으로 발생 시 에뮬레이터를 다시 시작하거나 변경해 보세요.</system:String>
-    <system:String x:Key="TouchModeNotAvailable">터치 수행 방식이 사용 불가능합니다. 작업 설정 - 로그인 설정에서 다른 방식으로 변경해 주세요.</system:String>
+    <system:String x:Key="TouchModeNotAvailable">터치 수행 방식이 사용 불가능합니다. 설정 - 연결 설정에서 다른 방식으로 변경해 주세요.</system:String>
     <system:String x:Key="IdentifyTheMistakes">인식 오류</system:String>
     <system:String x:Key="TaskError">작업 오류:</system:String>
     <system:String x:Key="CombatError">작전 오류</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
index 28981f87cb..54c78a32ff 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
@@ -360,7 +360,7 @@
     <system:String x:Key="ConnectingToEmulator">正在连接模拟器……</system:String>
     <system:String x:Key="UnselectedTask">未选择任务</system:String>
     <system:String x:Key="Running">正在运行中……</system:String>
-    <system:String x:Key="AdbReplacementTips">如果任务完全没有反应，请使用 设置 - 连接设置 - 强制替换 ADB，或在  任务设置 - 开始唤醒中 打开 兼容性触控模式（不推荐）。</system:String>
+    <system:String x:Key="AdbReplacementTips">如果任务完全没有反应，请使用 设置 - 连接设置 - 强制替换 ADB，或打开 兼容性触控模式（不推荐）。</system:String>
     <system:String x:Key="Stopping">正在停止……</system:String>
     <system:String x:Key="Stopped">已停止</system:String>
     <system:String x:Key="UnknownErrorOccurs">出现未知错误</system:String>
@@ -505,7 +505,7 @@
     <system:String x:Key="TryToReconnect">模拟器断开，正在尝试重连</system:String>
     <system:String x:Key="ReconnectSuccess">重连成功，继续任务</system:String>
     <system:String x:Key="ReconnectFailed">重连失败，连接断开！</system:String>
-    <system:String x:Key="TouchModeNotAvailable">触控模式不可用。请进入 任务设置 - 开始唤醒 切换其他触控模式</system:String>
+    <system:String x:Key="TouchModeNotAvailable">触控模式不可用。请进入 设置 - 连接设置 切换其他触控模式</system:String>
     <system:String x:Key="ScreencapFailed">截图失败，如反复出现请尝试重启或更换模拟器！</system:String>
     <system:String x:Key="IdentifyTheMistakes">识别错误</system:String>
     <system:String x:Key="TaskError">任务出错：</system:String>

From 2b4b99fdcbaf36e1f8459048cfc4ef8b0dc28b83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=AB=E9=9B=A8?= <737345039@qq.com>
Date: Mon, 15 May 2023 13:34:21 +0800
Subject: [PATCH 3/3] =?UTF-8?q?chore:=20=E8=B0=83=E6=95=B4=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=AE=BE=E7=BD=AE=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Models/TaskSettingVisibilityInfo.cs       |  10 +-
 .../AutoRecruitSettingsUserControl.xaml       |  94 +++++++-------
 .../InfrastSettingsUserControl.xaml           | 115 +++++++++---------
 .../UserControl/MallSettingsUserControl.xaml  |  73 ++++++-----
 .../RoguelikeSettingsUserControl.xaml         |  40 +++---
 5 files changed, 176 insertions(+), 156 deletions(-)

diff --git a/src/MaaWpfGui/Models/TaskSettingVisibilityInfo.cs b/src/MaaWpfGui/Models/TaskSettingVisibilityInfo.cs
index c12b4834f7..541a5e8bbb 100644
--- a/src/MaaWpfGui/Models/TaskSettingVisibilityInfo.cs
+++ b/src/MaaWpfGui/Models/TaskSettingVisibilityInfo.cs
@@ -11,11 +11,11 @@
 // but WITHOUT ANY WARRANTY
 // </copyright>
 
+using System;
 using MaaWpfGui.Constants;
 using MaaWpfGui.Helper;
-using System;
-using Stylet;
 using MaaWpfGui.ViewModels.UI;
+using Stylet;
 
 namespace MaaWpfGui.Models
 {
@@ -84,13 +84,13 @@ namespace MaaWpfGui.Models
             }
 
             EnableAdvancedSettings = false;
-            if (Base || Combat || AutoRoguelike)
+            if (Mission || WakeUp)
             {
-                AdvancedSettingsVisibility = true;
+                AdvancedSettingsVisibility = false;
             }
             else
             {
-                AdvancedSettingsVisibility = false;
+                AdvancedSettingsVisibility = true;
             }
         }
 
diff --git a/src/MaaWpfGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml
index b1d70bc95f..f9863f18c1 100644
--- a/src/MaaWpfGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml
@@ -2,6 +2,7 @@
     x:Class="MaaWpfGui.Views.UserControl.AutoRecruitSettingsUserControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:c="clr-namespace:CalcBinding;assembly=CalcBinding"
     xmlns:controls="clr-namespace:MaaWpfGui.Styles.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:dd="urn:gong-wpf-dragdrop"
@@ -16,49 +17,54 @@
     d:DesignWidth="220"
     mc:Ignorable="d">
     <StackPanel>
-        <CheckBox
-            Margin="0,10"
-            Content="{DynamicResource AutoRefresh}"
-            IsChecked="{Binding RefreshLevel3}" />
-        <CheckBox
-            Margin="0,10"
-            Content="{DynamicResource AutoUseExpedited}"
-            IsChecked="{Binding UseExpedited}"
-            ToolTip="{DynamicResource CheckBoxesNotSaved}" />
-        <CheckBox
-            Margin="0,10"
-            HorizontalAlignment="Left"
-            IsChecked="{Binding IsLevel3UseShortTime}"
-            ToolTip="{DynamicResource Level3UseShortTimeTip}">
-            <controls:TextBlock Text="{DynamicResource Level3UseShortTime}" TextWrapping="Wrap" />
-        </CheckBox>
-        <hc:NumericUpDown
-            Margin="0,5"
-            hc:InfoElement.Title="{DynamicResource RecruitMaxTimes}"
-            Style="{StaticResource NumericUpDownExtend}"
-            ValueChanged="NumericUpDown_ValueChanged"
-            Value="{Binding RecruitMaxTimes}" />
-        <CheckBox
-            Margin="0,10"
-            Content="{DynamicResource ManuallySelectLevel1}"
-            IsChecked="{Binding NotChooseLevel1}"
-            ToolTip="{DynamicResource Level1Tip}" />
-        <CheckBox
-            Margin="0,10"
-            Content="{DynamicResource AutoSelectLevel3}"
-            IsChecked="{Binding ChooseLevel3}" />
-        <CheckBox
-            Margin="0,10"
-            Content="{DynamicResource AutoSelectLevel4}"
-            IsChecked="{Binding ChooseLevel4}" />
-        <CheckBox
-            Margin="0,10"
-            Content="{DynamicResource AutoSelectLevel5}"
-            IsChecked="{Binding ChooseLevel5}" />
-        <CheckBox
-            Margin="0,10,0,0"
-            Content="{DynamicResource AutoSelectLevel6}"
-            IsChecked="False"
-            IsEnabled="False" />
+        <StackPanel Visibility="{c:Binding !TaskSettingVisibilities.EnableAdvancedSettings}">
+            <CheckBox
+                Margin="0,10"
+                Content="{DynamicResource AutoUseExpedited}"
+                IsChecked="{Binding UseExpedited}"
+                ToolTip="{DynamicResource CheckBoxesNotSaved}" />
+            <hc:NumericUpDown
+                Margin="0,5"
+                hc:InfoElement.Title="{DynamicResource RecruitMaxTimes}"
+                Style="{StaticResource NumericUpDownExtend}"
+                ValueChanged="NumericUpDown_ValueChanged"
+                Value="{Binding RecruitMaxTimes}" />
+        </StackPanel>
+
+        <StackPanel Visibility="{c:Binding TaskSettingVisibilities.EnableAdvancedSettings}">
+            <CheckBox
+                Margin="0,10"
+                Content="{DynamicResource AutoRefresh}"
+                IsChecked="{Binding RefreshLevel3}" />
+            <CheckBox
+                Margin="0,10"
+                HorizontalAlignment="Left"
+                IsChecked="{Binding IsLevel3UseShortTime}"
+                ToolTip="{DynamicResource Level3UseShortTimeTip}">
+                <controls:TextBlock Text="{DynamicResource Level3UseShortTime}" TextWrapping="Wrap" />
+            </CheckBox>
+            <CheckBox
+                Margin="0,10"
+                Content="{DynamicResource ManuallySelectLevel1}"
+                IsChecked="{Binding NotChooseLevel1}"
+                ToolTip="{DynamicResource Level1Tip}" />
+            <CheckBox
+                Margin="0,10"
+                Content="{DynamicResource AutoSelectLevel3}"
+                IsChecked="{Binding ChooseLevel3}" />
+            <CheckBox
+                Margin="0,10"
+                Content="{DynamicResource AutoSelectLevel4}"
+                IsChecked="{Binding ChooseLevel4}" />
+            <CheckBox
+                Margin="0,10"
+                Content="{DynamicResource AutoSelectLevel5}"
+                IsChecked="{Binding ChooseLevel5}" />
+            <CheckBox
+                Margin="0,10"
+                Content="{DynamicResource AutoSelectLevel6}"
+                IsChecked="False"
+                IsEnabled="False" />
+        </StackPanel>
     </StackPanel>
 </UserControl>
diff --git a/src/MaaWpfGui/Views/UserControl/InfrastSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/InfrastSettingsUserControl.xaml
index f38d56367a..8c24ddd32f 100644
--- a/src/MaaWpfGui/Views/UserControl/InfrastSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/InfrastSettingsUserControl.xaml
@@ -20,62 +20,8 @@
     d:DesignWidth="220"
     mc:Ignorable="d">
     <StackPanel>
-        <StackPanel Visibility="{c:Binding !TaskSettingVisibilities.EnableAdvancedSettings}">
-            <ComboBox
-                Margin="0,5"
-                hc:InfoElement.Title="{DynamicResource DroneUsage}"
-                DisplayMemberPath="Display"
-                ItemsSource="{Binding UsesOfDronesList}"
-                SelectedValue="{Binding UsesOfDrones}"
-                SelectedValuePath="Value"
-                Style="{StaticResource ComboBoxExtend}" />
-            <ComboBox
-                Margin="0,5"
-                VerticalContentAlignment="Center"
-                hc:InfoElement.Title="{DynamicResource CustomInfrastPlan}"
-                DataContext="{Binding CustomInfrastPlanDataContext}"
-                DisplayMemberPath="Display"
-                IsHitTestVisible="{c:Binding !InfrastTaskRunning}"
-                ItemsSource="{Binding CustomInfrastPlanList}"
-                SelectedValue="{Binding CustomInfrastPlanIndex}"
-                SelectedValuePath="Value"
-                Style="{StaticResource ComboBoxExtend}"
-                Visibility="{c:Binding CustomInfrastEnabled}" />
-            <ListBox
-                Margin="0,5"
-                dd:DragDrop.IsDragSource="True"
-                dd:DragDrop.IsDropTarget="True"
-                ItemsSource="{Binding Path=InfrastItemViewModels}"
-                SelectionChanged="{s:Action InfrastOrderSelectionChanged}"
-                ToolTip="{DynamicResource LabelSequenceTip}">
-                <ListBox.ItemTemplate>
-                    <DataTemplate>
-                        <StackPanel Orientation="Horizontal">
-                            <!--<maa:TextBlock  Text="{Binding ID}" />
-                            <maa:TextBlock  Text=". " />-->
-                            <CheckBox Content="{Binding Name}" IsChecked="{Binding IsChecked}" />
-                        </StackPanel>
-                    </DataTemplate>
-                </ListBox.ItemTemplate>
-            </ListBox>
-        </StackPanel>
-
+        <!--  只放在高级设置的部分  -->
         <StackPanel Visibility="{c:Binding TaskSettingVisibilities.EnableAdvancedSettings}">
-            <StackPanel Margin="0">
-                <TextBlock
-                    Margin="0,5"
-                    HorizontalAlignment="Stretch"
-                    Block.TextAlignment="Center"
-                    Foreground="{DynamicResource PrimaryTextBrush}"
-                    Text="{Binding DormThresholdLabel}"
-                    TextWrapping="Wrap" />
-                <Slider
-                    Margin="0,5"
-                    Maximum="100"
-                    Minimum="0"
-                    ToolTip="{DynamicResource InfrastThresholdTip}"
-                    Value="{Binding DormThreshold}" />
-            </StackPanel>
             <CheckBox
                 Margin="0,10"
                 Content="{DynamicResource DormTrustEnabled}"
@@ -123,5 +69,64 @@
                     Text="{Binding CustomInfrastFile}" />
             </StackPanel>
         </StackPanel>
+
+        <!--  不开自定义基建计划时，放在常规设置的部分  -->
+        <StackPanel Visibility="{c:Binding (CustomInfrastEnabled and TaskSettingVisibilities.EnableAdvancedSettings) or (!CustomInfrastEnabled and !TaskSettingVisibilities.EnableAdvancedSettings)}">
+            <StackPanel Margin="0">
+                <TextBlock
+                    Margin="0,5"
+                    HorizontalAlignment="Stretch"
+                    Block.TextAlignment="Center"
+                    Foreground="{DynamicResource PrimaryTextBrush}"
+                    Text="{Binding DormThresholdLabel}"
+                    TextWrapping="Wrap" />
+                <Slider
+                    Margin="0,5"
+                    Maximum="100"
+                    Minimum="0"
+                    ToolTip="{DynamicResource InfrastThresholdTip}"
+                    Value="{Binding DormThreshold}" />
+            </StackPanel>
+            <ComboBox
+                Margin="0,5"
+                hc:InfoElement.Title="{DynamicResource DroneUsage}"
+                DisplayMemberPath="Display"
+                ItemsSource="{Binding UsesOfDronesList}"
+                SelectedValue="{Binding UsesOfDrones}"
+                SelectedValuePath="Value"
+                Style="{StaticResource ComboBoxExtend}" />
+            <ListBox
+                Margin="0,5"
+                dd:DragDrop.IsDragSource="True"
+                dd:DragDrop.IsDropTarget="True"
+                ItemsSource="{Binding Path=InfrastItemViewModels}"
+                SelectionChanged="{s:Action InfrastOrderSelectionChanged}"
+                ToolTip="{DynamicResource LabelSequenceTip}">
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <StackPanel Orientation="Horizontal">
+                            <!--<maa:TextBlock  Text="{Binding ID}" />
+                            <maa:TextBlock  Text=". " />-->
+                            <CheckBox Content="{Binding Name}" IsChecked="{Binding IsChecked}" />
+                        </StackPanel>
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
+        </StackPanel>
+
+        <!--  开自定义基建计划时，放在常规设置的部分  -->
+        <StackPanel Visibility="{c:Binding CustomInfrastEnabled and !TaskSettingVisibilities.EnableAdvancedSettings}">
+            <ComboBox
+                Margin="0,4"
+                VerticalContentAlignment="Center"
+                hc:InfoElement.Title="{DynamicResource CustomInfrastPlan}"
+                DataContext="{Binding CustomInfrastPlanDataContext}"
+                DisplayMemberPath="Display"
+                IsHitTestVisible="{c:Binding !InfrastTaskRunning}"
+                ItemsSource="{Binding CustomInfrastPlanList}"
+                SelectedValue="{Binding CustomInfrastPlanIndex}"
+                SelectedValuePath="Value"
+                Style="{StaticResource ComboBoxExtend}" />
+        </StackPanel>
     </StackPanel>
 </UserControl>
diff --git a/src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml
index 2d79143c1a..98bb5b75b0 100644
--- a/src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml
@@ -2,6 +2,7 @@
     x:Class="MaaWpfGui.Views.UserControl.MallSettingsUserControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:c="clr-namespace:CalcBinding;assembly=CalcBinding"
     xmlns:controls="clr-namespace:MaaWpfGui.Styles.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:dd="urn:gong-wpf-dragdrop"
@@ -16,39 +17,47 @@
     d:DesignWidth="220"
     mc:Ignorable="d">
     <StackPanel>
-        <CheckBox
-            Margin="0,10"
-            Block.TextAlignment="Left"
-            Content="{DynamicResource SocialPtShop}"
-            IsChecked="{Binding CreditShopping}" />
-        <CheckBox Margin="0,10" IsChecked="{Binding CreditForceShoppingIfCreditFull}">
-            <TextBlock
+        <StackPanel Visibility="{c:Binding !TaskSettingVisibilities.EnableAdvancedSettings}">
+            <CheckBox
+                Margin="0,10"
                 Block.TextAlignment="Left"
-                Text="{DynamicResource ForceShoppingIfCreditFull}"
-                TextWrapping="Wrap" />
-        </CheckBox>
-        <CheckBox
-            Margin="0,10"
-            Block.TextAlignment="Left"
-            IsChecked="{Binding CreditFightTaskEnabledDisplay}"
-            ToolTip="{DynamicResource CreditFightTip}">
-            <TextBlock
+                Content="{DynamicResource SocialPtShop}"
+                IsChecked="{Binding CreditShopping}" />
+        </StackPanel>
+
+        <StackPanel Visibility="{c:Binding TaskSettingVisibilities.EnableAdvancedSettings}">
+            <CheckBox
+                Margin="0,10"
                 Block.TextAlignment="Left"
-                Text="{DynamicResource CreditFight}"
-                TextWrapping="Wrap" />
-        </CheckBox>
-        <TextBox
-            Margin="0,10"
-            hc:InfoElement.Title="{DynamicResource Blacklist}"
-            IsEnabled="{Binding CreditShopping}"
-            Style="{StaticResource TextBoxExtend}"
-            Text="{Binding CreditBlackList}" />
-        <TextBox
-            Margin="0,10"
-            hc:InfoElement.Title="{DynamicResource HighPriority}"
-            IsEnabled="{Binding CreditShopping}"
-            Style="{StaticResource TextBoxExtend}"
-            Text="{Binding CreditFirstList}"
-            ToolTip="{DynamicResource Drink}" />
+                IsChecked="{Binding CreditFightTaskEnabledDisplay}"
+                ToolTip="{DynamicResource CreditFightTip}">
+                <TextBlock
+                    Block.TextAlignment="Left"
+                    Text="{DynamicResource CreditFight}"
+                    TextWrapping="Wrap" />
+            </CheckBox>
+            <CheckBox
+                Margin="0,10"
+                IsChecked="{Binding CreditForceShoppingIfCreditFull}"
+                IsEnabled="{Binding CreditShopping}">
+                <TextBlock
+                    Block.TextAlignment="Left"
+                    Text="{DynamicResource ForceShoppingIfCreditFull}"
+                    TextWrapping="Wrap" />
+            </CheckBox>
+            <TextBox
+                Margin="0,10"
+                hc:InfoElement.Title="{DynamicResource Blacklist}"
+                IsEnabled="{Binding CreditShopping}"
+                Style="{StaticResource TextBoxExtend}"
+                Text="{Binding CreditBlackList}" />
+            <TextBox
+                Margin="0,10"
+                hc:InfoElement.Title="{DynamicResource HighPriority}"
+                IsEnabled="{Binding CreditShopping}"
+                Style="{StaticResource TextBoxExtend}"
+                Text="{Binding CreditFirstList}"
+                ToolTip="{DynamicResource Drink}" />
+        </StackPanel>
     </StackPanel>
 </UserControl>
diff --git a/src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml
index c54da3ab88..6f34cb1081 100644
--- a/src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml
@@ -35,16 +35,6 @@
                 SelectedValue="{Binding RoguelikeMode}"
                 SelectedValuePath="Value"
                 Style="{StaticResource ComboBoxExtend}" />
-            <hc:NumericUpDown
-                Margin="0,5"
-                hc:InfoElement.Title="{DynamicResource StartTimesLimit}"
-                Style="{StaticResource NumericUpDownExtend}"
-                ValueChanged="NumericUpDown_ValueChanged"
-                Value="{Binding RoguelikeStartsCount}" />
-            <CheckBox
-                Margin="0,10"
-                Content="{DynamicResource RefreshTraderWithDice}"
-                IsChecked="{Binding RoguelikeRefreshTraderWithDice}" />
             <ComboBox
                 Margin="0,5"
                 hc:InfoElement.Title="{DynamicResource StartingSquad}"
@@ -55,18 +45,13 @@
                 SelectedValue="{Binding RoguelikeSquad}"
                 SelectedValuePath="Value"
                 Style="{StaticResource ComboBoxExtend}" />
-            <ComboBox
-                Margin="0,5"
-                hc:InfoElement.Title="{DynamicResource StartingRoles}"
-                DisplayMemberPath="Display"
-                IsHitTestVisible="{Binding Idle}"
-                ItemsSource="{Binding RoguelikeRolesList}"
-                SelectedValue="{Binding RoguelikeRoles}"
-                SelectedValuePath="Value"
-                Style="{StaticResource ComboBoxExtend}" />
         </StackPanel>
 
         <StackPanel Visibility="{c:Binding TaskSettingVisibilities.EnableAdvancedSettings}">
+            <CheckBox
+                Margin="0,10"
+                Content="{DynamicResource RefreshTraderWithDice}"
+                IsChecked="{Binding RoguelikeRefreshTraderWithDice}" />
             <CheckBox
                 Margin="0,10"
                 Content="{DynamicResource InvestmentEnabled}"
@@ -87,8 +72,23 @@
                     Text="{DynamicResource StopOnGoldLimit}"
                     TextWrapping="Wrap" />
             </CheckBox>
+            <hc:NumericUpDown
+                Margin="0,5"
+                hc:InfoElement.Title="{DynamicResource StartTimesLimit}"
+                Style="{StaticResource NumericUpDownExtend}"
+                ValueChanged="NumericUpDown_ValueChanged"
+                Value="{Binding RoguelikeStartsCount}" />
+            <ComboBox
+                Margin="0,5"
+                hc:InfoElement.Title="{DynamicResource StartingRoles}"
+                DisplayMemberPath="Display"
+                IsHitTestVisible="{Binding Idle}"
+                ItemsSource="{Binding RoguelikeRolesList}"
+                SelectedValue="{Binding RoguelikeRoles}"
+                SelectedValuePath="Value"
+                Style="{StaticResource ComboBoxExtend}" />
             <TextBlock
-                Margin="8,10,8,0"
+                Margin="8,5,8,0"
                 HorizontalAlignment="Left"
                 Block.TextAlignment="Center"
                 Foreground="{DynamicResource PrimaryTextBrush}"