From 48b6d61ee8ba9d4d40265bd89278e974a6c72c88 Mon Sep 17 00:00:00 2001 From: Zhao Zuohong Date: Tue, 17 Oct 2023 15:48:02 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=8F=91=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arknights_mower/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arknights_mower/__init__.py b/arknights_mower/__init__.py index c91e3b7e9..9a7ea12c1 100644 --- a/arknights_mower/__init__.py +++ b/arknights_mower/__init__.py @@ -15,4 +15,4 @@ __cli__ = not (__pyinstall__ and not sys.argv[1:]) __system__ = platform.system().lower() -__version__ = 'v3.5.0-alpha-13' +__version__ = 'v3.5.0-alpha-14' From 35f9d64c70b7b97e19116fb5f6fb511aad1db6ad Mon Sep 17 00:00:00 2001 From: Shawnsdaddy Date: Tue, 17 Oct 2023 18:50:02 -0700 Subject: [PATCH 2/8] =?UTF-8?q?=E7=BA=BF=E7=B4=A2=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E4=B8=BA10=E6=97=B6=EF=BC=8C=E6=97=A0=E6=B3=95=E9=A2=86?= =?UTF-8?q?=E5=8F=96=E6=AF=8F=E6=97=A5=E7=BA=BF=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arknights_mower/solvers/base_schedule.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arknights_mower/solvers/base_schedule.py b/arknights_mower/solvers/base_schedule.py index 1ccd0314f..142c0d59e 100644 --- a/arknights_mower/solvers/base_schedule.py +++ b/arknights_mower/solvers/base_schedule.py @@ -478,7 +478,7 @@ def infra_main(self): self.planned = True elif not self.todo_task: get_update_time() - if self.party_time is None and self.enable_party: + if (self.party_time is None or self.free_clue is None) and self.enable_party: self.clue() if self.clue_count > self.clue_count_limit and self.enable_party: self.share_clue() @@ -1080,7 +1080,7 @@ def clue(self) -> None: self.tap((self.recog.w - 10, self.recog.h - 10), interval=3, rebuild=False) self.tap((self.recog.w * 0.05, self.recog.h * 0.95), interval=3) - if self.free_clue is None: + if self.free_clue is None and self.clue_count < 10 and self.clue_count != -1: logger.info('领取会客室线索') self.tap(((x0 + x1) // 2, (y0 * 5 - y1) // 4), interval=3) obtain = self.find('clue_obtain') From 59bdc9aea4df6fd75d5cd36598bd4efbccc34c6d Mon Sep 17 00:00:00 2001 From: Zhao Zuohong Date: Wed, 18 Oct 2023 23:18:36 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E8=AF=95=E5=9B=BE=E4=BF=AE=E5=A4=8Dread=5F?= =?UTF-8?q?time=E6=8A=A5=E9=94=99=E5=AF=BC=E8=87=B4=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 --- arknights_mower/solvers/base_schedule.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arknights_mower/solvers/base_schedule.py b/arknights_mower/solvers/base_schedule.py index 142c0d59e..369be7123 100644 --- a/arknights_mower/solvers/base_schedule.py +++ b/arknights_mower/solvers/base_schedule.py @@ -957,11 +957,11 @@ def read_screen(self, img, type="mood", limit=24, cord=None): def read_time(self, cord, upperlimit, error_count=0, use_digit_reader=False): # 刷新图片 self.recog.update() - if use_digit_reader: - time_str = self.digit_reader.get_time(self.recog.gray) - else: - time_str = self.read_screen(self.recog.img, type='time', cord=cord) try: + if use_digit_reader: + time_str = self.digit_reader.get_time(self.recog.gray) + else: + time_str = self.read_screen(self.recog.img, type='time', cord=cord) h, m, s = str(time_str).split(':') if int(m) > 60 or int(s) > 60: raise Exception(f"读取错误") From 4c95354a1b83ff8f8a9bbd43ab92e35ecd23083d Mon Sep 17 00:00:00 2001 From: Fuyn Date: Thu, 19 Oct 2023 23:02:05 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=91=A8=E9=95=BF?= =?UTF-8?q?=E9=A2=84=E8=AE=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arknights_mower/templates/conf.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/arknights_mower/templates/conf.yml b/arknights_mower/templates/conf.yml index 7ffa13e34..69ac5694c 100644 --- a/arknights_mower/templates/conf.yml +++ b/arknights_mower/templates/conf.yml @@ -40,7 +40,7 @@ maa_weekly_plan: stage: [''] weekday: 周日 maa_weekly_plan1: - - stage: [自定义关卡1（输入关卡名/上次作战）] + - stage: [点x删除] 周一: 1 周二: 1 周三: 1 @@ -48,7 +48,7 @@ maa_weekly_plan1: 周五: 1 周六: 1 周日: 1 - - stage: [自定义关卡2] + - stage: [把鼠标放到问号上查看帮助] 周一: 1 周二: 1 周三: 1 @@ -169,21 +169,21 @@ maa_weekly_plan1: 周六: 1 周日: 1 - stage: [PR-D-2] - 周一: 1 + 周一: 0 周二: 1 - 周三: 0 + 周三: 1 周四: 0 - 周五: 1 + 周五: 0 周六: 1 - 周日: 0 + 周日: 1 - stage: [PR-D-1] - 周一: 1 + 周一: 0 周二: 1 - 周三: 0 + 周三: 1 周四: 0 - 周五: 1 + 周五: 0 周六: 1 - 周日: 0 + 周日: 1 mail_enable: 0 account: '' pass_code: '' From 8a9454ea5b526afb2521518106c2a912b5710474 Mon Sep 17 00:00:00 2001 From: Fuyn Date: Sun, 22 Oct 2023 13:52:58 +0800 Subject: [PATCH 5/8] modified: ui/package-lock.json modified: ui/src/components/MaaWeeklyNew.vue --- ui/package-lock.json | 92 ++++----- ui/src/components/MaaWeeklyNew.vue | 293 ++++++++++++++++++++++------- 2 files changed, 275 insertions(+), 110 deletions(-) diff --git a/ui/package-lock.json b/ui/package-lock.json index c86c39a4e..c80487529 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -202,12 +202,12 @@ } }, "node_modules/@babel/generator": { - "version": "7.22.15", - "resolved": "https://registry.npmmirror.com/@babel/generator/-/generator-7.22.15.tgz", - "integrity": "sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", + "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", "dev": true, "dependencies": { - "@babel/types": "^7.22.15", + "@babel/types": "^7.23.0", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -310,13 +310,13 @@ } }, "node_modules/@babel/helper-function-name": { - "version": "7.22.5", - "resolved": "https://registry.npmmirror.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz", - "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", + "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", "dev": true, "dependencies": { - "@babel/template": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" }, "engines": { "node": ">=6.9.0" @@ -578,9 +578,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.22.16", - "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.22.16.tgz", - "integrity": "sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", + "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==", "bin": { "parser": "bin/babel-parser.js" }, @@ -663,19 +663,19 @@ } }, "node_modules/@babel/traverse": { - "version": "7.22.20", - "resolved": "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.22.20.tgz", - "integrity": "sha512-eU260mPZbU7mZ0N+X10pxXhQFMGTeLb9eFS0mxehS8HZp9o1uSnFeWQuG1UPrlxgA7QoUzFhOnilHDp0AXCyHw==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz", + "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==", "dev": true, "dependencies": { "@babel/code-frame": "^7.22.13", - "@babel/generator": "^7.22.15", + "@babel/generator": "^7.23.0", "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-function-name": "^7.22.5", + "@babel/helper-function-name": "^7.23.0", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.22.16", - "@babel/types": "^7.22.19", + "@babel/parser": "^7.23.0", + "@babel/types": "^7.23.0", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -693,13 +693,13 @@ } }, "node_modules/@babel/types": { - "version": "7.22.19", - "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.22.19.tgz", - "integrity": "sha512-P7LAw/LbojPzkgp5oznjE6tQEIWbp4PkkfrZDINTro9zgBRtI324/EYsiSI7lhPbpIQ+DCeR2NNmMWANGGfZsg==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", + "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", "dev": true, "dependencies": { "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.19", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" }, "engines": { @@ -3627,12 +3627,12 @@ } }, "@babel/generator": { - "version": "7.22.15", - "resolved": "https://registry.npmmirror.com/@babel/generator/-/generator-7.22.15.tgz", - "integrity": "sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", + "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", "dev": true, "requires": { - "@babel/types": "^7.22.15", + "@babel/types": "^7.23.0", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -3715,13 +3715,13 @@ "dev": true }, "@babel/helper-function-name": { - "version": "7.22.5", - "resolved": "https://registry.npmmirror.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz", - "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", + "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", "dev": true, "requires": { - "@babel/template": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" } }, "@babel/helper-hoist-variables": { @@ -3916,9 +3916,9 @@ } }, "@babel/parser": { - "version": "7.22.16", - "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.22.16.tgz", - "integrity": "sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA==" + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", + "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==" }, "@babel/plugin-syntax-jsx": { "version": "7.22.5", @@ -3971,19 +3971,19 @@ } }, "@babel/traverse": { - "version": "7.22.20", - "resolved": "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.22.20.tgz", - "integrity": "sha512-eU260mPZbU7mZ0N+X10pxXhQFMGTeLb9eFS0mxehS8HZp9o1uSnFeWQuG1UPrlxgA7QoUzFhOnilHDp0AXCyHw==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz", + "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==", "dev": true, "requires": { "@babel/code-frame": "^7.22.13", - "@babel/generator": "^7.22.15", + "@babel/generator": "^7.23.0", "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-function-name": "^7.22.5", + "@babel/helper-function-name": "^7.23.0", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.22.16", - "@babel/types": "^7.22.19", + "@babel/parser": "^7.23.0", + "@babel/types": "^7.23.0", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -3997,13 +3997,13 @@ } }, "@babel/types": { - "version": "7.22.19", - "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.22.19.tgz", - "integrity": "sha512-P7LAw/LbojPzkgp5oznjE6tQEIWbp4PkkfrZDINTro9zgBRtI324/EYsiSI7lhPbpIQ+DCeR2NNmMWANGGfZsg==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", + "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", "dev": true, "requires": { "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.19", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" } }, diff --git a/ui/src/components/MaaWeeklyNew.vue b/ui/src/components/MaaWeeklyNew.vue index 0bf33342a..ff74141ec 100644 --- a/ui/src/components/MaaWeeklyNew.vue +++ b/ui/src/components/MaaWeeklyNew.vue @@ -107,103 +107,258 @@ function create_tag(label) { } } } +const aaabbbccc = [ + { + stage: '点x删除', + 周一: 1, + 周二: 1, + 周三: 1, + 周四: 1, + 周五: 1, + 周六: 1, + 周日: 1 + }, + { + stage: '把鼠标放到问号上查看帮助', + 周一: 1, + 周二: 1, + 周三: 1, + 周四: 1, + 周五: 1, + 周六: 1, + 周日: 1 + }, + { + stage: '自定义关卡3', + 周一: 1, + 周二: 1, + 周三: 1, + 周四: 1, + 周五: 1, + 周六: 1, + 周日: 1 + }, + { + stage: 'Annihilation', + 周一: 1, + 周二: 1, + 周三: 1, + 周四: 1, + 周五: 1, + 周六: 1, + 周日: 1 + }, + { + stage: '1-7', + 周一: 1, + 周二: 1, + 周三: 1, + 周四: 1, + 周五: 1, + 周六: 1, + 周日: 1 + }, + { + stage: 'LS-6', + 周一: 1, + 周二: 1, + 周三: 1, + 周四: 1, + 周五: 1, + 周六: 1, + 周日: 1 + }, + { + stage: 'CE-6', + 周一: 0, + 周二: 1, + 周三: 0, + 周四: 1, + 周五: 0, + 周六: 1, + 周日: 1 + }, + { + stage: 'AP-5', + 周一: 1, + 周二: 0, + 周三: 0, + 周四: 1, + 周五: 0, + 周六: 1, + 周日: 1 + }, + { + stage: 'SK-6', + 周一: 1, + 周二: 0, + 周三: 1, + 周四: 0, + 周五: 1, + 周六: 1, + 周日: 0 + }, + { + stage: 'CA-5', + 周一: 0, + 周二: 1, + 周三: 1, + 周四: 0, + 周五: 1, + 周六: 0, + 周日: 1 + }, + { + stage: 'PR-A-2', + 周一: 1, + 周二: 0, + 周三: 0, + 周四: 1, + 周五: 1, + 周六: 0, + 周日: 1 + }, + { + stage: 'PR-A-1', + 周一: 1, + 周二: 0, + 周三: 0, + 周四: 1, + 周五: 1, + 周六: 0, + 周日: 1 + }, + { + stage: 'PR-B-2', + 周一: 1, + 周二: 1, + 周三: 0, + 周四: 0, + 周五: 1, + 周六: 1, + 周日: 0 + }, + { + stage: 'PR-B-1', + 周一: 1, + 周二: 1, + 周三: 0, + 周四: 0, + 周五: 1, + 周六: 1, + 周日: 0 + }, + { + stage: 'PR-C-2', + 周一: 0, + 周二: 0, + 周三: 1, + 周四: 1, + 周五: 0, + 周六: 1, + 周日: 1 + }, + { + stage: 'PR-C-1', + 周一: 0, + 周二: 0, + 周三: 1, + 周四: 1, + 周五: 0, + 周六: 1, + 周日: 1 + }, + { + stage: 'PR-D-2', + 周一: 0, + 周二: 1, + 周三: 1, + 周四: 0, + 周五: 0, + 周六: 1, + 周日: 1 + }, + { + stage: 'PR-D-1', + 周一: 0, + 周二: 1, + 周三: 1, + 周四: 0, + 周五: 0, + 周六: 1, + 周日: 1 + },] +function clear() { + maa_weekly_plan1.value = aaabbbccc +} + +