From 60ebf0a3ff60a0639c530f39a5c59a645b81d478 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Fri, 23 Feb 2024 23:45:17 +0800 Subject: [PATCH] Fix: Limit click area of combat states (#339) --- assets/share/combat/state/COMBAT_AUTO.BUTTON.png | Bin 0 -> 6737 bytes .../combat/state/COMBAT_SPEED_2X.BUTTON.png | Bin 0 -> 6959 bytes tasks/combat/assets/assets_combat_state.py | 4 ++-- tasks/combat/state.py | 3 ++- 4 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 assets/share/combat/state/COMBAT_AUTO.BUTTON.png create mode 100644 assets/share/combat/state/COMBAT_SPEED_2X.BUTTON.png diff --git a/assets/share/combat/state/COMBAT_AUTO.BUTTON.png b/assets/share/combat/state/COMBAT_AUTO.BUTTON.png new file mode 100644 index 0000000000000000000000000000000000000000..b736577b777c0fc0f1aa97e7af8ddc89c1e1cbd0 GIT binary patch literal 6737 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.2s after clicking the button to avoid random noice + if self._combat_click_interval.current() >= 0.15 and not self._combat_click_interval.reached(): logger.info('Combat on going, _combat_auto_checked') self._combat_auto_checked = True return False