From f7a7fa07d03c59e99cd4c7fcf7a9507c1bda07b6 Mon Sep 17 00:00:00 2001 From: Lancarus <34369130+Lancarus@users.noreply.github.com> Date: Sat, 20 Jul 2024 19:34:13 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=90=A8=E5=8D=A1=E5=85=B9=E5=8E=BB?= =?UTF-8?q?=E4=BC=AA=E5=AD=98=E7=9C=9F=E8=8A=82=E7=82=B9=E5=B0=9D=E8=AF=95?= =?UTF-8?q?=E5=90=88=E6=88=90=E6=80=9D=E7=BB=AA=20(#9792)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 萨卡兹去伪存真尝试合成 * fix: 单个思绪合成卡住 * chore: Auto update by pre-commit hooks [skip changelog] --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- resource/tasks.json | 49 ++++++++++++++++++ ...z@Roguelike@StageFilterTruthCanCombine.png | Bin 0 -> 4035 bytes ...oguelike@StageFilterTruthCancelCombine.png | Bin 0 -> 616 bytes ...oguelike@StageFilterTruthCannotCombine.png | Bin 0 -> 3052 bytes ...rkaz@Roguelike@StageFilterTruthConfirm.png | Bin 0 -> 1987 bytes ...@Roguelike@StageFilterTruthTryCombine1.png | Bin 0 -> 268 bytes 6 files changed, 49 insertions(+) create mode 100644 resource/template/Sarkaz@Roguelike@StageFilterTruthCanCombine.png create mode 100644 resource/template/Sarkaz@Roguelike@StageFilterTruthCancelCombine.png create mode 100644 resource/template/Sarkaz@Roguelike@StageFilterTruthCannotCombine.png create mode 100644 resource/template/Sarkaz@Roguelike@StageFilterTruthConfirm.png create mode 100644 resource/template/Sarkaz@Roguelike@StageFilterTruthTryCombine1.png diff --git a/resource/tasks.json b/resource/tasks.json index 58c006af01..c83f168a81 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -10033,10 +10033,59 @@ "Sarkaz@Roguelike@StageFilterTruthEnter": { "baseTask": "Sarkaz@Roguelike@StageEnter", "next": [ + "Sarkaz@Roguelike@StageFilterTruthTryCombine1", "Sarkaz@Roguelike@StageFilterTruthEnter", "Sarkaz@Roguelike@StageFilterTruthLeave" ] }, + "Sarkaz@Roguelike@StageFilterTruthTryCombine1": { + "action": "ClickRect", + "roi": [777, 147, 12, 10], + "specificRect": [803, 186, 29, 23], + "next": ["Sarkaz@Roguelike@StageFilterTruthTryCombine2"] + }, + "Sarkaz@Roguelike@StageFilterTruthTryCombine2": { + "algorithm": "JustReturn", + "action": "ClickRect", + "specificRect": [907, 188, 22, 20], + "next": [ + "Sarkaz@Roguelike@StageFilterTruthCanCombine", + "Sarkaz@Roguelike@StageFilterTruthTryCombine3" + ] + }, + "Sarkaz@Roguelike@StageFilterTruthTryCombine3": { + "algorithm": "JustReturn", + "action": "ClickRect", + "specificRect": [810, 330, 24, 13], + "next": [ + "Sarkaz@Roguelike@StageFilterTruthCanCombine", + "Sarkaz@Roguelike@StageFilterTruthCannotCombine", + "Sarkaz@Roguelike@StageFilterTruthLeave" + ] + }, + "Sarkaz@Roguelike@StageFilterTruthCanCombine": { + "action": "ClickSelf", + "method": "CcoeffHSV", + "templThreshold": 0.95, + "roi": [750, 525, 188, 129], + "next": ["Sarkaz@Roguelike@StageFilterTruthConfirm"] + }, + "Sarkaz@Roguelike@StageFilterTruthConfirm": { + "action": "ClickSelf", + "postDelay": 500, + "roi": [346, 560, 684, 66], + "next": [ + "Sarkaz@Roguelike@StageFilterTruthTryCombine1", + "Sarkaz@Roguelike@StageFilterTruthCannotCombine" + ] + }, + "Sarkaz@Roguelike@StageFilterTruthCannotCombine": { + "action": "DoNothing", + "method": "CcoeffHSV", + "templThreshold": 0.95, + "roi": [750, 525, 188, 129], + "next": ["Sarkaz@Roguelike@StageFilterTruthLeave"] + }, "Sarkaz@Roguelike@StageFilterTruthHD": { "Doc": "已深化", "baseTask": "Sarkaz@Roguelike@Stage", diff --git a/resource/template/Sarkaz@Roguelike@StageFilterTruthCanCombine.png b/resource/template/Sarkaz@Roguelike@StageFilterTruthCanCombine.png new file mode 100644 index 0000000000000000000000000000000000000000..e807774b053eed75ae0267ac689f0ff17e3a1ced GIT binary patch literal 4035 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 literal 0 HcmV?d00001 diff --git a/resource/template/Sarkaz@Roguelike@StageFilterTruthCancelCombine.png b/resource/template/Sarkaz@Roguelike@StageFilterTruthCancelCombine.png new file mode 100644 index 0000000000000000000000000000000000000000..b94206f24309a616b2e0908e75a1d1252bb73729 GIT binary patch literal 616 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