From 89aa1ad7dcbd306fae8227443bb9f1a3095eb5f6 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Sat, 20 Apr 2024 01:15:29 +0800 Subject: [PATCH] Fix: W15 optimizations - Upd: [CN] MOB_MOVE_CANCEL - Opt: MAP_SWIPE_MULTIPLY - Fix: 15-1 did not inherit ConfigBase --- assets/cn/handler/MOB_MOVE_CANCEL.png | Bin 8341 -> 8298 bytes campaign/campaign_main/campaign_15_1.py | 2 +- campaign/campaign_main/campaign_15_4.py | 4 ++++ campaign/campaign_main/campaign_15_base.py | 3 +++ module/handler/assets.py | 10 +++++----- module/handler/fast_forward.py | 1 + module/handler/strategy.py | 19 +++++++++---------- 7 files changed, 23 insertions(+), 16 deletions(-) diff --git a/assets/cn/handler/MOB_MOVE_CANCEL.png b/assets/cn/handler/MOB_MOVE_CANCEL.png index 1e4ad2b82fa073101bd224685c4dd692ec6dd8a8..3692eb2161eb0dc5a3596aabb3b1aa4679632d74 100644 GIT binary patch delta 5754 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 literal 8341 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 diff --git a/campaign/campaign_main/campaign_15_1.py b/campaign/campaign_main/campaign_15_1.py index c49cff679..8e9f7f093 100644 --- a/campaign/campaign_main/campaign_15_1.py +++ b/campaign/campaign_main/campaign_15_1.py @@ -47,7 +47,7 @@ A7, B7, C7, D7, E7, F7, G7, H7, \ = MAP.flatten() -class Config: +class Config(ConfigBase): # ===== Start of generated config ===== # MAP_SIREN_TEMPLATE = ['0'] # MOVABLE_ENEMY_TURN = (2,) diff --git a/campaign/campaign_main/campaign_15_4.py b/campaign/campaign_main/campaign_15_4.py index 6c8ec540a..5899c328c 100644 --- a/campaign/campaign_main/campaign_15_4.py +++ b/campaign/campaign_main/campaign_15_4.py @@ -67,6 +67,10 @@ class Config(ConfigBase): # MAP_HAS_MYSTERY = True # ===== End of generated config ===== + MAP_SWIPE_MULTIPLY = (1.055, 1.075) + MAP_SWIPE_MULTIPLY_MINITOUCH = (1.020, 1.039) + MAP_SWIPE_MULTIPLY_MAATOUCH = (0.990, 1.008) + class Campaign(CampaignBase): MAP = MAP diff --git a/campaign/campaign_main/campaign_15_base.py b/campaign/campaign_main/campaign_15_base.py index 4d42bc07c..c9350b4b6 100644 --- a/campaign/campaign_main/campaign_15_base.py +++ b/campaign/campaign_main/campaign_15_base.py @@ -22,6 +22,9 @@ class Config: 'prominence': 10, 'distance': 35, } + MAP_SWIPE_MULTIPLY = (0.993, 1.011) + MAP_SWIPE_MULTIPLY_MINITOUCH = (0.960, 0.978) + MAP_SWIPE_MULTIPLY_MAATOUCH = (0.932, 0.949) class CampaignBase(CampaignBase_): diff --git a/module/handler/assets.py b/module/handler/assets.py index 7b371aa14..9d4e65d07 100644 --- a/module/handler/assets.py +++ b/module/handler/assets.py @@ -38,13 +38,13 @@ GET_MISSION = Button(area={'cn': (604, 495, 676, 525), 'en': (579, 496, 700, 520 GET_SKIN = Button(area={'cn': (990, 550, 1022, 565), 'en': (991, 553, 1055, 564), 'jp': (990, 550, 1022, 565), 'tw': (990, 550, 1022, 565)}, color={'cn': (113, 114, 124), 'en': (142, 142, 152), 'jp': (113, 114, 124), 'tw': (113, 114, 124)}, button={'cn': (990, 550, 1022, 565), 'en': (991, 553, 1055, 564), 'jp': (990, 550, 1022, 565), 'tw': (990, 550, 1022, 565)}, file={'cn': './assets/cn/handler/GET_SKIN.png', 'en': './assets/en/handler/GET_SKIN.png', 'jp': './assets/cn/handler/GET_SKIN.png', 'tw': './assets/cn/handler/GET_SKIN.png'}) GUILD_POPUP_CANCEL = Button(area={'cn': (422, 449, 623, 486), 'en': (425, 452, 620, 483), 'jp': (422, 449, 623, 486), 'tw': (422, 449, 623, 486)}, color={'cn': (127, 125, 127), 'en': (125, 123, 125), 'jp': (119, 117, 119), 'tw': (127, 125, 127)}, button={'cn': (422, 449, 623, 486), 'en': (425, 452, 620, 483), 'jp': (422, 449, 623, 486), 'tw': (422, 449, 623, 486)}, file={'cn': './assets/cn/handler/GUILD_POPUP_CANCEL.png', 'en': './assets/en/handler/GUILD_POPUP_CANCEL.png', 'jp': './assets/jp/handler/GUILD_POPUP_CANCEL.png', 'tw': './assets/tw/handler/GUILD_POPUP_CANCEL.png'}) GUILD_POPUP_CONFIRM = Button(area={'cn': (655, 450, 856, 487), 'en': (658, 453, 853, 484), 'jp': (655, 450, 856, 487), 'tw': (655, 450, 856, 487)}, color={'cn': (90, 121, 217), 'en': (81, 114, 215), 'jp': (82, 116, 208), 'tw': (90, 121, 217)}, button={'cn': (655, 450, 856, 487), 'en': (658, 453, 853, 484), 'jp': (655, 450, 856, 487), 'tw': (655, 450, 856, 487)}, file={'cn': './assets/cn/handler/GUILD_POPUP_CONFIRM.png', 'en': './assets/en/handler/GUILD_POPUP_CONFIRM.png', 'jp': './assets/jp/handler/GUILD_POPUP_CONFIRM.png', 'tw': './assets/tw/handler/GUILD_POPUP_CONFIRM.png'}) -IN_MAP = Button(area={'cn': (749, 654, 921, 707), 'en': (757, 654, 917, 699), 'jp': (748, 653, 919, 705), 'tw': (749, 654, 921, 707)}, color={'cn': (213, 124, 124), 'en': (215, 132, 132), 'jp': (212, 124, 124), 'tw': (213, 124, 124)}, button={'cn': (749, 654, 921, 707), 'en': (757, 654, 917, 699), 'jp': (748, 653, 919, 705), 'tw': (749, 654, 921, 707)}, file={'cn': './assets/cn/handler/IN_MAP.png', 'en': './assets/en/handler/IN_MAP.png', 'jp': './assets/jp/handler/IN_MAP.png', 'tw': './assets/tw/handler/IN_MAP.png'}) -IN_STAGE = Button(area={'cn': (122, 16, 172, 39), 'en': (120, 18, 208, 40), 'jp': (121, 15, 174, 40), 'tw': (122, 16, 172, 39)}, color={'cn': (149, 167, 207), 'en': (104, 118, 157), 'jp': (151, 167, 205), 'tw': (149, 167, 207)}, button={'cn': (122, 16, 172, 39), 'en': (120, 18, 208, 40), 'jp': (121, 15, 174, 40), 'tw': (122, 16, 172, 39)}, file={'cn': './assets/cn/handler/IN_STAGE.png', 'en': './assets/en/handler/IN_STAGE.png', 'jp': './assets/jp/handler/IN_STAGE.png', 'tw': './assets/tw/handler/IN_STAGE.png'}) INFO_BAR_1 = Button(area={'cn': (202, 297, 1078, 299), 'en': (194, 297, 1086, 299), 'jp': (194, 297, 1086, 299), 'tw': (200, 297, 1080, 299)}, color={'cn': (107, 158, 255), 'en': (107, 158, 255), 'jp': (107, 158, 255), 'tw': (107, 158, 255)}, button={'cn': (202, 297, 1078, 299), 'en': (194, 297, 1086, 299), 'jp': (194, 297, 1086, 299), 'tw': (200, 297, 1080, 299)}, file={'cn': './assets/cn/handler/INFO_BAR_1.png', 'en': './assets/en/handler/INFO_BAR_1.png', 'jp': './assets/jp/handler/INFO_BAR_1.png', 'tw': './assets/tw/handler/INFO_BAR_1.png'}) INFO_BAR_2 = Button(area={'cn': (202, 241, 1078, 243), 'en': (194, 241, 1086, 243), 'jp': (194, 234, 1086, 236), 'tw': (200, 241, 1080, 243)}, color={'cn': (107, 158, 255), 'en': (107, 158, 255), 'jp': (107, 158, 255), 'tw': (107, 158, 255)}, button={'cn': (202, 241, 1078, 243), 'en': (194, 241, 1086, 243), 'jp': (194, 234, 1086, 236), 'tw': (200, 241, 1080, 243)}, file={'cn': './assets/cn/handler/INFO_BAR_2.png', 'en': './assets/en/handler/INFO_BAR_2.png', 'jp': './assets/jp/handler/INFO_BAR_2.png', 'tw': './assets/tw/handler/INFO_BAR_2.png'}) INFO_BAR_3 = Button(area={'cn': (202, 185, 1078, 187), 'en': (194, 185, 1086, 187), 'jp': (194, 171, 1086, 173), 'tw': (200, 185, 1080, 187)}, color={'cn': (107, 158, 255), 'en': (107, 158, 255), 'jp': (107, 158, 255), 'tw': (107, 158, 255)}, button={'cn': (202, 185, 1078, 187), 'en': (194, 185, 1086, 187), 'jp': (194, 171, 1086, 173), 'tw': (200, 185, 1080, 187)}, file={'cn': './assets/cn/handler/INFO_BAR_3.png', 'en': './assets/en/handler/INFO_BAR_3.png', 'jp': './assets/jp/handler/INFO_BAR_3.png', 'tw': './assets/tw/handler/INFO_BAR_3.png'}) INFO_BAR_AREA = Button(area={'cn': (200, 173, 1080, 348), 'en': (200, 173, 1080, 348), 'jp': (200, 173, 1080, 348), 'tw': (200, 173, 1080, 348)}, color={'cn': (71, 85, 102), 'en': (71, 85, 102), 'jp': (71, 85, 102), 'tw': (71, 85, 102)}, button={'cn': (200, 173, 1080, 348), 'en': (200, 173, 1080, 348), 'jp': (200, 173, 1080, 348), 'tw': (200, 173, 1080, 348)}, file={'cn': './assets/cn/handler/INFO_BAR_AREA.png', 'en': './assets/en/handler/INFO_BAR_AREA.png', 'jp': './assets/jp/handler/INFO_BAR_AREA.png', 'tw': './assets/tw/handler/INFO_BAR_AREA.png'}) INFO_BAR_DETECT = Button(area={'cn': (194, 299, 1086, 348), 'en': (194, 299, 1086, 348), 'jp': (194, 299, 1086, 348), 'tw': (194, 299, 1086, 348)}, color={'cn': (48, 53, 65), 'en': (48, 53, 65), 'jp': (48, 53, 65), 'tw': (48, 53, 65)}, button={'cn': (194, 299, 1086, 348), 'en': (194, 299, 1086, 348), 'jp': (194, 299, 1086, 348), 'tw': (194, 299, 1086, 348)}, file={'cn': './assets/cn/handler/INFO_BAR_DETECT.png', 'en': './assets/en/handler/INFO_BAR_DETECT.png', 'jp': './assets/jp/handler/INFO_BAR_DETECT.png', 'tw': './assets/tw/handler/INFO_BAR_DETECT.png'}) +IN_MAP = Button(area={'cn': (749, 654, 921, 707), 'en': (757, 654, 917, 699), 'jp': (748, 653, 919, 705), 'tw': (749, 654, 921, 707)}, color={'cn': (213, 124, 124), 'en': (215, 132, 132), 'jp': (212, 124, 124), 'tw': (213, 124, 124)}, button={'cn': (749, 654, 921, 707), 'en': (757, 654, 917, 699), 'jp': (748, 653, 919, 705), 'tw': (749, 654, 921, 707)}, file={'cn': './assets/cn/handler/IN_MAP.png', 'en': './assets/en/handler/IN_MAP.png', 'jp': './assets/jp/handler/IN_MAP.png', 'tw': './assets/tw/handler/IN_MAP.png'}) +IN_STAGE = Button(area={'cn': (122, 16, 172, 39), 'en': (120, 18, 208, 40), 'jp': (121, 15, 174, 40), 'tw': (122, 16, 172, 39)}, color={'cn': (149, 167, 207), 'en': (104, 118, 157), 'jp': (151, 167, 205), 'tw': (149, 167, 207)}, button={'cn': (122, 16, 172, 39), 'en': (120, 18, 208, 40), 'jp': (121, 15, 174, 40), 'tw': (122, 16, 172, 39)}, file={'cn': './assets/cn/handler/IN_STAGE.png', 'en': './assets/en/handler/IN_STAGE.png', 'jp': './assets/jp/handler/IN_STAGE.png', 'tw': './assets/tw/handler/IN_STAGE.png'}) LOGIN_ANNOUNCE = Button(area={'cn': (1160, 45, 1227, 90), 'en': (1159, 44, 1228, 91), 'jp': (1160, 46, 1224, 86), 'tw': (1160, 45, 1227, 90)}, color={'cn': (174, 61, 56), 'en': (193, 79, 73), 'jp': (191, 79, 74), 'tw': (174, 61, 56)}, button={'cn': (1160, 61, 1190, 90), 'en': (1160, 61, 1190, 90), 'jp': (1160, 61, 1190, 90), 'tw': (1160, 61, 1190, 90)}, file={'cn': './assets/cn/handler/LOGIN_ANNOUNCE.png', 'en': './assets/en/handler/LOGIN_ANNOUNCE.png', 'jp': './assets/jp/handler/LOGIN_ANNOUNCE.png', 'tw': './assets/tw/handler/LOGIN_ANNOUNCE.png'}) LOGIN_ANNOUNCE_2 = Button(area={'cn': (1193, 83, 1215, 105), 'en': (1193, 83, 1215, 105), 'jp': (1193, 83, 1215, 105), 'tw': (1193, 83, 1215, 105)}, color={'cn': (158, 170, 175), 'en': (158, 170, 175), 'jp': (158, 170, 175), 'tw': (158, 170, 175)}, button={'cn': (1171, 83, 1193, 105), 'en': (1171, 83, 1193, 105), 'jp': (1171, 83, 1193, 105), 'tw': (1171, 83, 1193, 105)}, file={'cn': './assets/cn/handler/LOGIN_ANNOUNCE_2.png', 'en': './assets/en/handler/LOGIN_ANNOUNCE_2.png', 'jp': './assets/jp/handler/LOGIN_ANNOUNCE_2.png', 'tw': './assets/tw/handler/LOGIN_ANNOUNCE_2.png'}) LOGIN_CHECK = Button(area={'cn': (1214, 653, 1268, 709), 'en': (1214, 653, 1268, 709), 'jp': (1214, 653, 1268, 709), 'tw': (1214, 653, 1268, 709)}, color={'cn': (203, 215, 230), 'en': (203, 215, 230), 'jp': (203, 215, 230), 'tw': (203, 215, 230)}, button={'cn': (416, 294, 534, 400), 'en': (1078, 591, 1168, 635), 'jp': (416, 294, 534, 400), 'tw': (416, 294, 534, 400)}, file={'cn': './assets/cn/handler/LOGIN_CHECK.png', 'en': './assets/en/handler/LOGIN_CHECK.png', 'jp': './assets/jp/handler/LOGIN_CHECK.png', 'tw': './assets/tw/handler/LOGIN_CHECK.png'}) @@ -69,14 +69,14 @@ MISSION_POPUP_ACK = Button(area={'cn': (432, 493, 543, 533), 'en': (413, 489, 56 MISSION_POPUP_GO = Button(area={'cn': (719, 493, 861, 534), 'en': (716, 488, 869, 533), 'jp': (711, 482, 874, 539), 'tw': (716, 488, 869, 533)}, color={'cn': (125, 164, 214), 'en': (89, 138, 201), 'jp': (93, 142, 204), 'tw': (89, 138, 201)}, button={'cn': (719, 493, 861, 534), 'en': (716, 488, 869, 533), 'jp': (711, 482, 874, 539), 'tw': (716, 488, 869, 533)}, file={'cn': './assets/cn/handler/MISSION_POPUP_GO.png', 'en': './assets/en/handler/MISSION_POPUP_GO.png', 'jp': './assets/jp/handler/MISSION_POPUP_GO.png', 'tw': './assets/tw/handler/MISSION_POPUP_GO.png'}) MOB_MOVE_1 = Button(area={'cn': (1102, 504, 1176, 578), 'en': (1102, 504, 1176, 578), 'jp': (1102, 504, 1176, 578), 'tw': (1102, 504, 1176, 578)}, color={'cn': (118, 120, 127), 'en': (118, 120, 127), 'jp': (118, 120, 127), 'tw': (118, 120, 127)}, button={'cn': (1102, 504, 1176, 578), 'en': (1102, 504, 1176, 578), 'jp': (1102, 504, 1176, 578), 'tw': (1102, 504, 1176, 578)}, file={'cn': './assets/cn/handler/MOB_MOVE_1.png', 'en': './assets/en/handler/MOB_MOVE_1.png', 'jp': './assets/jp/handler/MOB_MOVE_1.png', 'tw': './assets/tw/handler/MOB_MOVE_1.png'}) MOB_MOVE_2 = Button(area={'cn': (1102, 504, 1176, 578), 'en': (1102, 504, 1176, 578), 'jp': (1102, 504, 1176, 578), 'tw': (1102, 504, 1176, 578)}, color={'cn': (119, 121, 128), 'en': (119, 121, 128), 'jp': (119, 121, 128), 'tw': (119, 121, 128)}, button={'cn': (1102, 504, 1176, 578), 'en': (1102, 504, 1176, 578), 'jp': (1102, 504, 1176, 578), 'tw': (1102, 504, 1176, 578)}, file={'cn': './assets/cn/handler/MOB_MOVE_2.png', 'en': './assets/en/handler/MOB_MOVE_2.png', 'jp': './assets/jp/handler/MOB_MOVE_2.png', 'tw': './assets/tw/handler/MOB_MOVE_2.png'}) -MOB_MOVE_CANCEL = Button(area={'cn': (1162, 644, 1222, 675), 'en': (1162, 644, 1222, 675), 'jp': (1162, 644, 1222, 675), 'tw': (1162, 644, 1222, 675)}, color={'cn': (207, 140, 136), 'en': (207, 140, 136), 'jp': (207, 140, 136), 'tw': (207, 140, 136)}, button={'cn': (1162, 644, 1222, 675), 'en': (1162, 644, 1222, 675), 'jp': (1162, 644, 1222, 675), 'tw': (1162, 644, 1222, 675)}, file={'cn': './assets/cn/handler/MOB_MOVE_CANCEL.png', 'en': './assets/cn/handler/MOB_MOVE_CANCEL.png', 'jp': './assets/jp/handler/MOB_MOVE_CANCEL.png', 'tw': './assets/cn/handler/MOB_MOVE_CANCEL.png'}) +MOB_MOVE_CANCEL = Button(area={'cn': (1162, 646, 1220, 674), 'en': (1162, 646, 1220, 674), 'jp': (1162, 644, 1222, 675), 'tw': (1162, 646, 1220, 674)}, color={'cn': (224, 176, 173), 'en': (224, 176, 173), 'jp': (207, 140, 136), 'tw': (224, 176, 173)}, button={'cn': (1162, 646, 1220, 674), 'en': (1162, 646, 1220, 674), 'jp': (1162, 644, 1222, 675), 'tw': (1162, 646, 1220, 674)}, file={'cn': './assets/cn/handler/MOB_MOVE_CANCEL.png', 'en': './assets/cn/handler/MOB_MOVE_CANCEL.png', 'jp': './assets/jp/handler/MOB_MOVE_CANCEL.png', 'tw': './assets/cn/handler/MOB_MOVE_CANCEL.png'}) MONTHLY_PASS_NOTICE = Button(area={'cn': (554, 505, 726, 561), 'en': (716, 488, 869, 533), 'jp': (554, 505, 726, 561), 'tw': (554, 505, 726, 561)}, color={'cn': (109, 153, 208), 'en': (89, 138, 201), 'jp': (109, 153, 208), 'tw': (109, 153, 208)}, button={'cn': (872, 152, 939, 196), 'en': (863, 173, 929, 217), 'jp': (872, 152, 939, 196), 'tw': (872, 152, 939, 196)}, file={'cn': './assets/cn/handler/MONTHLY_PASS_NOTICE.png', 'en': './assets/en/handler/MONTHLY_PASS_NOTICE.png', 'jp': './assets/cn/handler/MONTHLY_PASS_NOTICE.png', 'tw': './assets/cn/handler/MONTHLY_PASS_NOTICE.png'}) MYSTERY_ITEM = Button(area={'cn': (589, 294, 691, 427), 'en': (589, 294, 691, 427), 'jp': (589, 294, 691, 427), 'tw': (589, 294, 691, 427)}, color={'cn': (144, 127, 83), 'en': (144, 127, 83), 'jp': (144, 127, 83), 'tw': (144, 127, 83)}, button={'cn': (588, 478, 698, 496), 'en': (588, 478, 698, 496), 'jp': (588, 478, 698, 496), 'tw': (588, 478, 698, 496)}, file={'cn': './assets/cn/handler/MYSTERY_ITEM.png', 'en': './assets/en/handler/MYSTERY_ITEM.png', 'jp': './assets/jp/handler/MYSTERY_ITEM.png', 'tw': './assets/tw/handler/MYSTERY_ITEM.png'}) POPUP_CANCEL = Button(area={'cn': (453, 506, 525, 536), 'en': (407, 485, 574, 535), 'jp': (455, 515, 521, 546), 'tw': (454, 495, 525, 526)}, color={'cn': (196, 198, 199), 'en': (168, 169, 171), 'jp': (181, 183, 184), 'tw': (195, 196, 197)}, button={'cn': (453, 506, 525, 536), 'en': (407, 485, 574, 535), 'jp': (455, 515, 521, 546), 'tw': (454, 495, 525, 526)}, file={'cn': './assets/cn/handler/POPUP_CANCEL.png', 'en': './assets/en/handler/POPUP_CANCEL.gif', 'jp': './assets/jp/handler/POPUP_CANCEL.png', 'tw': './assets/tw/handler/POPUP_CANCEL.png'}) POPUP_CONFIRM = Button(area={'cn': (754, 502, 825, 532), 'en': (707, 487, 874, 537), 'jp': (754, 518, 826, 547), 'tw': (754, 495, 825, 525)}, color={'cn': (153, 183, 222), 'en': (105, 151, 207), 'jp': (139, 172, 215), 'tw': (147, 178, 218)}, button={'cn': (754, 502, 825, 532), 'en': (707, 487, 874, 537), 'jp': (754, 518, 826, 547), 'tw': (754, 495, 825, 525)}, file={'cn': './assets/cn/handler/POPUP_CONFIRM.png', 'en': './assets/en/handler/POPUP_CONFIRM.gif', 'jp': './assets/jp/handler/POPUP_CONFIRM.png', 'tw': './assets/tw/handler/POPUP_CONFIRM.png'}) STORY_CLOSE = Button(area={'cn': (1227, 28, 1252, 53), 'en': (1227, 28, 1252, 53), 'jp': (1227, 28, 1252, 53), 'tw': (1227, 28, 1252, 53)}, color={'cn': (87, 90, 104), 'en': (87, 90, 104), 'jp': (87, 90, 104), 'tw': (87, 90, 104)}, button={'cn': (1227, 28, 1252, 53), 'en': (1227, 28, 1252, 53), 'jp': (1227, 28, 1252, 53), 'tw': (1227, 28, 1252, 53)}, file={'cn': './assets/cn/handler/STORY_CLOSE.png', 'en': './assets/en/handler/STORY_CLOSE.png', 'jp': './assets/jp/handler/STORY_CLOSE.png', 'tw': './assets/tw/handler/STORY_CLOSE.png'}) -STORY_LETTER_BLACK = Button(area={'cn': (1145, 585, 1280, 720), 'en': (1145, 585, 1280, 720), 'jp': (1145, 585, 1280, 720), 'tw': (1145, 585, 1280, 720)}, color={'cn': (16, 20, 16), 'en': (16, 20, 16), 'jp': (16, 20, 16), 'tw': (16, 20, 16)}, button={'cn': (1145, 585, 1280, 720), 'en': (1145, 585, 1280, 720), 'jp': (1145, 585, 1280, 720), 'tw': (1145, 585, 1280, 720)}, file={'cn': './assets/cn/handler/STORY_LETTER_BLACK.png', 'en': './assets/en/handler/STORY_LETTER_BLACK.png', 'jp': './assets/jp/handler/STORY_LETTER_BLACK.png', 'tw': './assets/tw/handler/STORY_LETTER_BLACK.png'}) STORY_LETTERS_ONLY = Button(area={'cn': (1159, 26, 1264, 52), 'en': (1159, 26, 1264, 52), 'jp': (1159, 26, 1264, 52), 'tw': (1159, 26, 1264, 52)}, color={'cn': (123, 128, 141), 'en': (123, 128, 141), 'jp': (123, 128, 141), 'tw': (123, 128, 141)}, button={'cn': (1159, 26, 1264, 52), 'en': (1159, 26, 1264, 52), 'jp': (1159, 26, 1264, 52), 'tw': (1159, 26, 1264, 52)}, file={'cn': './assets/cn/handler/STORY_LETTERS_ONLY.png', 'en': './assets/en/handler/STORY_LETTERS_ONLY.png', 'jp': './assets/jp/handler/STORY_LETTERS_ONLY.png', 'tw': './assets/tw/handler/STORY_LETTERS_ONLY.png'}) +STORY_LETTER_BLACK = Button(area={'cn': (1145, 585, 1280, 720), 'en': (1145, 585, 1280, 720), 'jp': (1145, 585, 1280, 720), 'tw': (1145, 585, 1280, 720)}, color={'cn': (16, 20, 16), 'en': (16, 20, 16), 'jp': (16, 20, 16), 'tw': (16, 20, 16)}, button={'cn': (1145, 585, 1280, 720), 'en': (1145, 585, 1280, 720), 'jp': (1145, 585, 1280, 720), 'tw': (1145, 585, 1280, 720)}, file={'cn': './assets/cn/handler/STORY_LETTER_BLACK.png', 'en': './assets/en/handler/STORY_LETTER_BLACK.png', 'jp': './assets/jp/handler/STORY_LETTER_BLACK.png', 'tw': './assets/tw/handler/STORY_LETTER_BLACK.png'}) STORY_SKIP = Button(area={'cn': (1216, 676, 1258, 708), 'en': (1215, 672, 1259, 705), 'jp': (1216, 676, 1258, 708), 'tw': (1216, 676, 1258, 708)}, color={'cn': (148, 159, 178), 'en': (146, 155, 175), 'jp': (148, 159, 178), 'tw': (148, 159, 178)}, button={'cn': (1178, 25, 1196, 54), 'en': (1178, 25, 1196, 54), 'jp': (1178, 25, 1196, 54), 'tw': (1178, 25, 1196, 54)}, file={'cn': './assets/cn/handler/STORY_SKIP.png', 'en': './assets/en/handler/STORY_SKIP.png', 'jp': './assets/jp/handler/STORY_SKIP.png', 'tw': './assets/tw/handler/STORY_SKIP.png'}) STORY_SKIP_2 = Button(area={'cn': (1181, 26, 1225, 40), 'en': (1181, 26, 1225, 40), 'jp': (1181, 26, 1225, 40), 'tw': (1181, 26, 1225, 40)}, color={'cn': (173, 172, 181), 'en': (173, 172, 181), 'jp': (173, 172, 181), 'tw': (173, 172, 181)}, button={'cn': (1181, 26, 1225, 40), 'en': (1181, 26, 1225, 40), 'jp': (1181, 26, 1225, 40), 'tw': (1181, 26, 1225, 40)}, file={'cn': './assets/cn/handler/STORY_SKIP_2.png', 'en': './assets/en/handler/STORY_SKIP_2.png', 'jp': './assets/jp/handler/STORY_SKIP_2.png', 'tw': './assets/tw/handler/STORY_SKIP_2.png'}) STORY_SKIP_3 = Button(area={'cn': (28, 23, 55, 50), 'en': (28, 23, 55, 50), 'jp': (28, 23, 55, 50), 'tw': (28, 23, 55, 50)}, color={'cn': (192, 199, 209), 'en': (192, 199, 209), 'jp': (192, 199, 209), 'tw': (192, 199, 209)}, button={'cn': (28, 23, 55, 50), 'en': (28, 23, 55, 50), 'jp': (28, 23, 55, 50), 'tw': (28, 23, 55, 50)}, file={'cn': './assets/cn/handler/STORY_SKIP_3.png', 'en': './assets/en/handler/STORY_SKIP_3.png', 'jp': './assets/jp/handler/STORY_SKIP_3.png', 'tw': './assets/tw/handler/STORY_SKIP_3.png'}) @@ -89,7 +89,7 @@ SUBMARINE_MOVE_CONFIRM = Button(area={'cn': (1103, 646, 1218, 674), 'en': (1101, SUBMARINE_MOVE_ENTER = Button(area={'cn': (1109, 511, 1169, 571), 'en': (1109, 511, 1169, 571), 'jp': (1109, 511, 1169, 571), 'tw': (1109, 511, 1169, 571)}, color={'cn': (106, 107, 114), 'en': (106, 107, 114), 'jp': (106, 107, 114), 'tw': (106, 107, 114)}, button={'cn': (1109, 511, 1169, 571), 'en': (1109, 511, 1169, 571), 'jp': (1109, 511, 1169, 571), 'tw': (1109, 511, 1169, 571)}, file={'cn': './assets/cn/handler/SUBMARINE_MOVE_ENTER.png', 'en': './assets/en/handler/SUBMARINE_MOVE_ENTER.png', 'jp': './assets/jp/handler/SUBMARINE_MOVE_ENTER.png', 'tw': './assets/tw/handler/SUBMARINE_MOVE_ENTER.png'}) SUBMARINE_VIEW_OFF = Button(area={'cn': (1140, 435, 1170, 468), 'en': (1140, 435, 1170, 468), 'jp': (1140, 435, 1170, 468), 'tw': (1140, 435, 1170, 468)}, color={'cn': (156, 156, 158), 'en': (156, 156, 158), 'jp': (156, 156, 158), 'tw': (156, 156, 158)}, button={'cn': (1140, 435, 1170, 468), 'en': (1140, 435, 1170, 468), 'jp': (1140, 435, 1170, 468), 'tw': (1140, 435, 1170, 468)}, file={'cn': './assets/cn/handler/SUBMARINE_VIEW_OFF.png', 'en': './assets/en/handler/SUBMARINE_VIEW_OFF.png', 'jp': './assets/jp/handler/SUBMARINE_VIEW_OFF.png', 'tw': './assets/tw/handler/SUBMARINE_VIEW_OFF.png'}) SUBMARINE_VIEW_ON = Button(area={'cn': (1140, 435, 1170, 468), 'en': (1140, 435, 1170, 468), 'jp': (1140, 435, 1170, 468), 'tw': (1140, 435, 1170, 468)}, color={'cn': (177, 178, 179), 'en': (177, 178, 179), 'jp': (177, 178, 179), 'tw': (177, 178, 179)}, button={'cn': (1140, 435, 1170, 468), 'en': (1140, 435, 1170, 468), 'jp': (1140, 435, 1170, 468), 'tw': (1140, 435, 1170, 468)}, file={'cn': './assets/cn/handler/SUBMARINE_VIEW_ON.png', 'en': './assets/en/handler/SUBMARINE_VIEW_ON.png', 'jp': './assets/jp/handler/SUBMARINE_VIEW_ON.png', 'tw': './assets/tw/handler/SUBMARINE_VIEW_ON.png'}) +USER_AGREEMENT_CONFIRM = Button(area={'cn': (709, 526, 742, 542), 'en': (709, 526, 742, 542), 'jp': (709, 526, 742, 542), 'tw': (709, 526, 742, 542)}, color={'cn': (151, 216, 243), 'en': (151, 216, 243), 'jp': (151, 216, 243), 'tw': (151, 216, 243)}, button={'cn': (709, 526, 742, 542), 'en': (709, 526, 742, 542), 'jp': (709, 526, 742, 542), 'tw': (709, 526, 742, 542)}, file={'cn': './assets/cn/handler/USER_AGREEMENT_CONFIRM.png', 'en': './assets/en/handler/USER_AGREEMENT_CONFIRM.png', 'jp': './assets/jp/handler/USER_AGREEMENT_CONFIRM.png', 'tw': './assets/tw/handler/USER_AGREEMENT_CONFIRM.png'}) USE_DATA_KEY = Button(area={'cn': (688, 316, 781, 338), 'en': (759, 323, 889, 342), 'jp': (625, 318, 742, 344), 'tw': (688, 316, 782, 338)}, color={'cn': (165, 154, 99), 'en': (170, 160, 94), 'jp': (122, 130, 121), 'tw': (159, 150, 97)}, button={'cn': (688, 316, 781, 338), 'en': (759, 323, 889, 342), 'jp': (625, 318, 742, 344), 'tw': (688, 316, 782, 338)}, file={'cn': './assets/cn/handler/USE_DATA_KEY.png', 'en': './assets/en/handler/USE_DATA_KEY.png', 'jp': './assets/jp/handler/USE_DATA_KEY.png', 'tw': './assets/tw/handler/USE_DATA_KEY.png'}) USE_DATA_KEY_NOTIFIED = Button(area={'cn': (770, 434, 793, 456), 'en': (820, 440, 837, 456), 'jp': (686, 430, 709, 456), 'tw': (782, 440, 799, 456)}, color={'cn': (41, 44, 49), 'en': (33, 40, 41), 'jp': (33, 44, 49), 'tw': (34, 40, 48)}, button={'cn': (770, 434, 793, 456), 'en': (820, 440, 837, 456), 'jp': (686, 430, 709, 456), 'tw': (782, 440, 799, 456)}, file={'cn': './assets/cn/handler/USE_DATA_KEY_NOTIFIED.png', 'en': './assets/en/handler/USE_DATA_KEY_NOTIFIED.png', 'jp': './assets/jp/handler/USE_DATA_KEY_NOTIFIED.png', 'tw': './assets/tw/handler/USE_DATA_KEY_NOTIFIED.png'}) -USER_AGREEMENT_CONFIRM = Button(area={'cn': (709, 526, 742, 542), 'en': (709, 526, 742, 542), 'jp': (709, 526, 742, 542), 'tw': (709, 526, 742, 542)}, color={'cn': (151, 216, 243), 'en': (151, 216, 243), 'jp': (151, 216, 243), 'tw': (151, 216, 243)}, button={'cn': (709, 526, 742, 542), 'en': (709, 526, 742, 542), 'jp': (709, 526, 742, 542), 'tw': (709, 526, 742, 542)}, file={'cn': './assets/cn/handler/USER_AGREEMENT_CONFIRM.png', 'en': './assets/en/handler/USER_AGREEMENT_CONFIRM.png', 'jp': './assets/jp/handler/USER_AGREEMENT_CONFIRM.png', 'tw': './assets/tw/handler/USER_AGREEMENT_CONFIRM.png'}) VOTE_CANCEL = Button(area={'cn': (404, 483, 576, 539), 'en': (413, 489, 566, 532), 'jp': (407, 483, 577, 538), 'tw': (404, 483, 576, 539)}, color={'cn': (167, 169, 171), 'en': (169, 170, 172), 'jp': (163, 164, 166), 'tw': (167, 169, 171)}, button={'cn': (404, 483, 576, 539), 'en': (413, 489, 566, 532), 'jp': (407, 483, 577, 538), 'tw': (404, 483, 576, 539)}, file={'cn': './assets/cn/handler/VOTE_CANCEL.png', 'en': './assets/en/handler/VOTE_CANCEL.png', 'jp': './assets/jp/handler/VOTE_CANCEL.png', 'tw': './assets/cn/handler/VOTE_CANCEL.png'}) diff --git a/module/handler/fast_forward.py b/module/handler/fast_forward.py index ccc6c7a88..f8cbbf85e 100644 --- a/module/handler/fast_forward.py +++ b/module/handler/fast_forward.py @@ -99,6 +99,7 @@ class FastForwardHandler(AutoSearchHandler): > 12-1 > 12-2 > 12-3 > 12-4 > 13-1 > 13-2 > 13-3 > 13-4 > 14-1 > 14-2 > 14-3 > 14-4 + > 15-1 > 15-2 > 15-3 > 15-4 """, 'A1 > A2 > A3', 'B1 > B2 > B3', diff --git a/module/handler/strategy.py b/module/handler/strategy.py index e08664e25..cc1d963bf 100644 --- a/module/handler/strategy.py +++ b/module/handler/strategy.py @@ -193,7 +193,7 @@ class StrategyHandler(InfoHandler): skip_first_screenshot = False else: self.device.screenshot() - + if self.appear_then_click(SUBMARINE_MOVE_CANCEL, offset=(20, 20), interval=5): pass if self.handle_popup_confirm('SUBMARINE_MOVE'): @@ -215,7 +215,6 @@ class StrategyHandler(InfoHandler): in: STRATEGY_OPENED out: STRATEGY_OPENED """ - self.device.screenshot() if self.appear(MOB_MOVE_2, offset=(120, 120)): return 2 elif self.appear(MOB_MOVE_1, offset=(120, 120)): @@ -236,13 +235,13 @@ class StrategyHandler(InfoHandler): else: self.device.screenshot() + if self.appear(MOB_MOVE_CANCEL, offset=(20, 20)): + break + if self.appear_then_click(MOB_MOVE_1, offset=(120, 120), interval=5): continue if self.appear_then_click(MOB_MOVE_2, offset=(120, 120), interval=5): continue - - if self.appear(MOB_MOVE_CANCEL, offset=(20, 20)): - break def strategy_mob_move_cancel(self, skip_first_screenshot=True): """ @@ -256,10 +255,10 @@ class StrategyHandler(InfoHandler): skip_first_screenshot = False else: self.device.screenshot() - - if self.appear_then_click(MOB_MOVE_CANCEL, offset=(20, 20), interval=5): - pass - if self.appear(MOB_MOVE_1, offset=(120, 120))\ + if self.appear(MOB_MOVE_1, offset=(120, 120)) \ or self.appear(MOB_MOVE_2, offset=(120, 120)): - break \ No newline at end of file + break + + if self.appear_then_click(MOB_MOVE_CANCEL, offset=(20, 20), interval=5): + continue