diff --git a/assets/en/base/page/EVENT_CHECK.png b/assets/en/base/page/EVENT_CHECK.png new file mode 100644 index 0000000..dde3a28 Binary files /dev/null and b/assets/en/base/page/EVENT_CHECK.png differ diff --git a/assets/en/base/page/WORK_GO_TO_EVENT.png b/assets/en/base/page/WORK_GO_TO_EVENT.png new file mode 100644 index 0000000..adb7552 Binary files /dev/null and b/assets/en/base/page/WORK_GO_TO_EVENT.png differ diff --git a/assets/en/mission/QUEST_OFF.png b/assets/en/mission/QUEST_OFF.png new file mode 100644 index 0000000..2461875 Binary files /dev/null and b/assets/en/mission/QUEST_OFF.png differ diff --git a/assets/en/mission/QUEST_ON.png b/assets/en/mission/QUEST_ON.png new file mode 100644 index 0000000..1c45adc Binary files /dev/null and b/assets/en/mission/QUEST_ON.png differ diff --git a/tasks/base/assets/assets_base_page.py b/tasks/base/assets/assets_base_page.py index f24ba41..a3dad32 100644 --- a/tasks/base/assets/assets_base_page.py +++ b/tasks/base/assets/assets_base_page.py @@ -115,6 +115,17 @@ CRAFTING_CHECK = ButtonWrapper( 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( name='GACHA_CHECK', jp=Button( @@ -476,6 +487,17 @@ WORK_GO_TO_COMMISSIONS = ButtonWrapper( 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( name='WORK_GO_TO_MISSION', jp=Button( diff --git a/tasks/mission/assets/assets_mission.py b/tasks/mission/assets/assets_mission.py index 4f591e5..caecaed 100644 --- a/tasks/mission/assets/assets_mission.py +++ b/tasks/mission/assets/assets_mission.py @@ -113,6 +113,28 @@ OCR_AREA = ButtonWrapper( 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( name='RIGHT', jp=None, diff --git a/tasks/mission/mission.py b/tasks/mission/mission.py index 9b6ccc0..5b6d103 100644 --- a/tasks/mission/mission.py +++ b/tasks/mission/mission.py @@ -125,9 +125,7 @@ class Mission(MissionUI, CommissionsUI): elif self.current_mode in ["BD", "IR"]: return self.select_commission(self.current_mode) elif self.current_mode == "E": - #return self.select_mode(SWITCH_QUEST) - logger.error("Event not yet implemented") - return False + return self.select_event() else: logger.error("Uknown mode") return False diff --git a/tasks/mission/ui.py b/tasks/mission/ui.py index 70b5ac1..5c64987 100644 --- a/tasks/mission/ui.py +++ b/tasks/mission/ui.py @@ -2,8 +2,8 @@ from module.base.timer import Timer from module.logger import logger from module.ui.switch import Switch from module.ocr.ocr import Digit -from tasks.base.assets.assets_base_page import BACK, MISSION_CHECK -from tasks.base.page import page_mission, page_commissions +from tasks.base.assets.assets_base_page import BACK, MISSION_CHECK, EVENT_CHECK +from tasks.base.page import page_mission, page_commissions #,page_event from tasks.base.ui import UI from tasks.mission.assets.assets_mission import * 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("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 @@ -36,7 +38,7 @@ MODE_TO_PAGE = { "H": (MISSION_CHECK, page_mission), "BD": (CHECK_BD, page_commissions), "IR": (CHECK_IR, page_commissions), - "E" : () + "E" : (EVENT_CHECK) #page_event } @@ -92,6 +94,9 @@ class MissionUI(UI, AP): return False switch.set('on', main=self) return True + + def select_event(self): + return self.select_mode(SWITCH_QUEST) def enter_stage(self, index: int) -> bool: if not index: @@ -143,5 +148,3 @@ class CommissionsUI(UI, AP): return True if timer.reached(): return False - - \ No newline at end of file