fix: update ui assets and circle for en
BIN
assets/en/circle/CIRCLE.BUTTON.png
Normal file
|
After Width: | Height: | Size: 43 KiB |
|
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 6.6 KiB |
|
Before Width: | Height: | Size: 5.6 KiB |
|
Before Width: | Height: | Size: 6.2 KiB |
|
Before Width: | Height: | Size: 7.1 KiB |
|
Before Width: | Height: | Size: 6.3 KiB |
|
Before Width: | Height: | Size: 6.1 KiB |
|
Before Width: | Height: | Size: 5.8 KiB After Width: | Height: | Size: 6.2 KiB |
@ -1,9 +1,8 @@
|
|||||||
from enum import Enum
|
from enum import Enum
|
||||||
|
|
||||||
from module.base.decorator import Config
|
|
||||||
from module.base.timer import Timer
|
from module.base.timer import Timer
|
||||||
from module.logger import logger
|
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.base.ui import UI
|
||||||
from tasks.circle.assets.assets_circle import *
|
from tasks.circle.assets.assets_circle import *
|
||||||
|
|
||||||
@ -18,7 +17,6 @@ class CircleStatus(Enum):
|
|||||||
|
|
||||||
|
|
||||||
class Circle(UI):
|
class Circle(UI):
|
||||||
@Config.when(Emulator_GameLanguage='jp')
|
|
||||||
def _enter_circle(self):
|
def _enter_circle(self):
|
||||||
self.ui_goto_main()
|
self.ui_goto_main()
|
||||||
action_timer = Timer(1, 8)
|
action_timer = Timer(1, 8)
|
||||||
@ -26,15 +24,12 @@ class Circle(UI):
|
|||||||
self.device.screenshot()
|
self.device.screenshot()
|
||||||
if not action_timer.reached_and_reset():
|
if not action_timer.reached_and_reset():
|
||||||
continue
|
continue
|
||||||
if self.appear_then_click(CIRCLE):
|
if self.appear(CIRCLE):
|
||||||
|
self.click_with_interval(CIRCLE, 3)
|
||||||
continue
|
continue
|
||||||
else:
|
else:
|
||||||
self.device.click(MAIN_GO_TO_CIRCLE)
|
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):
|
def _handle_circle(self, status):
|
||||||
match status:
|
match status:
|
||||||
case CircleStatus.REWARD:
|
case CircleStatus.REWARD:
|
||||||
|
|||||||