mirror of
https://github.com/TheFunny/ArisuAutoSweeper
synced 2026-10-11 02:32:16 +00:00
Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9633fa64e0
|
||
|
|
ac0c0130f8
|
||
|
|
ecc747ff94
|
||
|
|
f04f38ec07
|
||
|
|
98088eeaf0
|
||
|
|
e1c9c16bcb |
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.2 KiB After Width: | Height: | Size: 4.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 4.6 KiB |
+2
-2
@@ -360,7 +360,7 @@ class Ocr:
|
|||||||
|
|
||||||
|
|
||||||
class Digit(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)
|
super().__init__(button, lang=lang, name=name)
|
||||||
|
|
||||||
def format_result(self, result) -> int:
|
def format_result(self, result) -> int:
|
||||||
@@ -380,7 +380,7 @@ class Digit(Ocr):
|
|||||||
|
|
||||||
|
|
||||||
class DigitCounter(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)
|
super().__init__(button, lang=lang, name=name)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
|||||||
@@ -195,7 +195,6 @@ class Updater(DeployConfig, GitManager, PipManager):
|
|||||||
|
|
||||||
def update(self):
|
def update(self):
|
||||||
logger.hr("Run update")
|
logger.hr("Run update")
|
||||||
self.set_repo()
|
|
||||||
try:
|
try:
|
||||||
self.git_install()
|
self.git_install()
|
||||||
self.pip_install()
|
self.pip_install()
|
||||||
|
|||||||
+1
-1
@@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
# pip-compile --annotation-style=line --output-file=requirements.txt requirements-in.txt
|
# 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
|
adbutils==1.2.9 # via -r requirements-in.txt, uiautomator2
|
||||||
aiofiles==23.1.0 # via -r requirements-in.txt
|
aiofiles==23.1.0 # via -r requirements-in.txt
|
||||||
|
|||||||
@@ -175,24 +175,24 @@ NOTIFICATION_BADGE = ButtonWrapper(
|
|||||||
name='NOTIFICATION_BADGE',
|
name='NOTIFICATION_BADGE',
|
||||||
jp=Button(
|
jp=Button(
|
||||||
file='./assets/jp/momotalk/NOTIFICATION_BADGE.png',
|
file='./assets/jp/momotalk/NOTIFICATION_BADGE.png',
|
||||||
area=(163, 107, 196, 129),
|
area=(139, 100, 158, 116),
|
||||||
search=(143, 87, 216, 149),
|
search=(119, 80, 178, 136),
|
||||||
color=(240, 110, 65),
|
color=(245, 126, 85),
|
||||||
button=(163, 107, 196, 129),
|
button=(139, 100, 158, 116),
|
||||||
),
|
),
|
||||||
en=Button(
|
en=Button(
|
||||||
file='./assets/en/momotalk/NOTIFICATION_BADGE.png',
|
file='./assets/en/momotalk/NOTIFICATION_BADGE.png',
|
||||||
area=(171, 109, 200, 128),
|
area=(153, 106, 179, 125),
|
||||||
search=(151, 89, 220, 148),
|
search=(133, 86, 199, 145),
|
||||||
color=(242, 101, 47),
|
color=(244, 115, 68),
|
||||||
button=(171, 109, 200, 128),
|
button=(153, 106, 179, 125),
|
||||||
),
|
),
|
||||||
zht=Button(
|
zht=Button(
|
||||||
file='./assets/zht/momotalk/NOTIFICATION_BADGE.png',
|
file='./assets/zht/momotalk/NOTIFICATION_BADGE.png',
|
||||||
area=(171, 109, 200, 128),
|
area=(153, 106, 179, 125),
|
||||||
search=(151, 89, 220, 148),
|
search=(133, 86, 199, 145),
|
||||||
color=(242, 101, 47),
|
color=(244, 115, 68),
|
||||||
button=(171, 109, 200, 128),
|
button=(153, 106, 179, 125),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
REPLY = ButtonWrapper(
|
REPLY = ButtonWrapper(
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ class MomoTalkUI(UI):
|
|||||||
If yes, open it otherwise it means no student available for interaction.
|
If yes, open it otherwise it means no student available for interaction.
|
||||||
"""
|
"""
|
||||||
self.ui_ensure(page_main)
|
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)
|
self.ui_ensure(page_momo_talk)
|
||||||
while SWITCH_SIDEBAR.get(self) != "message":
|
while SWITCH_SIDEBAR.get(self) != "message":
|
||||||
SWITCH_SIDEBAR.set("message", self)
|
SWITCH_SIDEBAR.set("message", self)
|
||||||
|
|||||||
Reference in New Issue
Block a user