fix: update assets file

module/config/i18n/en-US.json

@@ -218,7 +218,7 @@
     },
     "SecondCafe": {
       "name": "Second Floor",
-      "help": "JP server only\nEnable auto switch to second floor and perform interaction"
+      "help": "Enable auto switch to second floor and perform interaction"
     }
   },
   "Invitation": {

module/config/i18n/zh-CN.json

@@ -218,7 +218,7 @@
     },
     "SecondCafe": {
       "name": "第二咖啡厅",
-      "help": "仅支持日服\n自动切换第二咖啡厅进行互动点击"
+      "help": "自动切换第二咖啡厅进行互动点击"
     }
   },
   "Invitation": {

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(
@@ -183,10 +183,10 @@ MAIN_GO_TO_CIRCLE = ButtonWrapper(
     name='MAIN_GO_TO_CIRCLE',
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_CIRCLE.png',
-        area=(540, 631, 583, 660),
+        area=(542, 630, 581, 665),
-        search=(520, 611, 603, 680),
+        search=(522, 610, 601, 685),
-        color=(131, 204, 234),
+        color=(163, 225, 242),
-        button=(540, 631, 583, 660),
+        button=(542, 630, 581, 665),
     ),
 )
 MAIN_GO_TO_CRAFTING = ButtonWrapper(
@@ -446,101 +446,101 @@ 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',
-        area=(671, 409, 760, 440),
+        area=(668, 385, 756, 412),
-        search=(651, 389, 780, 460),
+        search=(648, 365, 776, 432),
-        color=(183, 202, 227),
+        color=(180, 198, 223),
-        button=(671, 409, 760, 440),
+        button=(668, 385, 756, 412),
     ),
 )
 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',
-        area=(656, 494, 803, 517),
+        area=(653, 477, 787, 496),
-        search=(636, 474, 823, 537),
+        search=(633, 457, 807, 516),
-        color=(192, 204, 221),
+        color=(187, 199, 218),
-        button=(656, 494, 803, 517),
+        button=(653, 477, 787, 496),
     ),
 )
 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',
-        area=(720, 160, 871, 206),
+        area=(721, 158, 873, 197),
-        search=(700, 140, 891, 226),
+        search=(701, 138, 893, 217),
-        color=(192, 204, 221),
+        color=(180, 195, 215),
-        button=(720, 160, 871, 206),
+        button=(721, 158, 873, 197),
     ),
 )
 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',
-        area=(643, 572, 778, 602),
+        area=(635, 569, 769, 597),
-        search=(623, 552, 798, 622),
+        search=(615, 549, 789, 617),
-        color=(190, 203, 221),
+        color=(198, 204, 216),
-        button=(643, 572, 778, 602),
+        button=(635, 569, 769, 597),
     ),
 )
 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',
-        area=(994, 159, 1109, 211),
+        area=(996, 159, 1112, 205),
-        search=(974, 139, 1129, 231),
+        search=(976, 139, 1132, 225),
-        color=(208, 215, 228),
+        color=(200, 209, 225),
-        button=(994, 159, 1109, 211),
+        button=(996, 159, 1112, 205),
     ),
 )
 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',
-        area=(1012, 532, 1152, 591),
+        area=(803, 566, 922, 623),
-        search=(992, 512, 1172, 611),
+        search=(783, 546, 942, 643),
-        color=(199, 211, 227),
+        color=(186, 201, 220),
-        button=(1012, 532, 1152, 591),
+        button=(803, 566, 922, 623),
     ),
 )

tasks/cafe/assets/assets_cafe.py

