fix: update assets file

module/config/argument/args.json

@@ -343,7 +343,8 @@
           6,
           7,
           8,
-          9
+          9,
+          10
         ]
       },
       "Count": {
@@ -365,7 +366,8 @@
           6,
           7,
           8,
-          9
+          9,
+          10
         ]
       },
       "Count": {
@@ -387,7 +389,8 @@
           6,
           7,
           8,
-          9
+          9,
+          10
         ]
       },
       "Count": {

module/config/argument/argument.yaml

@@ -101,17 +101,17 @@ Bounty:
 Highway:
   Stage:
     value: 0
-    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
+    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
   Count: 2
 DesertRailroad:
   Stage:
     value: 0
-    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
+    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
   Count: 2
 Schoolhouse:
   Stage:
     value: 0
-    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
+    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
   Count: 2
 
 Scrimmage:

module/config/config_generated.py

@@ -56,15 +56,15 @@ class GeneratedConfig:
     Bounty_OnError = 'skip'  # stop, skip
 
     # Group `Highway`
-    Highway_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
+    Highway_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
     Highway_Count = 2
 
     # Group `DesertRailroad`
-    DesertRailroad_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
+    DesertRailroad_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
     DesertRailroad_Count = 2
 
     # Group `Schoolhouse`
-    Schoolhouse_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
+    Schoolhouse_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
     Schoolhouse_Count = 2
 
     # Group `Scrimmage`

module/config/i18n/en-US.json

@@ -282,7 +282,8 @@
       "6": "06 - Overpass F",
       "7": "07 - Overpass G",
       "8": "08 - Overpass H",
-      "9": "09 - Overpass I"
+      "9": "09 - Overpass I",
+      "10": "10 - Overpass J"
     },
     "Count": {
       "name": "Sweep X times",
@@ -306,7 +307,8 @@
       "6": "06 - Abandoned Train F",
       "7": "07 - Abandoned Train G",
       "8": "08 - Abandoned Train H",
-      "9": "09 - Abandoned Train I"
+      "9": "09 - Abandoned Train I",
+      "10": "10 - Abandoned Train J"
     },
     "Count": {
       "name": "Sweep X times",
@@ -330,7 +332,8 @@
       "6": "06 - Besieged Classroom F",
       "7": "07 - Besieged Classroom G",
       "8": "08 - Besieged Classroom H",
-      "9": "09 - Besieged Classroom I"
+      "9": "09 - Besieged Classroom I",
+      "10": "10 - Besieged Classroom J"
     },
     "Count": {
       "name": "Sweep X times",

module/config/i18n/zh-CN.json

@@ -282,7 +282,8 @@
       "6": "06 - 高架公路 F",
       "7": "07 - 高架公路 G",
       "8": "08 - 高架公路 H",
-      "9": "09 - 高架公路 I"
+      "9": "09 - 高架公路 I",
+      "10": "10 - 高架公路 J"
     },
     "Count": {
       "name": "扫荡次数",
@@ -306,7 +307,8 @@
       "6": "06 - 被遗弃的列车 F",
       "7": "07 - 被遗弃的列车 G",
       "8": "08 - 被遗弃的列车 H",
-      "9": "09 - 被遗弃的列车 I"
+      "9": "09 - 被遗弃的列车 I",
+      "10": "10 - 被遗弃的列车 J"
     },
     "Count": {
       "name": "扫荡次数",
@@ -330,7 +332,8 @@
       "6": "06 - 被袭击的教室 F",
       "7": "07 - 被袭击的教室 G",
       "8": "08 - 被袭击的教室 H",
-      "9": "09 - 被袭击的教室 I"
+      "9": "09 - 被袭击的教室 I",
+      "10": "10 - 被袭击的教室 J"
     },
     "Count": {
       "name": "扫荡次数",

tasks/base/assets/assets_base_page.py

@@ -134,6 +134,13 @@ GACHA_CHECK = ButtonWrapper(
 )
 HOME = ButtonWrapper(
     name='HOME',
+    jp=Button(
+        file='./assets/jp/base/page/HOME.png',
+        area=(1224, 10, 1250, 35),
+        search=(1204, 0, 1270, 55),
+        color=(162, 176, 202),
+        button=(1224, 10, 1250, 35),
+    ),
     share=Button(
         file='./assets/share/base/page/HOME.png',
         area=(1218, 8, 1253, 41),
@@ -171,6 +178,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=(86, 632, 113, 670),
+        search=(66, 612, 133, 690),
+        color=(174, 222, 246),
+        button=(86, 632, 113, 670),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_CAFE.png',
         area=(81, 638, 102, 668),
@@ -181,6 +195,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=(531, 631, 561, 659),
+        search=(511, 611, 581, 679),
+        color=(182, 230, 254),
+        button=(531, 631, 561, 659),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_CIRCLE.png',
         area=(542, 630, 581, 665),
@@ -191,6 +212,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=(645, 627, 667, 662),
+        search=(625, 607, 687, 682),
+        color=(206, 235, 251),
+        button=(645, 627, 667, 662),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_CRAFTING.png',
         area=(665, 622, 693, 664),
@@ -201,6 +229,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=(871, 626, 893, 671),
+        search=(851, 606, 913, 691),
+        color=(172, 223, 242),
+        button=(871, 626, 893, 671),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_GACHA.png',
         area=(900, 623, 924, 670),
@@ -211,6 +246,13 @@ MAIN_GO_TO_GACHA = ButtonWrapper(
 )
 MAIN_GO_TO_MAIL = ButtonWrapper(
     name='MAIN_GO_TO_MAIL',
+    jp=Button(
+        file='./assets/jp/base/page/MAIN_GO_TO_MAIL.png',
+        area=(1144, 27, 1165, 44),
+        search=(1124, 7, 1185, 64),
+        color=(102, 125, 168),
+        button=(1144, 27, 1165, 44),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_MAIL.png',
         area=(1130, 29, 1156, 49),
@@ -221,26 +263,47 @@ MAIN_GO_TO_MAIL = ButtonWrapper(
 )
 MAIN_GO_TO_MOMOTALK = ButtonWrapper(
     name='MAIN_GO_TO_MOMOTALK',
+    jp=Button(
+        file='./assets/jp/base/page/MAIN_GO_TO_MOMOTALK.png',
+        area=(125, 118, 146, 151),
+        search=(105, 98, 166, 171),
+        color=(244, 200, 211),
+        button=(125, 118, 146, 151),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_MOMOTALK.png',
-        area=(154, 134, 177, 158),
-        search=(134, 114, 197, 178),
-        color=(255, 219, 227),
-        button=(154, 134, 177, 158),
+        area=(138, 130, 159, 161),
+        search=(118, 110, 179, 181),
+        color=(251, 215, 224),
+        button=(138, 130, 159, 161),
     ),
 )
 MAIN_GO_TO_PURCHASE = ButtonWrapper(
     name='MAIN_GO_TO_PURCHASE',
+    jp=Button(
+        file='./assets/jp/base/page/MAIN_GO_TO_PURCHASE.png',
+        area=(122, 209, 148, 243),
+        search=(102, 189, 168, 263),
+        color=(190, 222, 246),
+        button=(122, 209, 148, 243),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_PURCHASE.png',
-        area=(148, 204, 183, 253),
-        search=(128, 184, 203, 273),
-        color=(172, 214, 239),
-        button=(148, 204, 183, 253),
+        area=(136, 210, 165, 250),
+        search=(116, 190, 185, 270),
+        color=(175, 216, 240),
+        button=(136, 210, 165, 250),
     ),
 )
 MAIN_GO_TO_SCHEDULE = ButtonWrapper(
     name='MAIN_GO_TO_SCHEDULE',
+    jp=Button(
+        file='./assets/jp/base/page/MAIN_GO_TO_SCHEDULE.png',
+        area=(198, 634, 217, 667),
+        search=(178, 614, 237, 687),
+        color=(176, 222, 243),
+        button=(198, 634, 217, 667),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_SCHEDULE.png',
         area=(194, 638, 216, 672),
@@ -251,6 +314,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=(752, 628, 786, 665),
+        search=(732, 608, 806, 685),
+        color=(168, 221, 248),
+        button=(752, 628, 786, 665),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_SHOP.png',
         area=(773, 630, 816, 667),
@@ -261,29 +331,36 @@ MAIN_GO_TO_SHOP = ButtonWrapper(
 )
 MAIN_GO_TO_TASK = ButtonWrapper(
     name='MAIN_GO_TO_TASK',
+    jp=Button(
+        file='./assets/jp/base/page/MAIN_GO_TO_TASK.png',
+        area=(30, 214, 55, 248),
+        search=(10, 194, 75, 268),
+        color=(186, 218, 245),
+        button=(30, 214, 55, 248),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_TASK.png',
-        area=(52, 220, 78, 248),
-        search=(32, 200, 98, 268),
-        color=(226, 207, 203),
-        button=(52, 220, 78, 248),
+        area=(47, 219, 70, 246),
+        search=(27, 199, 90, 266),
+        color=(212, 204, 208),
+        button=(47, 219, 70, 246),
     ),
 )
 MAIN_GO_TO_WORK = ButtonWrapper(
     name='MAIN_GO_TO_WORK',
     jp=Button(
         file='./assets/jp/base/page/MAIN_GO_TO_WORK.png',
-        area=(1167, 605, 1241, 632),
-        search=(1147, 585, 1261, 652),
-        color=(135, 149, 169),
-        button=(1167, 605, 1241, 632),
+        area=(1167, 668, 1222, 688),
+        search=(1147, 648, 1242, 708),
+        color=(141, 156, 174),
+        button=(1167, 668, 1222, 688),
     ),
     en=Button(
         file='./assets/en/base/page/MAIN_GO_TO_WORK.png',
-        area=(1127, 605, 1250, 637),
-        search=(1107, 585, 1270, 657),
-        color=(90, 112, 141),
-        button=(1127, 605, 1250, 637),
+        area=(1143, 591, 1241, 613),
+        search=(1123, 571, 1261, 633),
+        color=(110, 129, 154),
+        button=(1143, 591, 1241, 613),
     ),
 )
 MISSION_CHECK = ButtonWrapper(
@@ -305,6 +382,13 @@ MISSION_CHECK = ButtonWrapper(
 )
 MOMOTALK_CHECK = ButtonWrapper(
     name='MOMOTALK_CHECK',
+    jp=Button(
+        file='./assets/jp/base/page/MOMOTALK_CHECK.png',
+        area=(144, 107, 169, 130),
+        search=(124, 87, 189, 150),
+        color=(253, 211, 219),
+        button=(144, 107, 169, 130),
+    ),
     share=Button(
         file='./assets/share/base/page/MOMOTALK_CHECK.png',
         area=(144, 107, 169, 130),
@@ -446,10 +530,10 @@ WORK_GO_TO_BOUNTY = ButtonWrapper(
     name='WORK_GO_TO_BOUNTY',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_BOUNTY.png',
-        area=(667, 383, 764, 409),
-        search=(647, 363, 784, 429),
-        color=(171, 187, 212),
-        button=(667, 383, 764, 409),
+        area=(679, 401, 741, 417),
+        search=(659, 381, 761, 437),
+        color=(155, 164, 186),
+        button=(679, 401, 741, 417),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_BOUNTY.png',
@@ -463,10 +547,10 @@ WORK_GO_TO_COMMISSIONS = ButtonWrapper(
     name='WORK_GO_TO_COMMISSIONS',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_COMMISSIONS.png',
-        area=(653, 475, 749, 501),
-        search=(633, 455, 769, 521),
-        color=(171, 185, 208),
-        button=(653, 475, 749, 501),
+        area=(661, 504, 724, 521),
+        search=(641, 484, 744, 541),
+        color=(155, 163, 184),
+        button=(661, 504, 724, 521),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_COMMISSIONS.png',
@@ -480,10 +564,10 @@ WORK_GO_TO_MISSION = ButtonWrapper(
     name='WORK_GO_TO_MISSION',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_MISSION.png',
-        area=(722, 155, 807, 199),
-        search=(702, 135, 827, 219),
-        color=(173, 188, 211),
-        button=(722, 155, 807, 199),
+        area=(710, 220, 769, 249),
+        search=(690, 200, 789, 269),
+        color=(137, 153, 180),
+        button=(710, 220, 769, 249),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_MISSION.png',
@@ -497,10 +581,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=(636, 566, 753, 592),
-        search=(616, 546, 773, 612),
-        color=(176, 187, 207),
-        button=(636, 566, 753, 592),
+        area=(642, 606, 721, 624),
+        search=(622, 586, 741, 644),
+        color=(167, 174, 192),
+        button=(642, 606, 721, 624),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_SCHOOL_EXCHANGE.png',
@@ -514,10 +598,10 @@ WORK_GO_TO_STORY = ButtonWrapper(
     name='WORK_GO_TO_STORY',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_STORY.png',
-        area=(998, 155, 1078, 199),
-        search=(978, 135, 1098, 219),
-        color=(215, 221, 232),
-        button=(998, 155, 1078, 199),
+        area=(993, 220, 1081, 250),
+        search=(973, 200, 1101, 270),
+        color=(209, 214, 224),
+        button=(993, 220, 1081, 250),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_STORY.png',
@@ -531,10 +615,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=(801, 565, 920, 593),
-        search=(781, 545, 940, 613),
-        color=(172, 186, 209),
-        button=(801, 565, 920, 593),
+        area=(821, 600, 911, 620),
+        search=(801, 580, 931, 640),
+        color=(156, 164, 185),
+        button=(821, 600, 911, 620),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_TACTICAL_CHALLENGE.png',

tasks/cafe/assets/assets_cafe.py

@@ -34,10 +34,10 @@ CAFE_FIRST = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/cafe/CAFE_FIRST.png',
-        area=(100, 156, 148, 175),
-        search=(80, 136, 168, 195),
-        color=(107, 123, 144),
-        button=(100, 156, 148, 175),
+        area=(205, 96, 215, 107),
+        search=(185, 76, 235, 127),
+        color=(176, 184, 194),
+        button=(205, 96, 215, 107),
     ),
 )
 CAFE_INVITE = ButtonWrapper(
@@ -51,10 +51,10 @@ CAFE_INVITE = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/cafe/CAFE_INVITE.png',
-        area=(816, 635, 845, 655),
-        search=(796, 615, 865, 675),
-        color=(173, 182, 192),
-        button=(816, 635, 845, 655),
+        area=(870, 637, 903, 663),
+        search=(850, 617, 923, 683),
+        color=(253, 217, 235),
+        button=(870, 637, 903, 663),
     ),
 )
 CAFE_INVITED = ButtonWrapper(
@@ -68,10 +68,10 @@ CAFE_INVITED = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/cafe/CAFE_INVITED.png',
-        area=(815, 633, 847, 657),
-        search=(795, 613, 867, 677),
-        color=(144, 144, 146),
-        button=(815, 633, 847, 657),
+        area=(870, 637, 903, 663),
+        search=(850, 617, 923, 683),
+        color=(111, 109, 109),
+        button=(870, 637, 903, 663),
     ),
 )
 CAFE_SECOND = ButtonWrapper(
@@ -85,44 +85,10 @@ CAFE_SECOND = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/cafe/CAFE_SECOND.png',
-        area=(242, 157, 291, 174),
-        search=(222, 137, 311, 194),
-        color=(119, 134, 153),
-        button=(242, 157, 291, 174),
-    ),
-)
-CHANGE_CAFE_NOT_SELECTED = ButtonWrapper(
-    name='CHANGE_CAFE_NOT_SELECTED',
-    jp=Button(
-        file='./assets/jp/cafe/CHANGE_CAFE_NOT_SELECTED.png',
-        area=(84, 89, 178, 109),
-        search=(64, 69, 198, 129),
-        color=(185, 193, 203),
-        button=(84, 89, 178, 109),
-    ),
-    en=Button(
-        file='./assets/en/cafe/CHANGE_CAFE_NOT_SELECTED.png',
-        area=(99, 93, 197, 110),
-        search=(79, 73, 217, 130),
-        color=(179, 187, 196),
-        button=(99, 93, 197, 110),
-    ),
-)
-CHANGE_CAFE_SELECTED = ButtonWrapper(
-    name='CHANGE_CAFE_SELECTED',
-    jp=Button(
-        file='./assets/jp/cafe/CHANGE_CAFE_SELECTED.png',
-        area=(40, 87, 191, 112),
-        search=(20, 67, 211, 132),
-        color=(82, 105, 130),
-        button=(40, 87, 191, 112),
-    ),
-    en=Button(
-        file='./assets/en/cafe/CHANGE_CAFE_SELECTED.png',
-        area=(57, 92, 199, 112),
-        search=(37, 72, 219, 132),
-        color=(92, 115, 140),
-        button=(57, 92, 199, 112),
+        area=(207, 96, 214, 107),
+        search=(187, 76, 234, 127),
+        color=(174, 182, 192),
+        button=(207, 96, 214, 107),
     ),
 )
 CHECK_MOMOTALK = ButtonWrapper(
@@ -153,10 +119,10 @@ CHECK_REWARD = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/cafe/CHECK_REWARD.png',
-        area=(1090, 613, 1229, 644),
-        search=(1070, 593, 1249, 664),
-        color=(64, 88, 115),
-        button=(1086, 611, 1229, 685),
+        area=(1116, 636, 1218, 654),
+        search=(1096, 616, 1238, 674),
+        color=(77, 100, 125),
+        button=(1113, 625, 1239, 692),
     ),
 )
 CLICKABLE_TEMPLATE = ButtonWrapper(
@@ -384,10 +350,10 @@ OCR_CAFE = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/cafe/OCR_CAFE.png',
-        area=(1105, 639, 1195, 674),
-        search=(1085, 619, 1215, 694),
-        color=(84, 104, 127),
-        button=(1105, 639, 1195, 674),
+        area=(1127, 657, 1219, 682),
+        search=(1107, 637, 1239, 702),
+        color=(93, 112, 134),
+        button=(1127, 657, 1219, 682),
     ),
 )
 OCR_NAME = ButtonWrapper(

tasks/cafe/cafe.py

@@ -8,10 +8,6 @@ from tasks.cafe.assets.assets_cafe import *
 from tasks.cafe.invitation import handle_invitation
 from tasks.cafe.ui import CafeUI
 
-SWITCH_CAFE = Switch('Cafe_switch')
-SWITCH_CAFE.add_state('off', CHANGE_CAFE_NOT_SELECTED)
-SWITCH_CAFE.add_state('on', CHANGE_CAFE_SELECTED)
-
 SWITCH_CAFE_SELECT = Switch('Cafe_switch_select')
 SWITCH_CAFE_SELECT.add_state('1', CAFE_FIRST)
 SWITCH_CAFE_SELECT.add_state('2', CAFE_SECOND)
@@ -141,41 +137,19 @@ class Cafe(CafeUI):
                 continue
 
             if self.is_second_cafe_on and not is_second and status == CafeStatus.FINISHED:
-                # handle new jp ui
-                if self.config.Emulator_GameLanguage == 'jp':
-                    if not SWITCH_CAFE_SELECT.appear(main=self):
-                        logger.info('Cafe switch not found')
-                        continue
-                    match SWITCH_CAFE_SELECT.get(main=self):
-                        case '1':
-                            if self.click_with_interval(CAFE_FIRST):
-                                continue
-                        case '2':
-                            logger.info('Cafe second arrived')
-                            status = CafeStatus.STUDENT_LIST
-                            is_second = True
-                            self.check = 0
-                            loading_timer.reset().start()
-                else:
-                    if not SWITCH_CAFE.appear(main=self):
-                        logger.warning('Cafe switch not found')
-                        continue
-                    if SWITCH_CAFE.get(main=self) == 'off':
-                        SWITCH_CAFE.set('on', main=self)
-                        logger.info('Switching to second cafe')
-                    if not SWITCH_CAFE_SELECT.appear(main=self):
-                        logger.info('Cafe switch select not found')
-                        continue
-                    match SWITCH_CAFE_SELECT.get(main=self):
-                        case '1':
-                            if self.click_with_interval(CAFE_SECOND):
-                                continue
-                        case '2':
-                            logger.info('Cafe second arrived')
-                            SWITCH_CAFE.set('off', main=self)
-                            status = CafeStatus.STUDENT_LIST
-                            is_second = True
-                            self.check = 0
+                if not SWITCH_CAFE_SELECT.appear(main=self):
+                    logger.info('Cafe switch not found')
+                    continue
+                match SWITCH_CAFE_SELECT.get(main=self):
+                    case '1':
+                        if self.click_with_interval(CAFE_FIRST):
+                            continue
+                    case '2':
+                        logger.info('Cafe second arrived')
+                        status = CafeStatus.STUDENT_LIST
+                        is_second = True
+                        self.check = 0
+                        loading_timer.reset().start()
 
             if action_timer.reached_and_reset():
                 logger.attr('Status', status)

tasks/item/assets/assets_item_data.py

@@ -5,21 +5,35 @@ from module.base.button import Button, ButtonWrapper
 
 OCR_AP = ButtonWrapper(
     name='OCR_AP',
+    jp=Button(
+        file='./assets/jp/item/data/OCR_AP.png',
+        area=(512, 13, 597, 32),
+        search=(492, 0, 617, 52),
+        color=(199, 204, 208),
+        button=(512, 13, 597, 32),
+    ),
     share=Button(
         file='./assets/share/item/data/OCR_AP.png',
-        area=(560, 11, 667, 37),
-        search=(540, 0, 687, 57),
-        color=(211, 216, 219),
-        button=(560, 11, 667, 37),
+        area=(535, 13, 660, 36),
+        search=(515, 0, 680, 56),
+        color=(207, 215, 220),
+        button=(535, 13, 660, 36),
     ),
 )
 OCR_DATA = ButtonWrapper(
     name='OCR_DATA',
+    jp=Button(
+        file='./assets/jp/item/data/OCR_DATA.png',
+        area=(716, 14, 1058, 33),
+        search=(696, 0, 1078, 53),
+        color=(211, 219, 224),
+        button=(716, 14, 1058, 33),
+    ),
     share=Button(
         file='./assets/share/item/data/OCR_DATA.png',
-        area=(768, 12, 1072, 37),
-        search=(748, 0, 1092, 57),
-        color=(212, 220, 224),
-        button=(768, 12, 1072, 37),
+        area=(745, 11, 1069, 39),
+        search=(725, 0, 1089, 59),
+        color=(216, 223, 227),
+        button=(745, 11, 1069, 39),
     ),
 )