From b5be6454e615819b8a4194bd38c3c021c15068a4 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Thu, 16 Jun 2022 20:27:53 +0800 Subject: [PATCH] Fix: [JP] Temp fix for game bug on research remain tab (#1227) Research tab cannot expand after game patch. Revert this commit when game dev fix it --- assets/cn/research/DURATION_REMAIN.png | Bin 0 -> 8700 bytes assets/en/research/DURATION_REMAIN.png | Bin 0 -> 8700 bytes assets/jp/research/DURATION_REMAIN.png | Bin 0 -> 8700 bytes assets/tw/research/DURATION_REMAIN.png | Bin 0 -> 8700 bytes module/research/assets.py | 1 + module/research/research.py | 33 +++++++++++++++++++++++++ 6 files changed, 34 insertions(+) create mode 100644 assets/cn/research/DURATION_REMAIN.png create mode 100644 assets/en/research/DURATION_REMAIN.png create mode 100644 assets/jp/research/DURATION_REMAIN.png create mode 100644 assets/tw/research/DURATION_REMAIN.png diff --git a/assets/cn/research/DURATION_REMAIN.png b/assets/cn/research/DURATION_REMAIN.png new file mode 100644 index 0000000000000000000000000000000000000000..1784be13d47df67fa290fb7647834e217a76ebfd GIT binary patch literal 8700 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 literal 0 HcmV?d00001 diff --git a/assets/en/research/DURATION_REMAIN.png b/assets/en/research/DURATION_REMAIN.png new file mode 100644 index 0000000000000000000000000000000000000000..1784be13d47df67fa290fb7647834e217a76ebfd GIT binary patch literal 8700 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 literal 0 HcmV?d00001 diff --git a/assets/jp/research/DURATION_REMAIN.png b/assets/jp/research/DURATION_REMAIN.png new file mode 100644 index 0000000000000000000000000000000000000000..1784be13d47df67fa290fb7647834e217a76ebfd GIT binary patch literal 8700 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 literal 0 HcmV?d00001 diff --git a/assets/tw/research/DURATION_REMAIN.png b/assets/tw/research/DURATION_REMAIN.png new file mode 100644 index 0000000000000000000000000000000000000000..1784be13d47df67fa290fb7647834e217a76ebfd GIT binary patch literal 8700 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 literal 0 HcmV?d00001 diff --git a/module/research/assets.py b/module/research/assets.py index 76d5682d7..48aa68986 100644 --- a/module/research/assets.py +++ b/module/research/assets.py @@ -18,6 +18,7 @@ DETAIL_GENRE_T = Button(area={'cn': (323, 110, 418, 133), 'en': (323, 110, 418, DETAIL_ITEMS_ODD = Button(area={'cn': (408, 447, 422, 525), 'en': (408, 447, 422, 525), 'jp': (408, 447, 422, 525), 'tw': (408, 447, 422, 525)}, color={'cn': (145, 169, 164), 'en': (145, 169, 164), 'jp': (145, 169, 164), 'tw': (145, 169, 164)}, button={'cn': (408, 447, 422, 525), 'en': (408, 447, 422, 525), 'jp': (408, 447, 422, 525), 'tw': (408, 447, 422, 525)}, file={'cn': './assets/cn/research/DETAIL_ITEMS_ODD.png', 'en': './assets/en/research/DETAIL_ITEMS_ODD.png', 'jp': './assets/jp/research/DETAIL_ITEMS_ODD.png', 'tw': './assets/tw/research/DETAIL_ITEMS_ODD.png'}) DETAIL_NEXT = Button(area={'cn': (1236, 347, 1257, 374), 'en': (1236, 347, 1257, 374), 'jp': (1236, 347, 1257, 374), 'tw': (1236, 347, 1257, 374)}, color={'cn': (98, 148, 165), 'en': (98, 148, 165), 'jp': (98, 148, 165), 'tw': (98, 148, 165)}, button={'cn': (1236, 347, 1257, 374), 'en': (1236, 347, 1257, 374), 'jp': (1236, 347, 1257, 374), 'tw': (1236, 347, 1257, 374)}, file={'cn': './assets/cn/research/DETAIL_NEXT.png', 'en': './assets/en/research/DETAIL_NEXT.png', 'jp': './assets/jp/research/DETAIL_NEXT.png', 'tw': './assets/tw/research/DETAIL_NEXT.png'}) DURATION_DETAIL = Button(area={'cn': (788, 274, 913, 319), 'en': (788, 274, 913, 319), 'jp': (788, 274, 913, 319), 'tw': (788, 274, 913, 319)}, color={'cn': (102, 112, 132), 'en': (102, 112, 132), 'jp': (102, 112, 132), 'tw': (102, 112, 132)}, button={'cn': (788, 274, 913, 319), 'en': (788, 274, 913, 319), 'jp': (788, 274, 913, 319), 'tw': (788, 274, 913, 319)}, file={'cn': './assets/cn/research/DURATION_DETAIL.png', 'en': './assets/en/research/DURATION_DETAIL.png', 'jp': './assets/jp/research/DURATION_DETAIL.png', 'tw': './assets/tw/research/DURATION_DETAIL.png'}) +DURATION_REMAIN = Button(area={'cn': (622, 579, 732, 613), 'en': (622, 579, 732, 613), 'jp': (622, 579, 732, 613), 'tw': (622, 579, 732, 613)}, color={'cn': (188, 211, 239), 'en': (188, 211, 239), 'jp': (188, 211, 239), 'tw': (188, 211, 239)}, button={'cn': (622, 579, 732, 613), 'en': (622, 579, 732, 613), 'jp': (622, 579, 732, 613), 'tw': (622, 579, 732, 613)}, file={'cn': './assets/cn/research/DURATION_REMAIN.png', 'en': './assets/en/research/DURATION_REMAIN.png', 'jp': './assets/jp/research/DURATION_REMAIN.png', 'tw': './assets/tw/research/DURATION_REMAIN.png'}) ENTRANCE_1 = Button(area={'cn': (52, 186, 198, 375), 'en': (52, 186, 198, 375), 'jp': (52, 186, 198, 375), 'tw': (52, 186, 198, 375)}, color={'cn': (110, 162, 216), 'en': (110, 162, 216), 'jp': (110, 162, 216), 'tw': (110, 162, 216)}, button={'cn': (52, 186, 198, 375), 'en': (52, 186, 198, 375), 'jp': (52, 186, 198, 375), 'tw': (52, 186, 198, 375)}, file={'cn': './assets/cn/research/ENTRANCE_1.png', 'en': './assets/en/research/ENTRANCE_1.png', 'jp': './assets/jp/research/ENTRANCE_1.png', 'tw': './assets/tw/research/ENTRANCE_1.png'}) ENTRANCE_2 = Button(area={'cn': (296, 157, 465, 376), 'en': (296, 157, 465, 376), 'jp': (296, 157, 465, 376), 'tw': (296, 157, 465, 376)}, color={'cn': (110, 162, 216), 'en': (110, 162, 216), 'jp': (110, 162, 216), 'tw': (110, 162, 216)}, button={'cn': (296, 157, 465, 376), 'en': (296, 157, 465, 376), 'jp': (296, 157, 465, 376), 'tw': (296, 157, 465, 376)}, file={'cn': './assets/cn/research/ENTRANCE_2.png', 'en': './assets/en/research/ENTRANCE_2.png', 'jp': './assets/jp/research/ENTRANCE_2.png', 'tw': './assets/tw/research/ENTRANCE_2.png'}) ENTRANCE_3 = Button(area={'cn': (542, 130, 730, 378), 'en': (542, 130, 730, 378), 'jp': (542, 130, 730, 378), 'tw': (542, 130, 730, 378)}, color={'cn': (224, 190, 135), 'en': (224, 190, 135), 'jp': (224, 190, 135), 'tw': (224, 190, 135)}, button={'cn': (542, 130, 730, 378), 'en': (542, 130, 730, 378), 'jp': (542, 130, 730, 378), 'tw': (542, 130, 730, 378)}, file={'cn': './assets/cn/research/ENTRANCE_3.png', 'en': './assets/en/research/ENTRANCE_3.png', 'jp': './assets/jp/research/ENTRANCE_3.png', 'tw': './assets/tw/research/ENTRANCE_3.png'}) diff --git a/module/research/research.py b/module/research/research.py index 114aa9f85..b3351df6e 100644 --- a/module/research/research.py +++ b/module/research/research.py @@ -1,5 +1,6 @@ import numpy as np +from module.base.decorator import Config from module.base.timer import Timer from module.base.utils import rgb2gray from module.combat.assets import GET_ITEMS_1, GET_ITEMS_2, GET_ITEMS_3 @@ -321,6 +322,38 @@ class RewardResearch(ResearchSelector): return True + @Config.when(SERVER='jp') + def research_get_remain(self): + """ + Get remain duration of current project (the one in the middle). + + Returns: + float: research project remain time if success + None: if failed + + Pages: + in: page_research, stable. + out: page_research, stable. + """ + ocr = Duration(DURATION_REMAIN, letter=(255, 255, 255), threshold=64, name='DURATION_REMAIN') + + logger.hr('Research get remain') + + self.interval_clear(MAIN_GOTO_CAMPAIGN) + self.ui_ensure_research() + + remain = ocr.ocr(self.device.image) + logger.info(f'Research project remain: {remain}') + + seconds = remain.total_seconds() + if seconds >= 0: + research_duration_remain = seconds / 3600 + return research_duration_remain + else: + logger.warning(f'Invalid research duration: {seconds} ') + return None + + @Config.when(SERVER=None) def research_get_remain(self): """ Get remain duration of current project from page_reward.