1
0
mirror of https://github.com/TheFunny/ArisuAutoSweeper synced 2025-12-17 00:15:13 +00:00

refactor(stage): reuse assets for all stages

This commit is contained in:
YoursFunny 2023-11-16 18:56:18 +08:00
parent 04fab819b4
commit 1a66e767f3
Signed by: YoursFunny
GPG Key ID: 207EDC3CD5B40F9C
6 changed files with 59 additions and 9 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 129 KiB

View File

@ -0,0 +1,49 @@
from module.base.button import Button, ButtonWrapper
# This file was auto-generated, do not modify it manually. To generate:
# ``` python -m dev_tools.button_extract ```
OCR_INDEX = ButtonWrapper(
name='OCR_INDEX',
jp=Button(
file='./assets/jp/stage/list/OCR_INDEX.png',
area=(701, 149, 740, 656),
search=(681, 129, 760, 676),
color=(195, 196, 193),
button=(701, 149, 740, 656),
),
en=None,
)
STAGE_ENTER = ButtonWrapper(
name='STAGE_ENTER',
jp=Button(
file='./assets/jp/stage/list/STAGE_ENTER.png',
area=(1093, 173, 1142, 199),
search=(1073, 153, 1162, 219),
color=(106, 171, 200),
button=(1093, 173, 1142, 199),
),
en=None,
)
STAGE_ITEM = ButtonWrapper(
name='STAGE_ITEM',
jp=Button(
file='./assets/jp/stage/list/STAGE_ITEM.png',
area=(687, 148, 1181, 227),
search=(667, 128, 1201, 247),
color=(212, 228, 233),
button=(687, 148, 1181, 227),
),
en=None,
)
STAGE_LIST = ButtonWrapper(
name='STAGE_LIST',
jp=Button(
file='./assets/jp/stage/list/STAGE_LIST.png',
area=(675, 136, 1190, 676),
search=(655, 116, 1210, 696),
color=(194, 204, 209),
button=(675, 136, 1190, 676),
),
en=None,
)

View File

@ -2,11 +2,12 @@ import cv2
import numpy as np import numpy as np
from module.base.base import ModuleBase from module.base.base import ModuleBase
from module.base.button import ButtonWrapper, ClickButton from module.base.button import ClickButton
from module.base.timer import Timer from module.base.timer import Timer
from module.base.utils import area_pad, area_size, area_offset, random_rectangle_vector_opted from module.base.utils import area_pad, area_size, area_offset, random_rectangle_vector_opted
from module.logger import logger from module.logger import logger
from module.ocr.ocr import Ocr from module.ocr.ocr import Ocr
from tasks.stage.assets.assets_stage_list import *
class StageList: class StageList:
@ -15,17 +16,17 @@ class StageList:
def __init__( def __init__(
self, self,
name, name,
area_stage: ButtonWrapper, button_list: ButtonWrapper = None,
area_index: ButtonWrapper, button_index: ButtonWrapper = None,
area_item: ButtonWrapper, button_item: ButtonWrapper = None,
button_enter: ButtonWrapper, button_enter: ButtonWrapper = None,
drag_direction: str = "down" drag_direction: str = "down"
): ):
self.name = name self.name = name
self.stage = area_stage self.stage = button_list if button_list else STAGE_LIST
self.index_ocr = Ocr(area_index, lang='en') self.index_ocr = Ocr(button_index if button_index else OCR_INDEX, lang='en')
self.stage_item = area_item.button self.stage_item = (button_item if button_item else STAGE_ITEM).button
self.enter = button_enter self.enter = button_enter if button_enter else STAGE_ENTER
self.drag_direction = drag_direction self.drag_direction = drag_direction
self.current_index_min = 1 self.current_index_min = 1