fix(momotalk): add missing screenshot when switching sidebar

config/template.json

@@ -181,14 +181,6 @@
     "Schoolhouse": {
       "Stage": 0,
       "Count": 2
-    },
-    "Road": {
-      "Stage": 0,
-      "Count": 0
-    },
-    "Mansion": {
-      "Stage": 0,
-      "Count": 0
     }
   },
   "Scrimmage": {

module/config/argument/args.json

@@ -827,52 +827,6 @@
         "type": "input",
         "value": 2
       }
-    },
-    "Road": {
-      "Stage": {
-        "type": "select",
-        "value": 0,
-        "option": [
-          0,
-          1,
-          2,
-          3,
-          4,
-          5,
-          6,
-          7,
-          8,
-          9,
-          10
-        ]
-      },
-      "Count": {
-        "type": "input",
-        "value": 0
-      }
-    },
-    "Mansion": {
-      "Stage": {
-        "type": "select",
-        "value": 0,
-        "option": [
-          0,
-          1,
-          2,
-          3,
-          4,
-          5,
-          6,
-          7,
-          8,
-          9,
-          10
-        ]
-      },
-      "Count": {
-        "type": "input",
-        "value": 0
-      }
     }
   },
   "Scrimmage": {

module/config/argument/argument.yaml

@@ -169,16 +169,6 @@ Schoolhouse:
     value: 0
     option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
   Count: 2
-Road:
-  Stage:
-    value: 0
-    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
-  Count: 0
-Mansion:
-  Stage:
-    value: 0
-    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
-  Count: 0
 
 Scrimmage:
   OnError:

module/config/argument/task.yaml

@@ -56,8 +56,6 @@ Farm:
       - Highway
       - DesertRailroad
       - Schoolhouse
-      - Road
-      - Mansion
     Scrimmage:
       - Scheduler
       - Scrimmage

module/config/config_generated.py

@@ -98,14 +98,6 @@ class GeneratedConfig:
     Schoolhouse_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
     Schoolhouse_Count = 2
 
-    # Group `Road`
-    Road_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
-    Road_Count = 0
-
-    # Group `Mansion`
-    Mansion_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
-    Mansion_Count = 0
-
     # Group `Scrimmage`
     Scrimmage_OnError = 'skip'  # stop, skip
 

module/config/i18n/en-US.json

@@ -568,56 +568,6 @@
       "help": "Sweep the selected stage for X times"
     }
   },
-  "Road": {
-    "_info": {
-      "name": "Road",
-      "help": ""
-    },
-    "Stage": {
-      "name": "Select Stage",
-      "help": "",
-      "0": "Auto select",
-      "1": "01 - Burning Road A",
-      "2": "02 - Burning Road B",
-      "3": "03 - Burning Road C",
-      "4": "04 - Burning Road D",
-      "5": "05 - Burning Road E",
-      "6": "06 - Burning Road F",
-      "7": "07 - Burning Road G",
-      "8": "08 - Burning Road H",
-      "9": "09 - Burning Road I",
-      "10": "10 - Burning Road J"
-    },
-    "Count": {
-      "name": "Sweep X times",
-      "help": "Sweep the selected stage for X times"
-    }
-  },
-  "Mansion": {
-    "_info": {
-      "name": "Mansion",
-      "help": ""
-    },
-    "Stage": {
-      "name": "Select Stage",
-      "help": "",
-      "0": "Auto select",
-      "1": "01 - Historic Mansion A",
-      "2": "02 - Historic Mansion B",
-      "3": "03 - Historic Mansion C",
-      "4": "04 - Historic Mansion D",
-      "5": "05 - Historic Mansion E",
-      "6": "06 - Historic Mansion F",
-      "7": "07 - Historic Mansion G",
-      "8": "08 - Historic Mansion H",
-      "9": "09 - Historic Mansion I",
-      "10": "10 - Historic Mansion J"
-    },
-    "Count": {
-      "name": "Sweep X times",
-      "help": "Sweep the selected stage for X times"
-    }
-  },
   "Scrimmage": {
     "_info": {
       "name": "Scrimmage Settings",

module/config/i18n/zh-CN.json

@@ -568,56 +568,6 @@
       "help": "扫荡所选择关卡 X 次"
     }
   },
