Merge 958913516b into a5d478ce56

tasks/base/assets/assets_base_page.py

@@ -251,13 +251,6 @@ MAIL_CHECK = ButtonWrapper(
 )
 MAIN_GO_TO_CAFE = ButtonWrapper(
     name='MAIN_GO_TO_CAFE',
-    jp=Button(
-        file='./assets/jp/base/page/MAIN_GO_TO_CAFE.png',
-        area=(76, 638, 104, 674),
-        search=(56, 618, 124, 694),
-        color=(173, 212, 230),
-        button=(76, 638, 104, 674),
-    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_CAFE.png',
         area=(81, 638, 102, 668),
@@ -268,13 +261,6 @@ MAIN_GO_TO_CAFE = ButtonWrapper(
 )
 MAIN_GO_TO_CIRCLE = ButtonWrapper(
     name='MAIN_GO_TO_CIRCLE',
-    jp=Button(
-        file='./assets/jp/base/page/MAIN_GO_TO_CIRCLE.png',
-        area=(486, 630, 522, 665),
-        search=(466, 610, 542, 685),
-        color=(166, 228, 245),
-        button=(486, 630, 522, 665),
-    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_CIRCLE.png',
         area=(540, 631, 583, 660),
@@ -285,13 +271,6 @@ MAIN_GO_TO_CIRCLE = ButtonWrapper(
 )
 MAIN_GO_TO_CRAFTING = ButtonWrapper(
     name='MAIN_GO_TO_CRAFTING',
-    jp=Button(
-        file='./assets/jp/base/page/MAIN_GO_TO_CRAFTING.png',
-        area=(626, 623, 654, 664),
-        search=(606, 603, 674, 684),
-        color=(190, 228, 241),
-        button=(626, 623, 654, 664),
-    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_CRAFTING.png',
         area=(665, 622, 693, 664),
@@ -302,13 +281,6 @@ MAIN_GO_TO_CRAFTING = ButtonWrapper(
 )
 MAIN_GO_TO_GACHA = ButtonWrapper(
     name='MAIN_GO_TO_GACHA',
-    jp=Button(
-        file='./assets/jp/base/page/MAIN_GO_TO_GACHA.png',
-        area=(898, 631, 927, 663),
-        search=(878, 611, 947, 683),
-        color=(170, 229, 247),
-        button=(898, 631, 927, 663),
-    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_GACHA.png',
         area=(900, 623, 924, 670),
@@ -349,13 +321,6 @@ MAIN_GO_TO_PURCHASE = ButtonWrapper(
 )
 MAIN_GO_TO_SCHEDULE = ButtonWrapper(
     name='MAIN_GO_TO_SCHEDULE',
-    jp=Button(
-        file='./assets/jp/base/page/MAIN_GO_TO_SCHEDULE.png',
-        area=(217, 640, 237, 672),
-        search=(197, 620, 257, 692),
-        color=(154, 201, 228),
-        button=(217, 640, 237, 672),
-    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_SCHEDULE.png',
         area=(194, 638, 216, 672),
@@ -366,13 +331,6 @@ MAIN_GO_TO_SCHEDULE = ButtonWrapper(
 )
 MAIN_GO_TO_SHOP = ButtonWrapper(
     name='MAIN_GO_TO_SHOP',
-    jp=Button(
-        file='./assets/jp/base/page/MAIN_GO_TO_SHOP.png',
-        area=(756, 629, 795, 666),
-        search=(736, 609, 815, 686),
-        color=(151, 215, 241),
-        button=(756, 629, 795, 666),
-    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_SHOP.png',
         area=(773, 630, 816, 667),

tasks/circle/assets/assets_circle.py

@@ -3,17 +3,6 @@ from module.base.button import Button, ButtonWrapper
 # This file was auto-generated, do not modify it manually. To generate:
 # ``` python -m dev_tools.button_extract ```
 
-CIRCLE = ButtonWrapper(
-    name='CIRCLE',
-    jp=Button(
-        file='./assets/jp/circle/CIRCLE.png',
-        area=(197, 315, 228, 350),
-        search=(177, 295, 248, 370),
-        color=(166, 215, 235),
-        button=(188, 299, 435, 456),
-    ),
-    en=None,
-)
 GET_REWARD_AP = ButtonWrapper(
     name='GET_REWARD_AP',
     jp=Button(

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 page_circle
 from tasks.base.ui import UI
 from tasks.circle.assets.assets_circle import *
 
@@ -18,23 +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)
-        while not self.appear(CIRCLE_CHECK):
-            self.device.screenshot()
-            if not action_timer.reached_and_reset():
-                continue
-            if self.appear_then_click(CIRCLE):
-                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:
@@ -49,7 +31,7 @@ class Circle(UI):
         return status
 
     def run(self):
-        self._enter_circle()
+        self.ui_ensure(page_circle)
 
         status = CircleStatus.REWARD
         action_timer = Timer(0.5)