sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-20 07:14:59 +08:00
Code Activity

Fix: [CN] Skip user agreement

Browse Source
This commit is contained in:
LmeSzinc
2026-04-17 23:59:02 +08:00
parent ba568b50c0
commit d1e3653c4a
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
module/handler/login.py
View File

@@ -8,7 +8,7 @@ from uiautomator2.xpath import XPath, XPathSelector
import module.config.server as server import module.config.server as server
from module.base.timer import Timer from module.base.timer import Timer
from module.base.utils import color_similarity_2d, crop, random_rectangle_point from module.base.utils import color_similarity_2d, crop
from module.handler.assets import * from module.handler.assets import *
from module.logger import logger from module.logger import logger
from module.map.assets import * from module.map.assets import *
@@ -106,26 +106,29 @@ class LoginHandler(UI):
if not self._user_agreement_timer.reached(): if not self._user_agreement_timer.reached():
return False return False
confirm = self.image_color_button( right = self.image_color_button(
area=(640, 360, 1280, 720), color=(78, 189, 234), area=(640, 360, 1280, 720), color=(78, 189, 234),
color_threshold=245, encourage=25, name='AGREEMENT_CONFIRM') color_threshold=245, encourage=25, name='AGREEMENT_CONFIRM')
if confirm is None: if right is None:
return False return False
scroll = self.image_color_button( # 2026.04.17 No scroll anymore, just bare swipe before clicking confirm
area=(640, 0, 1280, 720), color=(182, 189, 202), # if having blue button at right half of screen, but missing in left, it's a confirm button
color_threshold=245, encourage=5, name='AGREEMENT_SCROLL' # if having both, it's a blue button at middle confirming login
) left = self.image_color_button(
if scroll is not None: area=(0, 360, 640, 720), color=(78, 189, 234),
color_threshold=245, encourage=25, name='AGREEMENT_CONFIRM')
if left is None:
# User agreement # User agreement
p1 = random_rectangle_point(scroll.button) # just somewhere at the middle
p2 = random_rectangle_point(scroll.move((0, 350)).button) box = (350, 230, 920, 430)
self.device.swipe(p1, p2, name='AGREEMENT_SCROLL') self.device.swipe_vector((0, -150), box, name='AGREEMENT_SCROLL')
self.device.click(confirm) self.device.swipe_vector((0, -150), box, name='AGREEMENT_SCROLL')
self.device.click(right)
self._user_agreement_timer.reset() self._user_agreement_timer.reset()
return True return True
else: else:
# User login # User login
self.device.click(confirm) self.device.click(right)
self._user_agreement_timer.reset() self._user_agreement_timer.reset()
return True return True