fix: update assets file

tasks/base/assets/assets_base_page.py

@@ -51,17 +51,17 @@ CAFE_CHECK = ButtonWrapper(
     name='CAFE_CHECK',
     jp=Button(
         file='./assets/jp/base/page/CAFE_CHECK.png',
-        area=(264, 11, 337, 35),
+        area=(108, 11, 182, 36),
-        search=(244, 0, 357, 55),
+        search=(88, 0, 202, 56),
-        color=(188, 197, 205),
+        color=(191, 200, 208),
-        button=(264, 11, 337, 35),
+        button=(108, 11, 182, 36),
     ),
     en=Button(
         file='./assets/en/base/page/CAFE_CHECK.png',
-        area=(196, 8, 259, 37),
+        area=(106, 12, 167, 36),
-        search=(176, 0, 279, 57),
+        search=(86, 0, 187, 56),
-        color=(188, 197, 206),
+        color=(173, 184, 194),
-        button=(196, 8, 259, 37),
+        button=(106, 12, 167, 36),
     ),
 )
 CIRCLE_CHECK = ButtonWrapper(
@@ -171,6 +171,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),
@@ -181,6 +188,13 @@ 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=(542, 630, 581, 665),
+        search=(522, 610, 601, 685),
+        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),
@@ -191,6 +205,13 @@ 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=(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),
@@ -201,6 +222,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),
@@ -241,6 +269,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),
@@ -251,6 +286,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),
@@ -446,10 +488,10 @@ WORK_GO_TO_BOUNTY = ButtonWrapper(
     name='WORK_GO_TO_BOUNTY',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_BOUNTY.png',
-        area=(669, 412, 765, 436),
+        area=(667, 383, 764, 409),
-        search=(649, 392, 785, 456),
+        search=(647, 363, 784, 429),
-        color=(165, 181, 208),
+        color=(171, 187, 212),
-        button=(669, 412, 765, 436),
+        button=(667, 383, 764, 409),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_BOUNTY.png',
@@ -463,10 +505,10 @@ WORK_GO_TO_COMMISSIONS = ButtonWrapper(
     name='WORK_GO_TO_COMMISSIONS',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_COMMISSIONS.png',
-        area=(655, 494, 751, 518),
+        area=(653, 475, 749, 501),
-        search=(635, 474, 771, 538),
+        search=(633, 455, 769, 521),
-        color=(165, 179, 204),
+        color=(171, 185, 208),
-        button=(655, 494, 751, 518),
+        button=(653, 475, 749, 501),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_COMMISSIONS.png',
@@ -480,10 +522,10 @@ WORK_GO_TO_MISSION = ButtonWrapper(
     name='WORK_GO_TO_MISSION',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_MISSION.png',
-        area=(720, 160, 803, 199),
+        area=(722, 155, 807, 199),
-        search=(700, 140, 823, 219),
+        search=(702, 135, 827, 219),
-        color=(165, 178, 204),
+        color=(173, 188, 211),
-        button=(720, 160, 803, 199),
+        button=(722, 155, 807, 199),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_MISSION.png',
@@ -497,10 +539,10 @@ WORK_GO_TO_SCHOOL_EXCHANGE = ButtonWrapper(
     name='WORK_GO_TO_SCHOOL_EXCHANGE',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_SCHOOL_EXCHANGE.png',
-        area=(641, 575, 758, 599),
+        area=(636, 566, 753, 592),
-        search=(621, 555, 778, 619),
+        search=(616, 546, 773, 612),
-        color=(165, 179, 204),
+        color=(176, 187, 207),
-        button=(641, 575, 758, 599),
+        button=(636, 566, 753, 592),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_SCHOOL_EXCHANGE.png',
@@ -514,10 +556,10 @@ WORK_GO_TO_STORY = ButtonWrapper(
     name='WORK_GO_TO_STORY',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_STORY.png',
-        area=(995, 163, 1032, 197),
+        area=(998, 155, 1078, 199),
-        search=(975, 143, 1052, 217),
+        search=(978, 135, 1098, 219),
-        color=(191, 201, 219),
+        color=(215, 221, 232),
-        button=(995, 163, 1032, 197),
+        button=(998, 155, 1078, 199),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_STORY.png',
@@ -531,10 +573,10 @@ WORK_GO_TO_TACTICAL_CHALLENGE = ButtonWrapper(
     name='WORK_GO_TO_TACTICAL_CHALLENGE',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_TACTICAL_CHALLENGE.png',
-        area=(1012, 535, 1151, 562),
+        area=(801, 565, 920, 593),
-        search=(992, 515, 1171, 582),
+        search=(781, 545, 940, 613),
-        color=(159, 174, 200),
+        color=(172, 186, 209),
-        button=(1012, 535, 1151, 562),
+        button=(801, 565, 920, 593),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_TACTICAL_CHALLENGE.png',

tasks/cafe/assets/assets_cafe.py

@@ -180,10 +180,10 @@ GET_REWARD = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/cafe/GET_REWARD.png',
-        area=(581, 503, 692, 536),
+        area=(593, 506, 687, 548),
-        search=(561, 483, 712, 556),
+        search=(573, 486, 707, 568),
-        color=(208, 190, 63),
+        color=(211, 193, 64),
-        button=(539, 491, 741, 555),
+        button=(543, 492, 736, 564),
     ),
 )
 GET_REWARD_CLOSE = ButtonWrapper(
@@ -197,10 +197,10 @@ GET_REWARD_CLOSE = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/cafe/GET_REWARD_CLOSE.png',
-        area=(883, 134, 926, 178),
+        area=(968, 132, 997, 162),
-        search=(863, 114, 946, 198),
+        search=(948, 112, 1017, 182),
-        color=(215, 220, 224),
+        color=(187, 193, 201),
-        button=(883, 134, 926, 178),
+        button=(968, 132, 997, 162),
     ),
 )
 GOT_REWARD = ButtonWrapper(
@@ -214,10 +214,10 @@ GOT_REWARD = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/cafe/GOT_REWARD.png',
-        area=(543, 489, 741, 558),
+        area=(544, 493, 735, 563),
-        search=(523, 469, 761, 578),
+        search=(524, 473, 755, 583),
-        color=(211, 212, 212),
+        color=(213, 213, 212),
-        button=(543, 489, 741, 558),
+        button=(544, 493, 735, 563),
     ),
 )
 INVENTORY = ButtonWrapper(

tasks/circle/assets/assets_circle.py

@@ -3,6 +3,17 @@ 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=(191, 314, 233, 356),
+        search=(171, 294, 253, 376),
+        color=(191, 224, 240),
+        button=(188, 299, 435, 456),
+    ),
+    en=None,
+)
 GET_REWARD_AP = ButtonWrapper(
     name='GET_REWARD_AP',
     jp=Button(

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 page_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,23 @@ 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:
@@ -31,7 +49,7 @@ class Circle(UI):
         return status
 
     def run(self):
-        self.ui_ensure(page_circle)
+        self._enter_circle()
 
         status = CircleStatus.REWARD
         action_timer = Timer(0.5)

tasks/tactical_challenge/assets/assets_tactical_challenge.py

@@ -133,9 +133,9 @@ PLAYER_SELECT_FIRST = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/tactical_challenge/PLAYER_SELECT_FIRST.png',
-        area=(470, 293, 503, 322),
+        area=(468, 296, 493, 315),
-        search=(450, 273, 523, 342),
+        search=(448, 276, 513, 335),
-        color=(206, 214, 220),
+        color=(191, 202, 207),
         button=(606, 181, 1100, 256),
     ),
 )
@@ -150,9 +150,9 @@ PLAYER_SELECT_SECOND = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/tactical_challenge/PLAYER_SELECT_SECOND.png',
-        area=(467, 450, 507, 482),
+        area=(467, 454, 493, 473),
-        search=(447, 430, 527, 502),
+        search=(447, 434, 513, 493),
-        color=(210, 219, 225),
+        color=(191, 202, 207),
         button=(610, 338, 1098, 407),
     ),
 )
@@ -167,9 +167,9 @@ PLAYER_SELECT_THIRD = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/tactical_challenge/PLAYER_SELECT_THIRD.png',
-        area=(472, 612, 504, 641),
+        area=(468, 613, 492, 631),
-        search=(452, 592, 524, 661),
+        search=(448, 593, 512, 651),
-        color=(208, 216, 222),
+        color=(188, 199, 204),
         button=(609, 500, 1101, 565),
     ),
 )