sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 17:29:04 +08:00
Code

Fix: use appear_on for ROLE_SELECT_ENTER

Browse Source
This commit is contained in:
sui-feng-cb 2026-01-19 02:21:21 +08:00
parent 137b222e19
commit d1e163baa0
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
module/base/button.py
View File

@ -319,6 +319,7 @@ class Button(Resource):
res = cv2.matchTemplate(self.image_luma, image_luma, cv2.TM_CCOEFF_NORMED)
_, sim, _, point = cv2.minMaxLoc(res)
self._button_offset = area_offset(self._button, offset[:2] + np.array(point))
print(sim, similarity)
return sim > similarity
def match_template_color(self, image, offset=(20, 20), similarity=0.85, threshold=30):

2
module/island/island.py
View File

@ -5,7 +5,7 @@ from module.island.project_data import *
from module.island.project import IslandProjectRun
from module.island.transport import IslandTransportRun
from module.logger import logger
from module.ui.page import page_dormmenu, page_island, page_island_phone, page_main
from module.ui.page import page_island_phone, page_main
class Island(IslandProjectRun, IslandTransportRun):

10
module/island/project.py
View File

@ -5,6 +5,7 @@ import numpy as np
from scipy import signal
import module.config.server as server
from module.base.button import Button, ButtonGrid
from module.base.timer import Timer
from module.base.utils import color_similarity_2d, crop, random_rectangle_vector, rgb2gray
@ -16,6 +17,7 @@ from module.logger import logger
from module.map.map_grids import SelectedGrids
from module.ocr.ocr import Duration, Ocr
class ProjectNameOcr(Ocr):
def after_process(self, result):
result = super().after_process(result)
@ -69,9 +71,9 @@ class IslandProject:
return
# name
dx = {'cn':326, 'en':137}[server.server]
dy = {'cn':0, 'en':2}[server.server]
area = (self.x1 - 446, self.y1, self.x1 - dx, self.y2+dy)
dx = {'cn': 326, 'en': 137}[server.server]
dy = {'cn': 0, 'en': 2}[server.server]
area = (self.x1 - 446, self.y1, self.x1 - dx, self.y2 + dy)
button = Button(area=area, color=(), button=area, name='PROJECT_NAME')
ocr = ProjectNameOcr(button, lang='cnocr')
self.name = ocr.ocr(self.image)
@ -372,7 +374,7 @@ class IslandProjectRun(IslandUI):
click_timer.reset()
continue
if enter and self.appear_then_click(ROLE_SELECT_ENTER, offset=(5, 5), interval=2):
if enter and self.appear_then_click(ROLE_SELECT_ENTER, threshold=10, interval=2):
success = True
self.interval_clear(GET_ITEMS_ISLAND)
click_timer.reset()