diff --git a/assets/cn/sos/TEMPLATE_SIGNAL_CONFIRM.png b/assets/cn/sos/TEMPLATE_SIGNAL_CONFIRM.png new file mode 100644 index 000000000..384283ff8 Binary files /dev/null and b/assets/cn/sos/TEMPLATE_SIGNAL_CONFIRM.png differ diff --git a/assets/cn/template/TEMPLATE_SIGNAL_GOTO.png b/assets/cn/sos/TEMPLATE_SIGNAL_GOTO.png similarity index 100% rename from assets/cn/template/TEMPLATE_SIGNAL_GOTO.png rename to assets/cn/sos/TEMPLATE_SIGNAL_GOTO.png diff --git a/assets/cn/template/TEMPLATE_SIGNAL_SEARCH.png b/assets/cn/sos/TEMPLATE_SIGNAL_SEARCH.png similarity index 100% rename from assets/cn/template/TEMPLATE_SIGNAL_SEARCH.png rename to assets/cn/sos/TEMPLATE_SIGNAL_SEARCH.png diff --git a/assets/en/sos/TEMPLATE_SIGNAL_CONFIRM.png b/assets/en/sos/TEMPLATE_SIGNAL_CONFIRM.png new file mode 100644 index 000000000..384283ff8 Binary files /dev/null and b/assets/en/sos/TEMPLATE_SIGNAL_CONFIRM.png differ diff --git a/assets/en/template/TEMPLATE_SIGNAL_GOTO.png b/assets/en/sos/TEMPLATE_SIGNAL_GOTO.png similarity index 100% rename from assets/en/template/TEMPLATE_SIGNAL_GOTO.png rename to assets/en/sos/TEMPLATE_SIGNAL_GOTO.png diff --git a/assets/en/template/TEMPLATE_SIGNAL_SEARCH.png b/assets/en/sos/TEMPLATE_SIGNAL_SEARCH.png similarity index 100% rename from assets/en/template/TEMPLATE_SIGNAL_SEARCH.png rename to assets/en/sos/TEMPLATE_SIGNAL_SEARCH.png diff --git a/assets/jp/sos/TEMPLATE_SIGNAL_CONFIRM.png b/assets/jp/sos/TEMPLATE_SIGNAL_CONFIRM.png new file mode 100644 index 000000000..384283ff8 Binary files /dev/null and b/assets/jp/sos/TEMPLATE_SIGNAL_CONFIRM.png differ diff --git a/assets/jp/template/TEMPLATE_SIGNAL_GOTO.png b/assets/jp/sos/TEMPLATE_SIGNAL_GOTO.png similarity index 100% rename from assets/jp/template/TEMPLATE_SIGNAL_GOTO.png rename to assets/jp/sos/TEMPLATE_SIGNAL_GOTO.png diff --git a/assets/jp/template/TEMPLATE_SIGNAL_SEARCH.png b/assets/jp/sos/TEMPLATE_SIGNAL_SEARCH.png similarity index 100% rename from assets/jp/template/TEMPLATE_SIGNAL_SEARCH.png rename to assets/jp/sos/TEMPLATE_SIGNAL_SEARCH.png diff --git a/assets/tw/sos/TEMPLATE_SIGNAL_CONFIRM.png b/assets/tw/sos/TEMPLATE_SIGNAL_CONFIRM.png new file mode 100644 index 000000000..384283ff8 Binary files /dev/null and b/assets/tw/sos/TEMPLATE_SIGNAL_CONFIRM.png differ diff --git a/assets/tw/template/TEMPLATE_SIGNAL_GOTO.png b/assets/tw/sos/TEMPLATE_SIGNAL_GOTO.png similarity index 100% rename from assets/tw/template/TEMPLATE_SIGNAL_GOTO.png rename to assets/tw/sos/TEMPLATE_SIGNAL_GOTO.png diff --git a/assets/tw/template/TEMPLATE_SIGNAL_SEARCH.png b/assets/tw/sos/TEMPLATE_SIGNAL_SEARCH.png similarity index 100% rename from assets/tw/template/TEMPLATE_SIGNAL_SEARCH.png rename to assets/tw/sos/TEMPLATE_SIGNAL_SEARCH.png diff --git a/module/sos/assets.py b/module/sos/assets.py index 20b4f2963..18fcd5b3f 100644 --- a/module/sos/assets.py +++ b/module/sos/assets.py @@ -9,3 +9,6 @@ SIGNAL_LIST_CHECK = Button(area={'cn': (351, 164, 482, 198), 'en': (352, 159, 52 SIGNAL_SEARCH_CLOSE = Button(area={'cn': (896, 157, 939, 194), 'en': (896, 157, 939, 194), 'jp': (895, 161, 932, 195), 'tw': (896, 157, 939, 194)}, color={'cn': (205, 95, 87), 'en': (205, 95, 87), 'jp': (214, 106, 105), 'tw': (205, 95, 87)}, button={'cn': (896, 157, 939, 194), 'en': (896, 157, 939, 194), 'jp': (895, 161, 932, 195), 'tw': (896, 157, 939, 194)}, file={'cn': './assets/cn/sos/SIGNAL_SEARCH_CLOSE.png', 'en': './assets/en/sos/SIGNAL_SEARCH_CLOSE.png', 'jp': './assets/jp/sos/SIGNAL_SEARCH_CLOSE.png', 'tw': './assets/tw/sos/SIGNAL_SEARCH_CLOSE.png'}) SIGNAL_SEARCH_ENTER = Button(area={'cn': (1175, 499, 1230, 554), 'en': (1175, 499, 1230, 554), 'jp': (1175, 499, 1230, 554), 'tw': (1175, 499, 1230, 554)}, color={'cn': (72, 81, 98), 'en': (72, 81, 98), 'jp': (72, 81, 98), 'tw': (72, 81, 98)}, button={'cn': (1175, 499, 1230, 554), 'en': (1175, 499, 1230, 554), 'jp': (1175, 499, 1230, 554), 'tw': (1175, 499, 1230, 554)}, file={'cn': './assets/cn/sos/SIGNAL_SEARCH_ENTER.png', 'en': './assets/en/sos/SIGNAL_SEARCH_ENTER.png', 'jp': './assets/jp/sos/SIGNAL_SEARCH_ENTER.png', 'tw': './assets/tw/sos/SIGNAL_SEARCH_ENTER.png'}) SOS_SCROLL_AREA = Button(area={'cn': (935, 257, 941, 516), 'en': (935, 257, 941, 516), 'jp': (935, 257, 941, 516), 'tw': (937, 258, 941, 514)}, color={'cn': (120, 133, 146), 'en': (120, 133, 146), 'jp': (120, 133, 146), 'tw': (153, 141, 85)}, button={'cn': (935, 257, 941, 516), 'en': (935, 257, 941, 516), 'jp': (935, 257, 941, 516), 'tw': (937, 258, 941, 514)}, file={'cn': './assets/cn/sos/SOS_SCROLL_AREA.png', 'en': './assets/en/sos/SOS_SCROLL_AREA.png', 'jp': './assets/jp/sos/SOS_SCROLL_AREA.png', 'tw': './assets/tw/sos/SOS_SCROLL_AREA.png'}) +TEMPLATE_SIGNAL_CONFIRM = Template(file={'cn': './assets/cn/sos/TEMPLATE_SIGNAL_CONFIRM.png', 'en': './assets/en/sos/TEMPLATE_SIGNAL_CONFIRM.png', 'jp': './assets/jp/sos/TEMPLATE_SIGNAL_CONFIRM.png', 'tw': './assets/tw/sos/TEMPLATE_SIGNAL_CONFIRM.png'}) +TEMPLATE_SIGNAL_GOTO = Template(file={'cn': './assets/cn/sos/TEMPLATE_SIGNAL_GOTO.png', 'en': './assets/en/sos/TEMPLATE_SIGNAL_GOTO.png', 'jp': './assets/jp/sos/TEMPLATE_SIGNAL_GOTO.png', 'tw': './assets/tw/sos/TEMPLATE_SIGNAL_GOTO.png'}) +TEMPLATE_SIGNAL_SEARCH = Template(file={'cn': './assets/cn/sos/TEMPLATE_SIGNAL_SEARCH.png', 'en': './assets/en/sos/TEMPLATE_SIGNAL_SEARCH.png', 'jp': './assets/jp/sos/TEMPLATE_SIGNAL_SEARCH.png', 'tw': './assets/tw/sos/TEMPLATE_SIGNAL_SEARCH.png'}) diff --git a/module/sos/sos.py b/module/sos/sos.py index 8ec6ba0a7..42f5b0000 100644 --- a/module/sos/sos.py +++ b/module/sos/sos.py @@ -5,7 +5,6 @@ from module.campaign.run import CampaignRun from module.logger import logger from module.ocr.ocr import Digit from module.sos.assets import * -from module.template.assets import * from module.ui.assets import CAMPAIGN_CHECK from module.ui.page import page_campaign from module.ui.scroll import Scroll @@ -173,6 +172,8 @@ class CampaignSos(CampaignRun, CampaignBase): self.device.click(entrance) if TEMPLATE_SIGNAL_GOTO.match(image): self.device.click(entrance) + if TEMPLATE_SIGNAL_CONFIRM.match(image): + self.device.click(entrance) # End if self.appear(CAMPAIGN_CHECK, offset=(20, 20)): diff --git a/module/template/assets.py b/module/template/assets.py index 727f16de6..fe41afca0 100644 --- a/module/template/assets.py +++ b/module/template/assets.py @@ -35,8 +35,6 @@ TEMPLATE_OPERATIONS_RED_DOT = Template(file={'cn': './assets/cn/template/TEMPLAT TEMPLATE_OS_AllyCargo = Template(file={'cn': './assets/cn/template/TEMPLATE_OS_AllyCargo.png', 'en': './assets/en/template/TEMPLATE_OS_AllyCargo.png', 'jp': './assets/jp/template/TEMPLATE_OS_AllyCargo.png', 'tw': './assets/tw/template/TEMPLATE_OS_AllyCargo.png'}) TEMPLATE_OS_Meowfficer = Template(file={'cn': './assets/cn/template/TEMPLATE_OS_Meowfficer.gif', 'en': './assets/en/template/TEMPLATE_OS_Meowfficer.gif', 'jp': './assets/jp/template/TEMPLATE_OS_Meowfficer.gif', 'tw': './assets/tw/template/TEMPLATE_OS_Meowfficer.gif'}) TEMPLATE_OS_Resource = Template(file={'cn': './assets/cn/template/TEMPLATE_OS_Resource.png', 'en': './assets/en/template/TEMPLATE_OS_Resource.png', 'jp': './assets/jp/template/TEMPLATE_OS_Resource.png', 'tw': './assets/tw/template/TEMPLATE_OS_Resource.png'}) -TEMPLATE_SIGNAL_GOTO = Template(file={'cn': './assets/cn/template/TEMPLATE_SIGNAL_GOTO.png', 'en': './assets/en/template/TEMPLATE_SIGNAL_GOTO.png', 'jp': './assets/jp/template/TEMPLATE_SIGNAL_GOTO.png', 'tw': './assets/tw/template/TEMPLATE_SIGNAL_GOTO.png'}) -TEMPLATE_SIGNAL_SEARCH = Template(file={'cn': './assets/cn/template/TEMPLATE_SIGNAL_SEARCH.png', 'en': './assets/en/template/TEMPLATE_SIGNAL_SEARCH.png', 'jp': './assets/jp/template/TEMPLATE_SIGNAL_SEARCH.png', 'tw': './assets/tw/template/TEMPLATE_SIGNAL_SEARCH.png'}) TEMPLATE_SIREN_Akagi = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Akagi.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Akagi.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Akagi.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Akagi.gif'}) TEMPLATE_SIREN_Akashi = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Akashi.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Akashi.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Akashi.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Akashi.gif'}) TEMPLATE_SIREN_AlbacoreIdol = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_AlbacoreIdol.gif', 'en': './assets/en/template/TEMPLATE_SIREN_AlbacoreIdol.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_AlbacoreIdol.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_AlbacoreIdol.gif'})