mirror of
https://github.com/TheFunny/ArisuAutoSweeper
synced 2025-12-18 15:15:32 +00:00
feat: added assets event
This commit is contained in:
parent
2f3a357ff7
commit
85c6c5c127
BIN
assets/en/base/page/EVENT_CHECK.png
Normal file
BIN
assets/en/base/page/EVENT_CHECK.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.5 KiB |
BIN
assets/en/base/page/WORK_GO_TO_EVENT.png
Normal file
BIN
assets/en/base/page/WORK_GO_TO_EVENT.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 18 KiB |
BIN
assets/en/mission/QUEST_OFF.png
Normal file
BIN
assets/en/mission/QUEST_OFF.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.1 KiB |
BIN
assets/en/mission/QUEST_ON.png
Normal file
BIN
assets/en/mission/QUEST_ON.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.9 KiB |
@ -115,6 +115,17 @@ CRAFTING_CHECK = ButtonWrapper(
|
|||||||
button=(103, 4, 226, 41),
|
button=(103, 4, 226, 41),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
EVENT_CHECK = ButtonWrapper(
|
||||||
|
name='EVENT_CHECK',
|
||||||
|
jp=None,
|
||||||
|
en=Button(
|
||||||
|
file='./assets/en/base/page/EVENT_CHECK.png',
|
||||||
|
area=(102, 6, 187, 40),
|
||||||
|
search=(82, 0, 207, 60),
|
||||||
|
color=(200, 209, 216),
|
||||||
|
button=(102, 6, 187, 40),
|
||||||
|
),
|
||||||
|
)
|
||||||
GACHA_CHECK = ButtonWrapper(
|
GACHA_CHECK = ButtonWrapper(
|
||||||
name='GACHA_CHECK',
|
name='GACHA_CHECK',
|
||||||
jp=Button(
|
jp=Button(
|
||||||
@ -476,6 +487,17 @@ WORK_GO_TO_COMMISSIONS = ButtonWrapper(
|
|||||||
button=(656, 494, 803, 517),
|
button=(656, 494, 803, 517),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
WORK_GO_TO_EVENT = ButtonWrapper(
|
||||||
|
name='WORK_GO_TO_EVENT',
|
||||||
|
jp=None,
|
||||||
|
en=Button(
|
||||||
|
file='./assets/en/base/page/WORK_GO_TO_EVENT.png',
|
||||||
|
area=(67, 131, 142, 201),
|
||||||
|
search=(47, 111, 162, 221),
|
||||||
|
color=(134, 153, 166),
|
||||||
|
button=(67, 131, 142, 201),
|
||||||
|
),
|
||||||
|
)
|
||||||
WORK_GO_TO_MISSION = ButtonWrapper(
|
WORK_GO_TO_MISSION = ButtonWrapper(
|
||||||
name='WORK_GO_TO_MISSION',
|
name='WORK_GO_TO_MISSION',
|
||||||
jp=Button(
|
jp=Button(
|
||||||
|
|||||||
@ -113,6 +113,28 @@ OCR_AREA = ButtonWrapper(
|
|||||||
button=(108, 176, 176, 219),
|
button=(108, 176, 176, 219),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
QUEST_OFF = ButtonWrapper(
|
||||||
|
name='QUEST_OFF',
|
||||||
|
jp=None,
|
||||||
|
en=Button(
|
||||||
|
file='./assets/en/mission/QUEST_OFF.png',
|
||||||
|
area=(859, 69, 1025, 125),
|
||||||
|
search=(839, 49, 1045, 145),
|
||||||
|
color=(231, 235, 235),
|
||||||
|
button=(859, 69, 1025, 125),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
QUEST_ON = ButtonWrapper(
|
||||||
|
name='QUEST_ON',
|
||||||
|
jp=None,
|
||||||
|
en=Button(
|
||||||
|
file='./assets/en/mission/QUEST_ON.png',
|
||||||
|
area=(861, 71, 1025, 124),
|
||||||
|
search=(841, 51, 1045, 144),
|
||||||
|
color=(49, 68, 76),
|
||||||
|
button=(861, 71, 1025, 124),
|
||||||
|
),
|
||||||
|
)
|
||||||
RIGHT = ButtonWrapper(
|
RIGHT = ButtonWrapper(
|
||||||
name='RIGHT',
|
name='RIGHT',
|
||||||
jp=None,
|
jp=None,
|
||||||
|
|||||||
@ -125,9 +125,7 @@ class Mission(MissionUI, CommissionsUI):
|
|||||||
elif self.current_mode in ["BD", "IR"]:
|
elif self.current_mode in ["BD", "IR"]:
|
||||||
return self.select_commission(self.current_mode)
|
return self.select_commission(self.current_mode)
|
||||||
elif self.current_mode == "E":
|
elif self.current_mode == "E":
|
||||||
#return self.select_mode(SWITCH_QUEST)
|
return self.select_event()
|
||||||
logger.error("Event not yet implemented")
|
|
||||||
return False
|
|
||||||
else:
|
else:
|
||||||
logger.error("Uknown mode")
|
logger.error("Uknown mode")
|
||||||
return False
|
return False
|
||||||
|
|||||||
@ -2,8 +2,8 @@ from module.base.timer import Timer
|
|||||||
from module.logger import logger
|
from module.logger import logger
|
||||||
from module.ui.switch import Switch
|
from module.ui.switch import Switch
|
||||||
from module.ocr.ocr import Digit
|
from module.ocr.ocr import Digit
|
||||||
from tasks.base.assets.assets_base_page import BACK, MISSION_CHECK
|
from tasks.base.assets.assets_base_page import BACK, MISSION_CHECK, EVENT_CHECK
|
||||||
from tasks.base.page import page_mission, page_commissions
|
from tasks.base.page import page_mission, page_commissions #,page_event
|
||||||
from tasks.base.ui import UI
|
from tasks.base.ui import UI
|
||||||
from tasks.mission.assets.assets_mission import *
|
from tasks.mission.assets.assets_mission import *
|
||||||
from tasks.stage.ap import AP
|
from tasks.stage.ap import AP
|
||||||
@ -24,7 +24,9 @@ SWITCH_HARD = Switch("HARD_switch")
|
|||||||
SWITCH_HARD.add_state("on", HARD_ON)
|
SWITCH_HARD.add_state("on", HARD_ON)
|
||||||
SWITCH_HARD.add_state("off", HARD_OFF)
|
SWITCH_HARD.add_state("off", HARD_OFF)
|
||||||
|
|
||||||
SWITCH_QUEST = None
|
SWITCH_QUEST = Switch("QUEST_switch")
|
||||||
|
SWITCH_QUEST.add_state("on",QUEST_ON)
|
||||||
|
SWITCH_QUEST.add_state("off",QUEST_OFF)
|
||||||
|
|
||||||
"""
|
"""
|
||||||
A dictionary that maps the mode to a tuple where
|
A dictionary that maps the mode to a tuple where
|
||||||
@ -36,7 +38,7 @@ MODE_TO_PAGE = {
|
|||||||
"H": (MISSION_CHECK, page_mission),
|
"H": (MISSION_CHECK, page_mission),
|
||||||
"BD": (CHECK_BD, page_commissions),
|
"BD": (CHECK_BD, page_commissions),
|
||||||
"IR": (CHECK_IR, page_commissions),
|
"IR": (CHECK_IR, page_commissions),
|
||||||
"E" : ()
|
"E" : (EVENT_CHECK) #page_event
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -92,6 +94,9 @@ class MissionUI(UI, AP):
|
|||||||
return False
|
return False
|
||||||
switch.set('on', main=self)
|
switch.set('on', main=self)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
def select_event(self):
|
||||||
|
return self.select_mode(SWITCH_QUEST)
|
||||||
|
|
||||||
def enter_stage(self, index: int) -> bool:
|
def enter_stage(self, index: int) -> bool:
|
||||||
if not index:
|
if not index:
|
||||||
@ -143,5 +148,3 @@ class CommissionsUI(UI, AP):
|
|||||||
return True
|
return True
|
||||||
if timer.reached():
|
if timer.reached():
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user