diff --git a/assets/en/circle/CIRCLE.BUTTON.png b/assets/en/circle/CIRCLE.BUTTON.png new file mode 100644 index 0000000..77a396e Binary files /dev/null and b/assets/en/circle/CIRCLE.BUTTON.png differ diff --git a/assets/jp/base/page/MAIN_GO_TO_SCHEDULE.png b/assets/en/circle/CIRCLE.png similarity index 51% rename from assets/jp/base/page/MAIN_GO_TO_SCHEDULE.png rename to assets/en/circle/CIRCLE.png index 4a93a65..bb1c316 100644 Binary files a/assets/jp/base/page/MAIN_GO_TO_SCHEDULE.png and b/assets/en/circle/CIRCLE.png differ diff --git a/assets/jp/base/page/MAIN_GO_TO_CAFE.png b/assets/jp/base/page/MAIN_GO_TO_CAFE.png deleted file mode 100644 index 6d0a0b9..0000000 Binary files a/assets/jp/base/page/MAIN_GO_TO_CAFE.png and /dev/null differ diff --git a/assets/jp/base/page/MAIN_GO_TO_CIRCLE.png b/assets/jp/base/page/MAIN_GO_TO_CIRCLE.png deleted file mode 100644 index 837a5cf..0000000 Binary files a/assets/jp/base/page/MAIN_GO_TO_CIRCLE.png and /dev/null differ diff --git a/assets/jp/base/page/MAIN_GO_TO_CRAFTING.png b/assets/jp/base/page/MAIN_GO_TO_CRAFTING.png deleted file mode 100644 index 84abb02..0000000 Binary files a/assets/jp/base/page/MAIN_GO_TO_CRAFTING.png and /dev/null differ diff --git a/assets/jp/base/page/MAIN_GO_TO_GACHA.png b/assets/jp/base/page/MAIN_GO_TO_GACHA.png deleted file mode 100644 index ee35809..0000000 Binary files a/assets/jp/base/page/MAIN_GO_TO_GACHA.png and /dev/null differ diff --git a/assets/jp/base/page/MAIN_GO_TO_SHOP.png b/assets/jp/base/page/MAIN_GO_TO_SHOP.png deleted file mode 100644 index d7bf9af..0000000 Binary files a/assets/jp/base/page/MAIN_GO_TO_SHOP.png and /dev/null differ diff --git a/assets/share/base/page/MAIN_GO_TO_CIRCLE.png b/assets/share/base/page/MAIN_GO_TO_CIRCLE.png index e4d1169..30014c0 100644 Binary files a/assets/share/base/page/MAIN_GO_TO_CIRCLE.png and b/assets/share/base/page/MAIN_GO_TO_CIRCLE.png differ diff --git a/tasks/circle/circle.py b/tasks/circle/circle.py index 6a078fc..4f3e66c 100644 --- a/tasks/circle/circle.py +++ b/tasks/circle/circle.py @@ -1,9 +1,8 @@ from enum import Enum -from module.base.decorator import Config from module.base.timer import Timer from module.logger import logger -from tasks.base.page import page_circle, MAIN_GO_TO_CIRCLE, CIRCLE_CHECK +from tasks.base.page import CIRCLE_CHECK, MAIN_GO_TO_CIRCLE from tasks.base.ui import UI from tasks.circle.assets.assets_circle import * @@ -18,7 +17,6 @@ class CircleStatus(Enum): class Circle(UI): - @Config.when(Emulator_GameLanguage='jp') def _enter_circle(self): self.ui_goto_main() action_timer = Timer(1, 8) @@ -26,15 +24,12 @@ class Circle(UI): self.device.screenshot() if not action_timer.reached_and_reset(): continue - if self.appear_then_click(CIRCLE): + if self.appear(CIRCLE): + self.click_with_interval(CIRCLE, 3) continue else: self.device.click(MAIN_GO_TO_CIRCLE) - @Config.when(Emulator_GameLanguage=None) - def _enter_circle(self): - self.ui_ensure(page_circle) - def _handle_circle(self, status): match status: case CircleStatus.REWARD: