From 46ee9b152438fd6088f3670f597024d38e71aa53 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Wed, 12 Jun 2024 23:16:48 +0800 Subject: [PATCH] Opt: Click slider to set waves --- assets/share/combat/prepare/WAVE_SLIDER.png | Bin 0 -> 6123 bytes tasks/combat/assets/assets_combat_prepare.py | 10 ++++++++++ tasks/combat/prepare.py | 5 ++++- 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 assets/share/combat/prepare/WAVE_SLIDER.png diff --git a/assets/share/combat/prepare/WAVE_SLIDER.png b/assets/share/combat/prepare/WAVE_SLIDER.png new file mode 100644 index 0000000000000000000000000000000000000000..6194544c4ebaa73e65188497b0f05b729b7fc59f GIT binary patch literal 6123 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

LPn?g?&CSFPzFF{5^IEBAv!0 zR_qV79#n+AJB^3Q(6Nnf}1Zp zxOi*C)hj#VYI=V)LK}E_^AqD?O#kg~{^#~z6JXjFzpy+%rvPqt9Hx(TP(1wq3$)aq KJ}OtWiTocvy1)4V literal 0 HcmV?d00001 diff --git a/tasks/combat/assets/assets_combat_prepare.py b/tasks/combat/assets/assets_combat_prepare.py index 0c6f74da2..8363a4da0 100644 --- a/tasks/combat/assets/assets_combat_prepare.py +++ b/tasks/combat/assets/assets_combat_prepare.py @@ -70,3 +70,13 @@ WAVE_PLUS = ButtonWrapper( button=(1204, 578, 1236, 598), ), ) +WAVE_SLIDER = ButtonWrapper( + name='WAVE_SLIDER', + share=Button( + file='./assets/share/combat/prepare/WAVE_SLIDER.png', + area=(911, 585, 1150, 591), + search=(891, 565, 1170, 611), + color=(167, 118, 68), + button=(911, 585, 1150, 591), + ), +) diff --git a/tasks/combat/prepare.py b/tasks/combat/prepare.py index 59ebf0145..0b47a2c41 100644 --- a/tasks/combat/prepare.py +++ b/tasks/combat/prepare.py @@ -11,8 +11,9 @@ from tasks.combat.assets.assets_combat_prepare import ( OCR_WAVE_COST, OCR_WAVE_COUNT, WAVE_MINUS, - WAVE_PLUS + WAVE_PLUS, WAVE_SLIDER ) +from tasks.item.slider import Slider class TrailblazePowerOcr(DigitCounter): @@ -43,6 +44,8 @@ class CombatPrepare(UI): Pages: in: COMBAT_PREPARE """ + slider = Slider(main=self, slider=WAVE_SLIDER) + slider.set(count, 6) self.ui_ensure_index( count, letter=Digit(OCR_WAVE_COUNT, lang=server.lang), next_button=WAVE_PLUS, prev_button=WAVE_MINUS,