tasks/base/assets/assets_base_page.py

@@ -251,6 +251,13 @@ 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),
@@ -261,16 +268,30 @@ MAIN_GO_TO_CAFE = ButtonWrapper(
 )
 MAIN_GO_TO_CIRCLE = ButtonWrapper(
     name='MAIN_GO_TO_CIRCLE',
-    share=Button(
+    jp=Button(
-        file='./assets/share/base/page/MAIN_GO_TO_CIRCLE.png',
+        file='./assets/jp/base/page/MAIN_GO_TO_CIRCLE.png',
         area=(542, 630, 581, 665),
         search=(522, 610, 601, 685),
-        color=(163, 225, 242),
+        color=(164, 225, 243),
         button=(542, 630, 581, 665),
     ),
+    share=Button(
+        file='./assets/share/base/page/MAIN_GO_TO_CIRCLE.png',
+        area=(540, 631, 583, 660),
+        search=(520, 611, 603, 680),
+        color=(131, 204, 234),
+        button=(540, 631, 583, 660),
+    ),
 )
 MAIN_GO_TO_CRAFTING = ButtonWrapper(
     name='MAIN_GO_TO_CRAFTING',
+    jp=Button(
+        file='./assets/jp/base/page/MAIN_GO_TO_CRAFTING.png',
+        area=(661, 620, 693, 668),
+        search=(641, 600, 713, 688),
+        color=(183, 216, 230),
+        button=(661, 620, 693, 668),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_CRAFTING.png',
         area=(665, 622, 693, 664),
@@ -281,6 +302,13 @@ 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),
@@ -321,6 +349,13 @@ 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=(194, 646, 222, 672),
+        search=(174, 626, 242, 692),
+        color=(150, 197, 223),
+        button=(194, 646, 222, 672),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_SCHEDULE.png',
         area=(194, 638, 216, 672),
@@ -331,6 +366,13 @@ 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=(774, 628, 816, 670),
+        search=(754, 608, 836, 690),
+        color=(145, 203, 229),
+        button=(774, 628, 816, 670),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_SHOP.png',
         area=(773, 630, 816, 667),

tasks/circle/assets/assets_circle.py

@@ -12,20 +12,8 @@ CIRCLE = ButtonWrapper(
         color=(191, 224, 240),
         button=(188, 299, 435, 456),
     ),
-    en=Button(
+    en=None,
-        file='./assets/en/circle/CIRCLE.png',
+    zht=None,
-        area=(197, 314, 229, 351),
-        search=(177, 294, 249, 371),
-        color=(173, 219, 236),
-        button=(191, 298, 434, 457),
-    ),
-    zht=Button(
-        file='./assets/zht/circle/CIRCLE.png',
-        area=(197, 314, 229, 350),
-        search=(177, 294, 249, 370),
-        color=(171, 218, 236),
-        button=(190, 296, 433, 457),
-    ),
 )
 GET_REWARD_AP = ButtonWrapper(
     name='GET_REWARD_AP',

tasks/circle/circle.py

@@ -1,8 +1,9 @@
 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 CIRCLE_CHECK, MAIN_GO_TO_CIRCLE
+from tasks.base.page import page_circle, MAIN_GO_TO_CIRCLE, CIRCLE_CHECK
 from tasks.base.ui import UI
 from tasks.circle.assets.assets_circle import *
 
@@ -17,6 +18,7 @@ class CircleStatus(Enum):
 
 
 class Circle(UI):
+    @Config.when(Emulator_GameLanguage='jp')
     def _enter_circle(self):
         self.ui_goto_main()
         action_timer = Timer(1, 8)
@@ -24,12 +26,15 @@ class Circle(UI):
             self.device.screenshot()
             if not action_timer.reached_and_reset():
                 continue
-            if self.appear(CIRCLE):
+            if self.appear_then_click(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: