From 87cbc1a1690ec9be3a48b95f33501e2991c66865 Mon Sep 17 00:00:00 2001 From: EightyDollars Date: Thu, 23 Nov 2023 18:09:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refacotr:=E7=AE=80=E5=8C=96=E5=85=AC?= =?UTF-8?q?=E6=8B=9B=E9=80=89=E9=A1=B9=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/src/components/Recruit.vue | 80 ++++------------------------------- 1 file changed, 9 insertions(+), 71 deletions(-) diff --git a/ui/src/components/Recruit.vue b/ui/src/components/Recruit.vue index a0e0b711c..8a37adbc6 100644 --- a/ui/src/components/Recruit.vue +++ b/ui/src/components/Recruit.vue @@ -56,66 +56,18 @@ const recruit_4 = ref('900') - 四星 - - - - 9:00 - - - - - - 五星 - - - - - 邮件通知 - -
发送邮件通知，不自动选择
- - - - - - - + 五星 - 自动选择 - -
自动选择五星tag
- + 手动 - 半自动选择 - -
只有一个选项时自动进行选择
- + 自动 - 手动选择 - -
不自动选择
- - - - - - - - 六星 - - - - - 邮件通知 - -
发送邮件通知，不自动选择
- + 仅标签唯一时自动选择 @@ -124,22 +76,9 @@ const recruit_4 = ref('900') 支援机械 - - - - 邮件通知 - -
发送邮件通知，不自动选择
- - - - 忽略标签 - -
忽略支援机械标签，按策略自动刷新或选择标签
- - - - + + 保留标签 + @@ -163,7 +102,7 @@ h4 { .big-table { margin-top: 10px; - max-width: 480px; + max-width: 320px; th { text-align: center; @@ -177,12 +116,11 @@ h4 { height: 24px; &:nth-child(1) { - width: 60px; + width: 70px; text-align: center; } &:nth-child(2) { width: 420px; - text-align: center; } } } From 8299c25848640a351ab082556dc37f0655404a28 Mon Sep 17 00:00:00 2001 From: EightyDollars Date: Sun, 26 Nov 2023 17:18:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=9B=B7=E7=94=B59?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=87=8D=E5=90=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arknights_mower/utils/simulator.py | 11 +++++++++++ ui/src/pages/Settings.vue | 1 + 2 files changed, 12 insertions(+) diff --git a/arknights_mower/utils/simulator.py b/arknights_mower/utils/simulator.py index 43b9af355..246828072 100644 --- a/arknights_mower/utils/simulator.py +++ b/arknights_mower/utils/simulator.py @@ -7,6 +7,7 @@ class Simulator_Type(Enum): Nox = "夜神" MuMu12 = "MuMu12" + Leidian9 = "雷电9" Waydroid = "Waydroid" @@ -14,9 +15,11 @@ def restart_simulator(data, stop=True, start=True): index = data["index"] simulator_type = data["name"] cmd = "" + if simulator_type in [ Simulator_Type.Nox.value, Simulator_Type.MuMu12.value, + Simulator_Type.Leidian9.value, Simulator_Type.Waydroid.value, ]: if simulator_type == Simulator_Type.Nox.value: @@ -31,6 +34,12 @@ def restart_simulator(data, stop=True, start=True): cmd += "shutdown_player" elif simulator_type == Simulator_Type.Waydroid.value: cmd = "waydroid session stop" + elif simulator_type == Simulator_Type.Leidian9.value: + cmd = "ldconsole.exe quit --index " + if index >= 0: + cmd += f'{data["index"]} ' + else: + cmd += '0' if stop: exec_cmd(cmd, data["simulator_folder"]) logger.info(f"关闭{simulator_type}模拟器") @@ -41,6 +50,8 @@ def restart_simulator(data, stop=True, start=True): cmd = cmd.replace(" shutdown_player", " launch_player") elif simulator_type == Simulator_Type.Waydroid.value: cmd = "waydroid show-full-ui" + elif simulator_type == Simulator_Type.Leidian9.value: + cmd = cmd.replace("quit", "launch") if start: exec_cmd(cmd, data["simulator_folder"]) logger.info(f"开始启动{simulator_type}模拟器，等待25秒钟") diff --git a/ui/src/pages/Settings.vue b/ui/src/pages/Settings.vue index f5cde96a9..0427f175a 100644 --- a/ui/src/pages/Settings.vue +++ b/ui/src/pages/Settings.vue @@ -46,6 +46,7 @@ const simulator_types = [ { label: '夜神', value: '夜神' }, { label: 'MuMu模拟器12', value: 'MuMu12' }, { label: 'Waydroid', value: 'Waydroid' }, + { label: '雷电模拟器9', value: '雷电9' }, { label: '其它', value: '' } ]