@@ -34,10 +34,10 @@ CAFE_FIRST = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/cafe/CAFE_FIRST.png',
-        area=(82, 152, 136, 175),
+        area=(100, 156, 148, 175),
-        search=(62, 132, 156, 195),
+        search=(80, 136, 168, 195),
-        color=(111, 127, 147),
+        color=(107, 123, 144),
-        button=(82, 152, 136, 175),
+        button=(100, 156, 148, 175),
     ),
 )
 CAFE_INVITE = ButtonWrapper(
@@ -85,10 +85,10 @@ CAFE_SECOND = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/cafe/CAFE_SECOND.png',
-        area=(219, 152, 279, 175),
+        area=(242, 157, 291, 174),
-        search=(199, 132, 299, 195),
+        search=(222, 137, 311, 194),
-        color=(110, 126, 146),
+        color=(119, 134, 153),
-        button=(219, 152, 279, 175),
+        button=(242, 157, 291, 174),
     ),
 )
 CHANGE_CAFE_NOT_SELECTED = ButtonWrapper(
@@ -102,10 +102,10 @@ CHANGE_CAFE_NOT_SELECTED = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/cafe/CHANGE_CAFE_NOT_SELECTED.png',
-        area=(84, 89, 178, 109),
+        area=(99, 93, 197, 110),
-        search=(64, 69, 198, 129),
+        search=(79, 73, 217, 130),
-        color=(185, 193, 203),
+        color=(179, 187, 196),
-        button=(84, 89, 178, 109),
+        button=(99, 93, 197, 110),
     ),
 )
 CHANGE_CAFE_SELECTED = ButtonWrapper(
@@ -119,10 +119,10 @@ CHANGE_CAFE_SELECTED = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/cafe/CHANGE_CAFE_SELECTED.png',
-        area=(40, 87, 191, 112),
+        area=(57, 92, 199, 112),
-        search=(20, 67, 211, 132),
+        search=(37, 72, 219, 132),
-        color=(82, 105, 130),
+        color=(92, 115, 140),
-        button=(40, 87, 191, 112),
+        button=(57, 92, 199, 112),
     ),
 )
 CHECK_MOMOTALK = ButtonWrapper(
@@ -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/cafe/cafe.py

@@ -1,6 +1,5 @@
 from enum import Enum
 
-from module.base.decorator import Config
 from module.base.timer import Timer
 from module.logger import logger
 from module.ui.switch import Switch
@@ -30,16 +29,10 @@ class CafeStatus(Enum):
 
 
 class Cafe(CafeUI):
-    @Config.when(Emulator_GameLanguage='jp')
+    @property
-    def _is_second_cafe_on(self):
+    def is_second_cafe_on(self):
         return self.config.Cafe_SecondCafe
 
-    @Config.when(Emulator_GameLanguage=None)
-    def _is_second_cafe_on(self):
-        return False
-
-    is_second_cafe_on = property(_is_second_cafe_on)
-
     def _handle_cafe(self, status):
         match status:
             case CafeStatus.STUDENT_LIST:

tasks/circle/assets/assets_circle.py

@@ -3,6 +3,23 @@ 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=Button(
+        file='./assets/en/circle/CIRCLE.png',
+        area=(196, 314, 235, 355),
+        search=(176, 294, 255, 375),
+        color=(183, 221, 238),
+        button=(191, 298, 434, 457),
+    ),
+)
 GET_REWARD_AP = ButtonWrapper(
     name='GET_REWARD_AP',
     jp=Button(

tasks/circle/circle.py

@@ -2,7 +2,7 @@ from enum import Enum
 
 from module.base.timer import Timer
 from module.logger import logger
-from tasks.base.page import page_circle
+from tasks.base.page import CIRCLE_CHECK, MAIN_GO_TO_CIRCLE
 from tasks.base.ui import UI
 from tasks.circle.assets.assets_circle import *
 
@@ -17,6 +17,19 @@ class CircleStatus(Enum):
 
 
 class Circle(UI):
+    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(CIRCLE):
+                self.click_with_interval(CIRCLE, 3)
+                continue
+            else:
+                self.device.click(MAIN_GO_TO_CIRCLE)
+
     def _handle_circle(self, status):
         match status:
             case CircleStatus.REWARD:
@@ -31,7 +44,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),
     ),
 )