From 952138583ff2e19d86e55f20844d28373e06834f Mon Sep 17 00:00:00 2001 From: guoh064 <50830808+guoh064@users.noreply.github.com> Date: Wed, 28 Aug 2024 14:34:24 +0800 Subject: [PATCH] Fix: empty ship head --- assets/cn/equipment/EMPTY_SHIP_R.png | Bin 0 -> 10599 bytes assets/en/equipment/EMPTY_SHIP_R.png | Bin 0 -> 10599 bytes assets/jp/equipment/EMPTY_SHIP_R.png | Bin 0 -> 10599 bytes assets/tw/equipment/EMPTY_SHIP_R.png | Bin 0 -> 10599 bytes module/campaign/gems_farming.py | 14 +++++++++++++- module/equipment/assets.py | 1 + 6 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 assets/cn/equipment/EMPTY_SHIP_R.png create mode 100644 assets/en/equipment/EMPTY_SHIP_R.png create mode 100644 assets/jp/equipment/EMPTY_SHIP_R.png create mode 100644 assets/tw/equipment/EMPTY_SHIP_R.png diff --git a/assets/cn/equipment/EMPTY_SHIP_R.png b/assets/cn/equipment/EMPTY_SHIP_R.png new file mode 100644 index 0000000000000000000000000000000000000000..2944f8933cd084b46ed6fa25bdf025b22123e790 GIT binary patch literal 10599 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 literal 0 HcmV?d00001 diff --git a/assets/en/equipment/EMPTY_SHIP_R.png b/assets/en/equipment/EMPTY_SHIP_R.png new file mode 100644 index 0000000000000000000000000000000000000000..2944f8933cd084b46ed6fa25bdf025b22123e790 GIT binary patch literal 10599 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 literal 0 HcmV?d00001 diff --git a/assets/jp/equipment/EMPTY_SHIP_R.png b/assets/jp/equipment/EMPTY_SHIP_R.png new file mode 100644 index 0000000000000000000000000000000000000000..2944f8933cd084b46ed6fa25bdf025b22123e790 GIT binary patch literal 10599 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 literal 0 HcmV?d00001 diff --git a/assets/tw/equipment/EMPTY_SHIP_R.png b/assets/tw/equipment/EMPTY_SHIP_R.png new file mode 100644 index 0000000000000000000000000000000000000000..2944f8933cd084b46ed6fa25bdf025b22123e790 GIT binary patch literal 10599 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 literal 0 HcmV?d00001 diff --git a/module/campaign/gems_farming.py b/module/campaign/gems_farming.py index cdb60c5e84..6d548d2b5e 100644 --- a/module/campaign/gems_farming.py +++ b/module/campaign/gems_farming.py @@ -76,7 +76,7 @@ def __init__(self, config, device=None, task=None): key="GemsFarming.GemsFarming.EquipmentCode", ships=['DD', 'bogue', 'hermes', 'langley', 'ranger']) - def current_ship(self): + def current_ship(self, skip_first_screenshot=True): """ Reuse templates in module.retire.assets, which needs different rescaling to match each current flagship. @@ -84,6 +84,18 @@ def current_ship(self): Pages: in: gear_code """ + while 1: + if skip_first_screenshot: + skip_first_screenshot = False + else: + self.device.screenshot() + + # End + if not self.appear(EMPTY_SHIP_R): + break + else: + logger.info('Waiting ship icon loading.') + if TEMPLATE_BOGUE.match(self.device.image, scaling=1.46): # image has rotation return 'bogue' if TEMPLATE_HERMES.match(self.device.image, scaling=124/89): diff --git a/module/equipment/assets.py b/module/equipment/assets.py index 8d521979b4..432840f3eb 100644 --- a/module/equipment/assets.py +++ b/module/equipment/assets.py @@ -4,6 +4,7 @@ # This file was automatically generated by dev_tools/button_extract.py. # Don't modify it manually. +EMPTY_SHIP_R = Button(area={'cn': (192, 359, 268, 435), 'en': (192, 359, 268, 435), 'jp': (192, 359, 268, 435), 'tw': (192, 359, 268, 435)}, color={'cn': (144, 144, 144), 'en': (144, 144, 144), 'jp': (144, 144, 144), 'tw': (144, 144, 144)}, button={'cn': (192, 359, 268, 435), 'en': (192, 359, 268, 435), 'jp': (192, 359, 268, 435), 'tw': (192, 359, 268, 435)}, file={'cn': './assets/cn/equipment/EMPTY_SHIP_R.png', 'en': './assets/en/equipment/EMPTY_SHIP_R.png', 'jp': './assets/jp/equipment/EMPTY_SHIP_R.png', 'tw': './assets/tw/equipment/EMPTY_SHIP_R.png'}) EQUIP_1 = Button(area={'cn': (1211, 274, 1230, 315), 'en': (1200, 273, 1241, 314), 'jp': (1191, 265, 1248, 320), 'tw': (1190, 265, 1249, 319)}, color={'cn': (133, 181, 222), 'en': (77, 130, 192), 'jp': (97, 142, 206), 'tw': (102, 147, 211)}, button={'cn': (1211, 274, 1230, 315), 'en': (1200, 273, 1241, 314), 'jp': (1191, 265, 1248, 320), 'tw': (1190, 265, 1249, 319)}, file={'cn': './assets/cn/equipment/EQUIP_1.png', 'en': './assets/en/equipment/EQUIP_1.png', 'jp': './assets/jp/equipment/EQUIP_1.png', 'tw': './assets/tw/equipment/EQUIP_1.png'}) EQUIP_2 = Button(area={'cn': (1211, 374, 1230, 416), 'en': (1200, 374, 1241, 415), 'jp': (1191, 365, 1248, 420), 'tw': (1190, 365, 1249, 419)}, color={'cn': (130, 179, 220), 'en': (77, 130, 192), 'jp': (94, 138, 201), 'tw': (100, 144, 208)}, button={'cn': (1211, 374, 1230, 416), 'en': (1200, 374, 1241, 415), 'jp': (1191, 365, 1248, 420), 'tw': (1190, 365, 1249, 419)}, file={'cn': './assets/cn/equipment/EQUIP_2.png', 'en': './assets/en/equipment/EQUIP_2.png', 'jp': './assets/jp/equipment/EQUIP_2.png', 'tw': './assets/tw/equipment/EQUIP_2.png'}) EQUIP_3 = Button(area={'cn': (1211, 475, 1230, 517), 'en': (1200, 475, 1241, 516), 'jp': (1190, 467, 1249, 520), 'tw': (1190, 466, 1249, 520)}, color={'cn': (130, 179, 220), 'en': (80, 132, 192), 'jp': (89, 134, 197), 'tw': (97, 142, 205)}, button={'cn': (1211, 475, 1230, 517), 'en': (1200, 475, 1241, 516), 'jp': (1190, 467, 1249, 520), 'tw': (1190, 466, 1249, 520)}, file={'cn': './assets/cn/equipment/EQUIP_3.png', 'en': './assets/en/equipment/EQUIP_3.png', 'jp': './assets/jp/equipment/EQUIP_3.png', 'tw': './assets/tw/equipment/EQUIP_3.png'})