14 Commits
59 changed files with 170 additions and 214 deletions
Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.0 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.0 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

+2 -2
View File
@@ -360,7 +360,7 @@ class Ocr:
class Digit(Ocr):
def __init__(self, button: ButtonWrapper, lang=None, name=None):
def __init__(self, button: ButtonWrapper, lang='en', name=None):
super().__init__(button, lang=lang, name=name)
def format_result(self, result) -> int:
@@ -380,7 +380,7 @@ class Digit(Ocr):
class DigitCounter(Ocr):
def __init__(self, button: ButtonWrapper, lang=None, name=None):
def __init__(self, button: ButtonWrapper, lang='en', name=None):
super().__init__(button, lang=lang, name=name)
@classmethod
-1
View File
@@ -195,7 +195,6 @@ class Updater(DeployConfig, GitManager, PipManager):
def update(self):
logger.hr("Run update")
self.set_repo()
try:
self.git_install()
self.pip_install()
+1 -1
View File
@@ -4,7 +4,7 @@
#
# pip-compile --annotation-style=line --output-file=requirements.txt requirements-in.txt
#
--index-url http://mirrors.aliyun.com/pypi/simple
#--index-url https://mirrors.aliyun.com/pypi/simple
adbutils==1.2.9 # via -r requirements-in.txt, uiautomator2
aiofiles==23.1.0 # via -r requirements-in.txt
+124 -159
View File
@@ -207,20 +207,13 @@ GACHA_CHECK = ButtonWrapper(
)
HOME = ButtonWrapper(
name='HOME',
jp=Button(
file='./assets/jp/base/page/HOME.png',
share=Button(
file='./assets/share/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',
@@ -260,153 +253,132 @@ 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),
area=(86, 636, 112, 674),
search=(66, 616, 132, 694),
color=(177, 223, 246),
button=(86, 636, 112, 674),
),
share=Button(
file='./assets/share/base/page/MAIN_GO_TO_CAFE.png',
area=(81, 638, 102, 668),
search=(61, 618, 122, 688),
color=(156, 209, 233),
button=(81, 638, 102, 668),
area=(85, 637, 113, 674),
search=(65, 617, 133, 694),
color=(178, 224, 246),
button=(85, 637, 113, 674),
),
)
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),
area=(533, 633, 558, 661),
search=(513, 613, 578, 681),
color=(171, 228, 255),
button=(533, 633, 558, 661),
),
share=Button(
file='./assets/share/base/page/MAIN_GO_TO_CIRCLE.png',
area=(542, 630, 581, 665),
search=(522, 610, 601, 685),
color=(163, 225, 242),
button=(542, 630, 581, 665),
area=(533, 636, 558, 661),
search=(513, 616, 578, 681),
color=(162, 224, 255),
button=(533, 636, 558, 661),
),
)
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),
area=(643, 632, 669, 664),
search=(623, 612, 689, 684),
color=(210, 237, 252),
button=(643, 632, 669, 664),
),
share=Button(
file='./assets/share/base/page/MAIN_GO_TO_CRAFTING.png',
area=(665, 622, 693, 664),
search=(645, 602, 713, 684),
color=(192, 229, 241),
button=(665, 622, 693, 664),
area=(644, 636, 666, 665),
search=(624, 616, 686, 685),
color=(205, 234, 251),
button=(644, 636, 666, 665),
),
)
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),
area=(874, 650, 895, 669),
search=(854, 630, 915, 689),
color=(158, 228, 254),
button=(874, 650, 895, 669),
),
share=Button(
file='./assets/share/base/page/MAIN_GO_TO_GACHA.png',
area=(900, 623, 924, 670),
search=(880, 603, 944, 690),
color=(157, 219, 241),
button=(900, 623, 924, 670),
area=(871, 655, 896, 674),
search=(851, 635, 916, 694),
color=(139, 221, 249),
button=(871, 655, 896, 674),
),
)
MAIN_GO_TO_MAIL = ButtonWrapper(
name='MAIN_GO_TO_MAIL',
jp=Button(
file='./assets/jp/base/page/MAIN_GO_TO_MAIL.png',
share=Button(
file='./assets/share/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',
jp=Button(
file='./assets/jp/base/page/MAIN_GO_TO_MOMOTALK.png',
share=Button(
file='./assets/share/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',
jp=Button(
file='./assets/jp/base/page/MAIN_GO_TO_PURCHASE.png',
share=Button(
file='./assets/share/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=(198, 634, 217, 667),
search=(178, 614, 237, 687),
color=(176, 222, 243),
button=(198, 634, 217, 667),
area=(197, 637, 216, 668),
search=(177, 617, 236, 688),
color=(181, 224, 241),
button=(197, 637, 216, 668),
),
share=Button(
file='./assets/share/base/page/MAIN_GO_TO_SCHEDULE.png',
area=(194, 638, 216, 672),
search=(174, 618, 236, 692),
color=(149, 194, 222),
button=(194, 638, 216, 672),
area=(196, 650, 225, 670),
search=(176, 630, 245, 690),
color=(196, 228, 242),
button=(196, 650, 225, 670),
),
)
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),
area=(753, 632, 787, 668),
search=(733, 612, 807, 688),
color=(167, 220, 247),
button=(753, 632, 787, 668),
),
share=Button(
file='./assets/share/base/page/MAIN_GO_TO_SHOP.png',
area=(773, 630, 816, 667),
search=(753, 610, 836, 687),
color=(146, 208, 235),
button=(773, 630, 816, 667),
area=(750, 633, 788, 666),
search=(730, 613, 808, 686),
color=(168, 220, 246),
button=(750, 633, 788, 666),
),
)
MAIN_GO_TO_TASK = ButtonWrapper(
@@ -420,10 +392,10 @@ MAIN_GO_TO_TASK = ButtonWrapper(
),
share=Button(
file='./assets/share/base/page/MAIN_GO_TO_TASK.png',
area=(47, 219, 70, 246),
search=(27, 199, 90, 266),
color=(212, 204, 208),
button=(47, 219, 70, 246),
area=(37, 216, 60, 247),
search=(17, 196, 80, 267),
color=(195, 225, 248),
button=(37, 216, 60, 247),
),
)
MAIN_GO_TO_WORK = ButtonWrapper(
@@ -437,17 +409,17 @@ MAIN_GO_TO_WORK = ButtonWrapper(
),
en=Button(
file='./assets/en/base/page/MAIN_GO_TO_WORK.png',
area=(1143, 591, 1241, 613),
search=(1123, 571, 1261, 633),
color=(110, 129, 154),
button=(1143, 591, 1241, 613),
area=(1155, 669, 1250, 690),
search=(1135, 649, 1270, 710),
color=(116, 136, 159),
button=(1155, 669, 1250, 690),
),
zht=Button(
file='./assets/zht/base/page/MAIN_GO_TO_WORK.png',
area=(1188, 586, 1241, 613),
search=(1168, 566, 1261, 633),
color=(141, 155, 174),
button=(1188, 586, 1241, 613),
area=(1182, 667, 1222, 687),
search=(1162, 647, 1242, 707),
color=(148, 162, 179),
button=(1182, 667, 1222, 687),
),
)
MISSION_CHECK = ButtonWrapper(
@@ -476,13 +448,6 @@ 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),
@@ -680,17 +645,17 @@ WORK_GO_TO_BOUNTY = ButtonWrapper(
),
en=Button(
file='./assets/en/base/page/WORK_GO_TO_BOUNTY.png',
area=(668, 385, 756, 412),
search=(648, 365, 776, 432),
color=(180, 198, 223),
button=(668, 385, 756, 412),
area=(679, 402, 736, 421),
search=(659, 382, 756, 441),
color=(188, 196, 211),
button=(679, 402, 736, 421),
),
zht=Button(
file='./assets/zht/base/page/WORK_GO_TO_BOUNTY.png',
area=(667, 383, 769, 410),
search=(647, 363, 789, 430),
color=(169, 184, 209),
button=(667, 383, 769, 410),
area=(678, 400, 745, 418),
search=(658, 380, 765, 438),
color=(163, 172, 192),
button=(678, 400, 745, 418),
),
)
WORK_GO_TO_COMMISSIONS = ButtonWrapper(
@@ -704,17 +669,17 @@ WORK_GO_TO_COMMISSIONS = ButtonWrapper(
),
en=Button(
file='./assets/en/base/page/WORK_GO_TO_COMMISSIONS.png',
area=(653, 477, 787, 496),
search=(633, 457, 807, 516),
color=(187, 199, 218),
button=(653, 477, 787, 496),
area=(661, 504, 762, 520),
search=(641, 484, 782, 540),
color=(169, 178, 195),
button=(661, 504, 762, 520),
),
zht=Button(
file='./assets/zht/base/page/WORK_GO_TO_COMMISSIONS.png',
area=(654, 474, 753, 503),
search=(634, 454, 773, 523),
color=(179, 192, 213),
button=(654, 474, 753, 503),
area=(661, 502, 727, 521),
search=(641, 482, 747, 541),
color=(166, 174, 192),
button=(661, 502, 727, 521),
),
)
WORK_GO_TO_EVENT = ButtonWrapper(
@@ -745,24 +710,24 @@ WORK_GO_TO_MISSION = ButtonWrapper(
name='WORK_GO_TO_MISSION',
jp=Button(
file='./assets/jp/base/page/WORK_GO_TO_MISSION.png',
area=(710, 220, 769, 249),
search=(690, 200, 789, 269),
color=(137, 153, 180),
button=(710, 220, 769, 249),
area=(703, 231, 742, 252),
search=(683, 211, 762, 272),
color=(144, 158, 184),
button=(703, 231, 742, 252),
),
en=Button(
file='./assets/en/base/page/WORK_GO_TO_MISSION.png',
area=(721, 158, 873, 197),
search=(701, 138, 893, 217),
color=(180, 195, 215),
button=(721, 158, 873, 197),
area=(712, 221, 819, 247),
search=(692, 201, 839, 267),
color=(140, 162, 190),
button=(712, 221, 819, 247),
),
zht=Button(
file='./assets/zht/base/page/WORK_GO_TO_MISSION.png',
area=(720, 152, 812, 200),
search=(700, 132, 832, 220),
color=(181, 195, 215),
button=(720, 152, 812, 200),
area=(709, 218, 773, 250),
search=(689, 198, 793, 270),
color=(147, 163, 189),
button=(709, 218, 773, 250),
),
)
WORK_GO_TO_SCHOOL_EXCHANGE = ButtonWrapper(
@@ -776,41 +741,41 @@ WORK_GO_TO_SCHOOL_EXCHANGE = ButtonWrapper(
),
en=Button(
file='./assets/en/base/page/WORK_GO_TO_SCHOOL_EXCHANGE.png',
area=(635, 569, 769, 597),
search=(615, 549, 789, 617),
color=(198, 204, 216),
button=(635, 569, 769, 597),
area=(642, 607, 729, 627),
search=(622, 587, 749, 647),
color=(196, 200, 211),
button=(642, 607, 729, 627),
),
zht=Button(
file='./assets/zht/base/page/WORK_GO_TO_SCHOOL_EXCHANGE.png',
area=(635, 567, 761, 594),
search=(615, 547, 781, 614),
color=(181, 191, 209),
button=(635, 567, 761, 594),
area=(642, 606, 725, 624),
search=(622, 586, 745, 644),
color=(172, 177, 194),
button=(642, 606, 725, 624),
),
)
WORK_GO_TO_STORY = ButtonWrapper(
name='WORK_GO_TO_STORY',
jp=Button(
file='./assets/jp/base/page/WORK_GO_TO_STORY.png',
area=(993, 220, 1081, 250),
search=(973, 200, 1101, 270),
color=(209, 214, 224),
button=(993, 220, 1081, 250),
area=(1074, 232, 1169, 251),
search=(1054, 212, 1189, 271),
color=(202, 207, 220),
button=(1074, 232, 1169, 251),
),
en=Button(
file='./assets/en/base/page/WORK_GO_TO_STORY.png',
area=(996, 159, 1112, 205),
search=(976, 139, 1132, 225),
color=(200, 209, 225),
button=(996, 159, 1112, 205),
area=(992, 221, 1075, 255),
search=(972, 201, 1095, 275),
color=(192, 198, 213),
button=(992, 221, 1075, 255),
),
zht=Button(
file='./assets/zht/base/page/WORK_GO_TO_STORY.png',
area=(991, 152, 1093, 202),
search=(971, 132, 1113, 222),
color=(190, 200, 218),
button=(991, 152, 1093, 202),
area=(993, 217, 1056, 250),
search=(973, 197, 1076, 270),
color=(155, 164, 187),
button=(993, 217, 1056, 250),
),
)
WORK_GO_TO_TACTICAL_CHALLENGE = ButtonWrapper(
@@ -824,16 +789,16 @@ WORK_GO_TO_TACTICAL_CHALLENGE = ButtonWrapper(
),
en=Button(
file='./assets/en/base/page/WORK_GO_TO_TACTICAL_CHALLENGE.png',
area=(803, 566, 922, 623),
search=(783, 546, 942, 643),
color=(186, 201, 220),
button=(803, 566, 922, 623),
area=(818, 608, 923, 623),
search=(798, 588, 943, 643),
color=(198, 202, 215),
button=(818, 608, 923, 623),
),
zht=Button(
file='./assets/zht/base/page/WORK_GO_TO_TACTICAL_CHALLENGE.png',
area=(801, 564, 908, 595),
search=(781, 544, 928, 615),
color=(179, 192, 213),
button=(801, 564, 908, 595),
area=(819, 603, 895, 624),
search=(799, 583, 915, 644),
color=(169, 176, 194),
button=(819, 603, 895, 624),
),
)
+1 -1
View File
@@ -69,7 +69,7 @@ class Page:
# Main Page
page_main = Page(MAIN_GO_TO_PURCHASE)
page_main = Page(MAIN_GO_TO_TASK)
# Cafe
page_cafe = Page(CAFE_CHECK)
+6
View File
@@ -450,6 +450,11 @@ 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()
@@ -464,3 +469,4 @@ class UI(MainPage):
raise RequestHumanTakeover
while not wait.reached():
pass
+4 -18
View File
@@ -5,35 +5,21 @@ from module.base.button import Button, ButtonWrapper
OCR_AP = ButtonWrapper(
name='OCR_AP',
jp=Button(
file='./assets/jp/item/data/OCR_AP.png',
share=Button(
file='./assets/share/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',
jp=Button(
file='./assets/jp/item/data/OCR_DATA.png',
share=Button(
file='./assets/share/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),
),
)
+31 -31
View File
@@ -103,24 +103,24 @@ CONFIRM_SORT = ButtonWrapper(
name='CONFIRM_SORT',
jp=Button(
file='./assets/jp/momotalk/CONFIRM_SORT.png',
area=(243, 403, 656, 440),
search=(223, 383, 676, 460),
area=(239, 457, 658, 495),
search=(219, 437, 678, 515),
color=(252, 253, 253),
button=(243, 403, 656, 440),
button=(239, 457, 658, 495),
),
en=Button(
file='./assets/en/momotalk/CONFIRM_SORT.png',
area=(239, 407, 657, 439),
search=(219, 387, 677, 459),
color=(248, 249, 249),
button=(239, 407, 657, 439),
area=(239, 456, 658, 496),
search=(219, 436, 678, 516),
color=(249, 250, 250),
button=(239, 456, 658, 496),
),
zht=Button(
file='./assets/zht/momotalk/CONFIRM_SORT.png',
area=(240, 401, 656, 440),
search=(220, 381, 676, 460),
color=(249, 250, 250),
button=(240, 401, 656, 440),
area=(241, 457, 656, 495),
search=(221, 437, 676, 515),
color=(250, 251, 251),
button=(241, 457, 656, 495),
),
)
FIRST_UNREAD = ButtonWrapper(
@@ -175,24 +175,24 @@ NOTIFICATION_BADGE = ButtonWrapper(
name='NOTIFICATION_BADGE',
jp=Button(
file='./assets/jp/momotalk/NOTIFICATION_BADGE.png',
area=(163, 107, 196, 129),
search=(143, 87, 216, 149),
color=(240, 110, 65),
button=(163, 107, 196, 129),
area=(139, 100, 158, 116),
search=(119, 80, 178, 136),
color=(245, 126, 85),
button=(139, 100, 158, 116),
),
en=Button(
file='./assets/en/momotalk/NOTIFICATION_BADGE.png',
area=(171, 109, 200, 128),
search=(151, 89, 220, 148),
color=(242, 101, 47),
button=(171, 109, 200, 128),
area=(153, 106, 179, 125),
search=(133, 86, 199, 145),
color=(244, 115, 68),
button=(153, 106, 179, 125),
),
zht=Button(
file='./assets/zht/momotalk/NOTIFICATION_BADGE.png',
area=(171, 109, 200, 128),
search=(151, 89, 220, 148),
color=(242, 101, 47),
button=(171, 109, 200, 128),
area=(153, 106, 179, 125),
search=(133, 86, 199, 145),
color=(244, 115, 68),
button=(153, 106, 179, 125),
),
)
REPLY = ButtonWrapper(
@@ -367,10 +367,10 @@ SWITCH_MESSAGE_CHECK = ButtonWrapper(
name='SWITCH_MESSAGE_CHECK',
jp=Button(
file='./assets/jp/momotalk/SWITCH_MESSAGE_CHECK.png',
area=(231, 167, 379, 190),
search=(211, 147, 399, 210),
color=(197, 201, 202),
button=(231, 167, 379, 190),
area=(232, 170, 356, 189),
search=(212, 150, 376, 209),
color=(195, 199, 201),
button=(232, 170, 356, 189),
),
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=(454, 158, 570, 194),
search=(434, 138, 590, 214),
color=(242, 243, 243),
button=(454, 158, 570, 194),
area=(475, 158, 590, 197),
search=(455, 138, 610, 217),
color=(242, 243, 244),
button=(475, 158, 590, 197),
),
en=Button(
file='./assets/en/momotalk/UNREAD.png',
+1 -1
View File
@@ -99,7 +99,7 @@ class MomoTalkUI(UI):
If yes, open it otherwise it means no student available for interaction.
"""
self.ui_ensure(page_main)
if self.match_color(NOTIFICATION_BADGE, threshold=80):
if self.match_color(NOTIFICATION_BADGE, threshold=120):
self.ui_ensure(page_momo_talk)
while SWITCH_SIDEBAR.get(self) != "message":
SWITCH_SIDEBAR.set("message", self)