-  "Road": {
-    "_info": {
-      "name": "道路",
-      "help": ""
-    },
-    "Stage": {
-      "name": "选择关卡",
-      "help": "",
-      "0": "自动选择",
-      "1": "01 - 燃烧道路 A",
-      "2": "02 - 燃烧道路 B",
-      "3": "03 - 燃烧道路 C",
-      "4": "04 - 燃烧道路 D",
-      "5": "05 - 燃烧道路 E",
-      "6": "06 - 燃烧道路 F",
-      "7": "07 - 燃烧道路 G",
-      "8": "08 - 燃烧道路 H",
-      "9": "09 - 燃烧道路 I",
-      "10": "10 - 燃烧道路 J"
-    },
-    "Count": {
-      "name": "扫荡次数",
-      "help": "扫荡所选择关卡 X 次"
-    }
-  },
-  "Mansion": {
-    "_info": {
-      "name": "宅邸",
-      "help": ""
-    },
-    "Stage": {
-      "name": "选择关卡",
-      "help": "",
-      "0": "自动选择",
-      "1": "01 - 古老宅邸 A",
-      "2": "02 - 古老宅邸 B",
-      "3": "03 - 古老宅邸 C",
-      "4": "04 - 古老宅邸 D",
-      "5": "05 - 古老宅邸 E",
-      "6": "06 - 古老宅邸 F",
-      "7": "07 - 古老宅邸 G",
-      "8": "08 - 古老宅邸 H",
-      "9": "09 - 古老宅邸 I",
-      "10": "10 - 古老宅邸 J"
-    },
-    "Count": {
-      "name": "扫荡次数",
-      "help": "扫荡所选择关卡 X 次"
-    }
-  },
   "Scrimmage": {
     "_info": {
       "name": "学院交流会设置",

tasks/base/assets/assets_base_page.py

@@ -207,13 +207,20 @@ GACHA_CHECK = ButtonWrapper(
 )
 HOME = ButtonWrapper(
     name='HOME',
-    share=Button(
+    jp=Button(
-        file='./assets/share/base/page/HOME.png',
+        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),
+        search=(1198, 0, 1273, 61),
+        color=(168, 182, 205),
+        button=(1218, 8, 1253, 41),
+    ),
 )
 LOADING_CHECK = ButtonWrapper(
     name='LOADING_CHECK',
@@ -253,132 +260,153 @@ MAIN_GO_TO_CAFE = ButtonWrapper(
     name='MAIN_GO_TO_CAFE',
     jp=Button(
         file='./assets/jp/base/page/MAIN_GO_TO_CAFE.png',
-        area=(86, 636, 112, 674),
+        area=(86, 632, 113, 670),
-        search=(66, 616, 132, 694),
+        search=(66, 612, 133, 690),
-        color=(177, 223, 246),
+        color=(174, 222, 246),
-        button=(86, 636, 112, 674),
+        button=(86, 632, 113, 670),
     ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_CAFE.png',
-        area=(85, 637, 113, 674),
+        area=(81, 638, 102, 668),
-        search=(65, 617, 133, 694),
+        search=(61, 618, 122, 688),
-        color=(178, 224, 246),
+        color=(156, 209, 233),
-        button=(85, 637, 113, 674),
+        button=(81, 638, 102, 668),
     ),
 )
 MAIN_GO_TO_CIRCLE = ButtonWrapper(
     name='MAIN_GO_TO_CIRCLE',
     jp=Button(
         file='./assets/jp/base/page/MAIN_GO_TO_CIRCLE.png',
-        area=(533, 633, 558, 661),
+        area=(531, 631, 561, 659),
-        search=(513, 613, 578, 681),
+        search=(511, 611, 581, 679),
-        color=(171, 228, 255),
+        color=(182, 230, 254),
-        button=(533, 633, 558, 661),
+        button=(531, 631, 561, 659),
     ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_CIRCLE.png',
-        area=(533, 636, 558, 661),
+        area=(542, 630, 581, 665),
-        search=(513, 616, 578, 681),
+        search=(522, 610, 601, 685),
-        color=(162, 224, 255),
+        color=(163, 225, 242),
-        button=(533, 636, 558, 661),
+        button=(542, 630, 581, 665),
     ),
 )
 MAIN_GO_TO_CRAFTING = ButtonWrapper(
     name='MAIN_GO_TO_CRAFTING',
     jp=Button(
         file='./assets/jp/base/page/MAIN_GO_TO_CRAFTING.png',
-        area=(643, 632, 669, 664),
+        area=(645, 627, 667, 662),
-        search=(623, 612, 689, 684),
+        search=(625, 607, 687, 682),
-        color=(210, 237, 252),
+        color=(206, 235, 251),
-        button=(643, 632, 669, 664),
+        button=(645, 627, 667, 662),
     ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_CRAFTING.png',
-        area=(644, 636, 666, 665),
+        area=(665, 622, 693, 664),
-        search=(624, 616, 686, 685),
+        search=(645, 602, 713, 684),
-        color=(205, 234, 251),
+        color=(192, 229, 241),
-        button=(644, 636, 666, 665),
+        button=(665, 622, 693, 664),
     ),
 )
 MAIN_GO_TO_GACHA = ButtonWrapper(
     name='MAIN_GO_TO_GACHA',
     jp=Button(
         file='./assets/jp/base/page/MAIN_GO_TO_GACHA.png',
-        area=(874, 650, 895, 669),
+        area=(871, 626, 893, 671),
-        search=(854, 630, 915, 689),
+        search=(851, 606, 913, 691),
-        color=(158, 228, 254),
+        color=(172, 223, 242),
-        button=(874, 650, 895, 669),
+        button=(871, 626, 893, 671),
     ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_GACHA.png',
-        area=(871, 655, 896, 674),
+        area=(900, 623, 924, 670),
-        search=(851, 635, 916, 694),
+        search=(880, 603, 944, 690),
-        color=(139, 221, 249),
+        color=(157, 219, 241),
-        button=(871, 655, 896, 674),
+        button=(900, 623, 924, 670),
     ),
 )
 MAIN_GO_TO_MAIL = ButtonWrapper(
     name='MAIN_GO_TO_MAIL',
-    share=Button(
+    jp=Button(
-        file='./assets/share/base/page/MAIN_GO_TO_MAIL.png',
+        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),
+        search=(1110, 9, 1176, 69),
+        color=(94, 121, 166),
+        button=(1130, 29, 1156, 49),
+    ),
 )
 MAIN_GO_TO_MOMOTALK = ButtonWrapper(
     name='MAIN_GO_TO_MOMOTALK',
-    share=Button(
+    jp=Button(
-        file='./assets/share/base/page/MAIN_GO_TO_MOMOTALK.png',
+        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=(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',
-    share=Button(
+    jp=Button(
-        file='./assets/share/base/page/MAIN_GO_TO_PURCHASE.png',
+        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=(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=(197, 637, 216, 668),
+        area=(198, 634, 217, 667),
-        search=(177, 617, 236, 688),
+        search=(178, 614, 237, 687),
-        color=(181, 224, 241),
+        color=(176, 222, 243),
-        button=(197, 637, 216, 668),
+        button=(198, 634, 217, 667),
     ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_SCHEDULE.png',
-        area=(196, 650, 225, 670),
+        area=(194, 638, 216, 672),
-        search=(176, 630, 245, 690),
+        search=(174, 618, 236, 692),
-        color=(196, 228, 242),
+        color=(149, 194, 222),
-        button=(196, 650, 225, 670),
+        button=(194, 638, 216, 672),
     ),
 )
 MAIN_GO_TO_SHOP = ButtonWrapper(
     name='MAIN_GO_TO_SHOP',
     jp=Button(
         file='./assets/jp/base/page/MAIN_GO_TO_SHOP.png',
-        area=(753, 632, 787, 668),
+        area=(752, 628, 786, 665),
-        search=(733, 612, 807, 688),
+        search=(732, 608, 806, 685),
-        color=(167, 220, 247),
+        color=(168, 221, 248),
-        button=(753, 632, 787, 668),
+        button=(752, 628, 786, 665),
     ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_SHOP.png',
-        area=(750, 633, 788, 666),
+        area=(773, 630, 816, 667),
-        search=(730, 613, 808, 686),
+        search=(753, 610, 836, 687),
-        color=(168, 220, 246),
+        color=(146, 208, 235),
-        button=(750, 633, 788, 666),
+        button=(773, 630, 816, 667),
     ),
 )
 MAIN_GO_TO_TASK = ButtonWrapper(
@@ -392,10 +420,10 @@ MAIN_GO_TO_TASK = ButtonWrapper(
     ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_TASK.png',
-        area=(37, 216, 60, 247),
+        area=(47, 219, 70, 246),
-        search=(17, 196, 80, 267),
+        search=(27, 199, 90, 266),
-        color=(195, 225, 248),
+        color=(212, 204, 208),
-        button=(37, 216, 60, 247),
+        button=(47, 219, 70, 246),
     ),
 )
 MAIN_GO_TO_WORK = ButtonWrapper(
@@ -409,17 +437,17 @@ MAIN_GO_TO_WORK = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/base/page/MAIN_GO_TO_WORK.png',
-        area=(1155, 669, 1250, 690),
+        area=(1143, 591, 1241, 613),
-        search=(1135, 649, 1270, 710),
+        search=(1123, 571, 1261, 633),
-        color=(116, 136, 159),
+        color=(110, 129, 154),
-        button=(1155, 669, 1250, 690),
+        button=(1143, 591, 1241, 613),
     ),
     zht=Button(
         file='./assets/zht/base/page/MAIN_GO_TO_WORK.png',
-        area=(1182, 667, 1222, 687),
+        area=(1188, 586, 1241, 613),
-        search=(1162, 647, 1242, 707),
+        search=(1168, 566, 1261, 633),
-        color=(148, 162, 179),
+        color=(141, 155, 174),
-        button=(1182, 667, 1222, 687),
+        button=(1188, 586, 1241, 613),
     ),
 )
 MISSION_CHECK = ButtonWrapper(
@@ -448,6 +476,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),
@@ -645,17 +680,17 @@ WORK_GO_TO_BOUNTY = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_BOUNTY.png',
-        area=(679, 402, 736, 421),
+        area=(668, 385, 756, 412),
-        search=(659, 382, 756, 441),
+        search=(648, 365, 776, 432),
-        color=(188, 196, 211),
+        color=(180, 198, 223),
-        button=(679, 402, 736, 421),
+        button=(668, 385, 756, 412),
     ),
     zht=Button(
         file='./assets/zht/base/page/WORK_GO_TO_BOUNTY.png',
-        area=(678, 400, 745, 418),
+        area=(667, 383, 769, 410),
-        search=(658, 380, 765, 438),
+        search=(647, 363, 789, 430),
-        color=(163, 172, 192),
+        color=(169, 184, 209),
-        button=(678, 400, 745, 418),
+        button=(667, 383, 769, 410),
     ),
 )
 WORK_GO_TO_COMMISSIONS = ButtonWrapper(
@@ -669,17 +704,17 @@ WORK_GO_TO_COMMISSIONS = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_COMMISSIONS.png',
-        area=(661, 504, 762, 520),
+        area=(653, 477, 787, 496),
-        search=(641, 484, 782, 540),
+        search=(633, 457, 807, 516),
-        color=(169, 178, 195),
+        color=(187, 199, 218),
-        button=(661, 504, 762, 520),
+        button=(653, 477, 787, 496),
     ),
     zht=Button(
         file='./assets/zht/base/page/WORK_GO_TO_COMMISSIONS.png',
-        area=(661, 502, 727, 521),
+        area=(654, 474, 753, 503),
-        search=(641, 482, 747, 541),
+        search=(634, 454, 773, 523),
-        color=(166, 174, 192),
+        color=(179, 192, 213),
-        button=(661, 502, 727, 521),
+        button=(654, 474, 753, 503),
     ),
 )
 WORK_GO_TO_EVENT = ButtonWrapper(
@@ -710,24 +745,24 @@ WORK_GO_TO_MISSION = ButtonWrapper(
     name='WORK_GO_TO_MISSION',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_MISSION.png',
-        area=(703, 231, 742, 252),
+        area=(710, 220, 769, 249),
-        search=(683, 211, 762, 272),
+        search=(690, 200, 789, 269),
-        color=(144, 158, 184),
+        color=(137, 153, 180),
-        button=(703, 231, 742, 252),
+        button=(710, 220, 769, 249),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_MISSION.png',
-        area=(712, 221, 819, 247),
+        area=(721, 158, 873, 197),
-        search=(692, 201, 839, 267),
+        search=(701, 138, 893, 217),
-        color=(140, 162, 190),
+        color=(180, 195, 215),
-        button=(712, 221, 819, 247),
+        button=(721, 158, 873, 197),
     ),
     zht=Button(
         file='./assets/zht/base/page/WORK_GO_TO_MISSION.png',
-        area=(709, 218, 773, 250),
+        area=(720, 152, 812, 200),
-        search=(689, 198, 793, 270),
+        search=(700, 132, 832, 220),
-        color=(147, 163, 189),
+        color=(181, 195, 215),
-        button=(709, 218, 773, 250),
+        button=(720, 152, 812, 200),
     ),
 )
 WORK_GO_TO_SCHOOL_EXCHANGE = ButtonWrapper(
@@ -741,41 +776,41 @@ WORK_GO_TO_SCHOOL_EXCHANGE = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_SCHOOL_EXCHANGE.png',
-        area=(642, 607, 729, 627),
+        area=(635, 569, 769, 597),
-        search=(622, 587, 749, 647),
+        search=(615, 549, 789, 617),
-        color=(196, 200, 211),
+        color=(198, 204, 216),
-        button=(642, 607, 729, 627),
+        button=(635, 569, 769, 597),
     ),
     zht=Button(
         file='./assets/zht/base/page/WORK_GO_TO_SCHOOL_EXCHANGE.png',
-        area=(642, 606, 725, 624),
+        area=(635, 567, 761, 594),
-        search=(622, 586, 745, 644),
+        search=(615, 547, 781, 614),
-        color=(172, 177, 194),
+        color=(181, 191, 209),
-        button=(642, 606, 725, 624),
+        button=(635, 567, 761, 594),
     ),
 )
 WORK_GO_TO_STORY = ButtonWrapper(
     name='WORK_GO_TO_STORY',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_STORY.png',
-        area=(1074, 232, 1169, 251),
+        area=(993, 220, 1081, 250),
-        search=(1054, 212, 1189, 271),
+        search=(973, 200, 1101, 270),
-        color=(202, 207, 220),
+        color=(209, 214, 224),
-        button=(1074, 232, 1169, 251),
+        button=(993, 220, 1081, 250),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_STORY.png',
-        area=(992, 221, 1075, 255),
+        area=(996, 159, 1112, 205),
-        search=(972, 201, 1095, 275),
+        search=(976, 139, 1132, 225),
-        color=(192, 198, 213),
+        color=(200, 209, 225),
-        button=(992, 221, 1075, 255),
+        button=(996, 159, 1112, 205),
     ),
     zht=Button(
         file='./assets/zht/base/page/WORK_GO_TO_STORY.png',
-        area=(993, 217, 1056, 250),
+        area=(991, 152, 1093, 202),
-        search=(973, 197, 1076, 270),
+        search=(971, 132, 1113, 222),
-        color=(155, 164, 187),
+        color=(190, 200, 218),
-        button=(993, 217, 1056, 250),
+        button=(991, 152, 1093, 202),
     ),
 )
 WORK_GO_TO_TACTICAL_CHALLENGE = ButtonWrapper(
@@ -789,16 +824,16 @@ WORK_GO_TO_TACTICAL_CHALLENGE = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_TACTICAL_CHALLENGE.png',
-        area=(818, 608, 923, 623),
+        area=(803, 566, 922, 623),
-        search=(798, 588, 943, 643),
+        search=(783, 546, 942, 643),
-        color=(198, 202, 215),
+        color=(186, 201, 220),
-        button=(818, 608, 923, 623),
+        button=(803, 566, 922, 623),
     ),
     zht=Button(
         file='./assets/zht/base/page/WORK_GO_TO_TACTICAL_CHALLENGE.png',
-        area=(819, 603, 895, 624),
+        area=(801, 564, 908, 595),
-        search=(799, 583, 915, 644),
+        search=(781, 544, 928, 615),
-        color=(169, 176, 194),
+        color=(179, 192, 213),
-        button=(819, 603, 895, 624),
+        button=(801, 564, 908, 595),
     ),
 )

tasks/base/page.py

@@ -69,7 +69,7 @@ class Page:
 
 
 # Main Page
-page_main = Page(MAIN_GO_TO_TASK)
+page_main = Page(MAIN_GO_TO_PURCHASE)
 
 # Cafe
 page_cafe = Page(CAFE_CHECK)

tasks/base/ui.py

@@ -450,11 +450,6 @@ class UI(MainPage):
         """
         pass
 
-    @Config.when(Emulator_GameLanguage='jp')
-    def close_popup(self, check_button):
-        pass
-
-    @Config.when(Emulator_GameLanguage=None)
     def close_popup(self, check_button):
         if not self.match_color(check_button):
             timer = Timer(5, 5).start()
@@ -469,4 +464,3 @@ class UI(MainPage):
                     raise RequestHumanTakeover
                 while not wait.reached():
                     pass
-

tasks/bounty/assets/assets_bounty.py

@@ -75,30 +75,6 @@ CHECK_HIGHWAY = ButtonWrapper(
         button=(94, 131, 408, 186),
     ),
 )
-CHECK_MANSION = ButtonWrapper(
-    name='CHECK_MANSION',
-    jp=Button(
-        file='./assets/jp/bounty/CHECK_MANSION.png',
-        area=(108, 148, 313, 178),
-        search=(88, 128, 333, 198),
-        color=(167, 173, 178),
-        button=(108, 148, 313, 178),
-    ),
-    en=None,
-    zht=None,
-)
-CHECK_ROAD = ButtonWrapper(
-    name='CHECK_ROAD',
-    jp=Button(
-        file='./assets/jp/bounty/CHECK_ROAD.png',
-        area=(108, 148, 313, 178),
-        search=(88, 128, 333, 198),
-        color=(168, 175, 179),
-        button=(108, 148, 313, 178),
-    ),
-    en=None,
-    zht=None,
-)
 CHECK_SCHOOLHOUSE = ButtonWrapper(
     name='CHECK_SCHOOLHOUSE',
     jp=Button(
@@ -151,10 +127,10 @@ SELECT_DESERT_RAILROAD = ButtonWrapper(
     name='SELECT_DESERT_RAILROAD',
     jp=Button(
         file='./assets/jp/bounty/SELECT_DESERT_RAILROAD.png',
-        area=(1071, 290, 1219, 321),
+        area=(1066, 271, 1224, 311),
-        search=(1051, 270, 1239, 341),
+        search=(1046, 251, 1244, 331),
-        color=(155, 166, 181),
+        color=(178, 188, 199),
-        button=(1071, 290, 1219, 321),
+        button=(1066, 271, 1224, 311),
     ),
     en=Button(
         file='./assets/en/bounty/SELECT_DESERT_RAILROAD.png',
@@ -195,38 +171,14 @@ SELECT_HIGHWAY = ButtonWrapper(
         button=(1083, 157, 1231, 206),
     ),
 )
-SELECT_MANSION = ButtonWrapper(
-    name='SELECT_MANSION',
-    jp=Button(
-        file='./assets/jp/bounty/SELECT_MANSION.png',
-        area=(1156, 657, 1221, 688),
-        search=(1136, 637, 1241, 708),
-        color=(145, 158, 175),
-        button=(1156, 657, 1221, 688),
-    ),
-    en=None,
-    zht=None,
-)
-SELECT_ROAD = ButtonWrapper(
-    name='SELECT_ROAD',
-    jp=Button(
-        file='./assets/jp/bounty/SELECT_ROAD.png',
-        area=(1156, 535, 1219, 565),
-        search=(1136, 515, 1239, 585),
-        color=(146, 159, 175),
-        button=(1156, 535, 1219, 565),
-    ),
-    en=None,
-    zht=None,
-)
 SELECT_SCHOOLHOUSE = ButtonWrapper(
     name='SELECT_SCHOOLHOUSE',
     jp=Button(
         file='./assets/jp/bounty/SELECT_SCHOOLHOUSE.png',
-        area=(1157, 412, 1220, 443),
+        area=(1154, 381, 1223, 417),
-        search=(1137, 392, 1240, 463),
+        search=(1134, 361, 1243, 437),
-        color=(157, 170, 185),
+        color=(173, 185, 198),
-        button=(1157, 412, 1220, 443),
+        button=(1154, 381, 1223, 417),
     ),
     en=Button(
         file='./assets/en/bounty/SELECT_SCHOOLHOUSE.png',

tasks/bounty/bounty.py

@@ -21,12 +21,10 @@ class BountyStatus(Flag):
 class Bounty(BountyUI):
     @property
     def bounty_info(self):
-        bounty = (SELECT_HIGHWAY, SELECT_DESERT_RAILROAD, SELECT_SCHOOLHOUSE, SELECT_ROAD, SELECT_MANSION)
+        bounty = (SELECT_HIGHWAY, SELECT_DESERT_RAILROAD, SELECT_SCHOOLHOUSE)
-        check = (CHECK_HIGHWAY, CHECK_DESERT_RAILROAD, CHECK_SCHOOLHOUSE, CHECK_ROAD, CHECK_MANSION)
+        check = (CHECK_HIGHWAY, CHECK_DESERT_RAILROAD, CHECK_SCHOOLHOUSE)
-        stage = (self.config.Highway_Stage, self.config.DesertRailroad_Stage, self.config.Schoolhouse_Stage,
+        stage = (self.config.Highway_Stage, self.config.DesertRailroad_Stage, self.config.Schoolhouse_Stage)
-                 self.config.Road_Stage, self.config.Mansion_Stage)
+        count = (self.config.Highway_Count, self.config.DesertRailroad_Count, self.config.Schoolhouse_Count)
-        count = (self.config.Highway_Count, self.config.DesertRailroad_Count, self.config.Schoolhouse_Count,
-                 self.config.Road_Count, self.config.Mansion_Count)
         info = zip(bounty, check, stage, count)
         return filter(lambda x: x[3] > 0, info)
 

tasks/item/assets/assets_item_data.py

@@ -5,21 +5,35 @@ from module.base.button import Button, ButtonWrapper
 
 OCR_AP = ButtonWrapper(
     name='OCR_AP',
-    share=Button(
+    jp=Button(
-        file='./assets/share/item/data/OCR_AP.png',
+        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=(535, 13, 660, 36),
+        search=(515, 0, 680, 56),
+        color=(207, 215, 220),
+        button=(535, 13, 660, 36),
+    ),
 )
 OCR_DATA = ButtonWrapper(
     name='OCR_DATA',
-    share=Button(
+    jp=Button(
-        file='./assets/share/item/data/OCR_DATA.png',
+        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=(745, 11, 1069, 39),
+        search=(725, 0, 1089, 59),
+        color=(216, 223, 227),
+        button=(745, 11, 1069, 39),
+    ),
 )

tasks/momotalk/assets/assets_momotalk.py

@@ -367,10 +367,10 @@ SWITCH_MESSAGE_CHECK = ButtonWrapper(
     name='SWITCH_MESSAGE_CHECK',
     jp=Button(
         file='./assets/jp/momotalk/SWITCH_MESSAGE_CHECK.png',
-        area=(232, 170, 356, 189),
+        area=(231, 167, 379, 190),
-        search=(212, 150, 376, 209),
+        search=(211, 147, 399, 210),
-        color=(195, 199, 201),
+        color=(197, 201, 202),
-        button=(232, 170, 356, 189),
+        button=(231, 167, 379, 190),
     ),
     en=Button(
         file='./assets/en/momotalk/SWITCH_MESSAGE_CHECK.png',
@@ -439,10 +439,10 @@ UNREAD = ButtonWrapper(
     name='UNREAD',
     jp=Button(
         file='./assets/jp/momotalk/UNREAD.png',
-        area=(475, 158, 590, 197),
+        area=(454, 158, 570, 194),
-        search=(455, 138, 610, 217),
+        search=(434, 138, 590, 214),
-        color=(242, 243, 244),
+        color=(242, 243, 243),
-        button=(475, 158, 590, 197),
+        button=(454, 158, 570, 194),
     ),
     en=Button(
         file='./assets/en/momotalk/UNREAD.png',

tasks/momotalk/ui.py

@@ -102,6 +102,7 @@ class MomoTalkUI(UI):
         if self.match_color(NOTIFICATION_BADGE, threshold=120):
             self.ui_ensure(page_momo_talk)
             while SWITCH_SIDEBAR.get(self) != "message":
+                self.device.screenshot()
                 SWITCH_SIDEBAR.set("message", self)
             return True
         logger.warning("No students available for interaction")