From a4d6c94a466c17db9152e1edf8321f10a777510e Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Wed, 8 May 2024 22:00:41 +0800 Subject: [PATCH 1/4] Fix: Food_Improvement_Plan does not exist anymore --- tasks/assignment/ui.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/assignment/ui.py b/tasks/assignment/ui.py index 895fe0c38..efbeb0f67 100644 --- a/tasks/assignment/ui.py +++ b/tasks/assignment/ui.py @@ -40,8 +40,8 @@ class AssignmentOcr(Ocr): (KEYWORDS_ASSIGNMENT_ENTRY.The_Wages_of_Humanity.name, '[赠]养人类'), ], 'en': [ - (KEYWORDS_ASSIGNMENT_EVENT_ENTRY.Food_Improvement_Plan.name, - 'Food\s*[I]{0}mprovement Plan'), + # (KEYWORDS_ASSIGNMENT_EVENT_ENTRY.Food_Improvement_Plan.name, + # 'Food\s*[I]{0}mprovement Plan'), ] } From 9dcc3793be4ae14118a8bae2da58a56da16d73d0 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Sat, 11 May 2024 22:40:23 +0800 Subject: [PATCH 2/4] Fix: [CN] Handle OCR error on Stagnant_Shadow_Ire --- tasks/dungeon/ui.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tasks/dungeon/ui.py b/tasks/dungeon/ui.py index 1ded01cdd..4d02ff30c 100644 --- a/tasks/dungeon/ui.py +++ b/tasks/dungeon/ui.py @@ -95,6 +95,8 @@ class OcrDungeonList(Ocr): result = re.sub('^灼之形', '燔灼之形', result) # 偃偶之形•凝滞虚影 result = re.sub('^偶之形', '偃偶之形', result) + # 嗔怒之形•凝滞虚影 + result = re.sub('^怒之形', '嗔怒之形', result) # 蛀星的旧·历战余响 result = re.sub(r'蛀星的旧.*?历战', '蛀星的旧靥•历战', result) From fc480674959752f5034e4b4f6fb82818d3ace5d0 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Sun, 12 May 2024 00:28:33 +0800 Subject: [PATCH 3/4] Fix: Set nemu_ipc before screenshot_interval_set --- module/device/device.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/module/device/device.py b/module/device/device.py index 2435074ef..494914176 100644 --- a/module/device/device.py +++ b/module/device/device.py @@ -87,6 +87,12 @@ class Device(Screenshot, Control, AppControl): if self.config.EmulatorInfo_Emulator == 'auto': _ = self.emulator_instance + # SRC only, use nemu_ipc if available + available = self.nemu_ipc_available() + logger.attr('nemu_ipc_available', available) + if available: + self.config.override(Emulator_ScreenshotMethod='nemu_ipc') + self.screenshot_interval_set() self.method_check() @@ -101,12 +107,6 @@ class Device(Screenshot, Control, AppControl): if self.config.Emulator_ControlMethod == 'minitouch': self.early_minitouch_init() - # SRC only, use nemu_ipc if available - available = self.nemu_ipc_available() - logger.attr('nemu_ipc_available', available) - if available: - self.config.override(Emulator_ScreenshotMethod='nemu_ipc') - def run_simple_screenshot_benchmark(self): """ Perform a screenshot method benchmark, test 3 times on each method. From 0135bf916792efef10ab89e12f8a9397c7aaf87e Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Sun, 12 May 2024 00:45:17 +0800 Subject: [PATCH 4/4] Refactor: Set team using next prev buttons instead (#450) --- assets/share/combat/team/TEAM_2_CLICK.png | Bin 6316 -> 0 bytes assets/share/combat/team/TEAM_3_CLICK.png | Bin 6363 -> 0 bytes assets/share/combat/team/TEAM_4_CLICK.png | Bin 6263 -> 0 bytes assets/share/combat/team/TEAM_5_CLICK.png | Bin 6206 -> 0 bytes assets/share/combat/team/TEAM_7_CLICK.png | Bin 6174 -> 0 bytes assets/share/combat/team/TEAM_8_CLICK.png | Bin 6466 -> 0 bytes assets/share/combat/team/TEAM_9_CLICK.png | Bin 6393 -> 0 bytes .../team/{TEAM_6_CLICK.png => TEAM_NEXT.png} | Bin 6402 -> 8960 bytes .../team/{TEAM_1_CLICK.png => TEAM_PREV.png} | Bin 6696 -> 9623 bytes tasks/combat/assets/assets_combat_team.py | 104 +++------------ tasks/combat/team.py | 126 ++++++------------ 11 files changed, 56 insertions(+), 174 deletions(-) delete mode 100644 assets/share/combat/team/TEAM_2_CLICK.png delete mode 100644 assets/share/combat/team/TEAM_3_CLICK.png delete mode 100644 assets/share/combat/team/TEAM_4_CLICK.png delete mode 100644 assets/share/combat/team/TEAM_5_CLICK.png delete mode 100644 assets/share/combat/team/TEAM_7_CLICK.png delete mode 100644 assets/share/combat/team/TEAM_8_CLICK.png delete mode 100644 assets/share/combat/team/TEAM_9_CLICK.png rename assets/share/combat/team/{TEAM_6_CLICK.png => TEAM_NEXT.png} (56%) rename assets/share/combat/team/{TEAM_1_CLICK.png => TEAM_PREV.png} (52%) diff --git a/assets/share/combat/team/TEAM_2_CLICK.png b/assets/share/combat/team/TEAM_2_CLICK.png deleted file mode 100644 index 7a20b4e6281256d0e57c6a7f94783cc767c5f5da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6316 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 diff --git a/assets/share/combat/team/TEAM_3_CLICK.png b/assets/share/combat/team/TEAM_3_CLICK.png deleted file mode 100644 index 1d4a6130db787f4ef437a8fdeedb586f8a4eb3f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6363 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 diff --git a/assets/share/combat/team/TEAM_7_CLICK.png b/assets/share/combat/team/TEAM_7_CLICK.png deleted file mode 100644 index 9bdb478c9a34ff5298f5b131ed78e0a889f2f130..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6174 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 C&DDDV diff --git a/assets/share/combat/team/TEAM_8_CLICK.png b/assets/share/combat/team/TEAM_8_CLICK.png deleted file mode 100644 index 8e2dbcf656bfde616af0d8dfe6ae5d136073fdf0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6466 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 diff --git a/assets/share/combat/team/TEAM_9_CLICK.png b/assets/share/combat/team/TEAM_9_CLICK.png deleted file mode 100644 index 018a0efa769c100f9cb071f4c310a96e6dd487e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6393 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 diff --git a/assets/share/combat/team/TEAM_6_CLICK.png b/assets/share/combat/team/TEAM_NEXT.png similarity index 56% rename from assets/share/combat/team/TEAM_6_CLICK.png rename to assets/share/combat/team/TEAM_NEXT.png index 4fcd4b8c9a1cb620f32404aab19a4c0be43e16d8..52ee873a1fdec21b9de627d002571a9dc2c8425a 100644 GIT binary patch delta 3813 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 Y-l&3zNXe5r{Gf9l7u_q){`m9%0J7-<+W-In delta 1382 zcmV-s1)2JnOQXB7wVbDno5H@Qg@)6}Gj{gpt2;$$Q+Zt3vN~&lLN~5%0XlYDrtRgC!hWs#Ta_^n@IWFG0H_67O zOv&fNEbhF_oyA!Ud^yi^P6U%t3wD3N|3@kTu(FOFJN~IpKJxsRpPA2xsB!yoRb*A3 zJ$vC-r{CPzj2;d8+Z&5Tn&dp%+;a>~HHB3do>AK3H!i7!6%(1U-~$EaQr zrJ4W$0WPGo;=oKtM{>@BBFm+Z>a^q`i&3tegOawfPqz))gx+aG5+S)Z)C1z z?#i51%s;rfxb*(jiioI>9zHboo4t>{FUE0ERZ-O|s@f~Byms;jKUoetC_xwi;9lnl zG_bm=dPHn&Y>s`b9Cn`c82?eQp zi|aSWXzP)FfPoK*-m9utEP7Q%_1>#$9LI`i84)?mhs->D_#-cV<@m!7@9otp zGTJQDrZ)fpZgT`0SY3aaEwU=ADk^Jdb$L~d<6^q&8&R`1M8vuC7tftPJq*jw^l597 z{YL-*2*ALHD+y<2L`FqLWVR{$#`4{?1UNFI_ln569f7N&G=c#D5P*S|R#7|Co2#ZJ zzZo^Xo1SMxWMMgQoWv__Ltep|i%QP(i0s!3etU&@+ zH~?=?fUc;jzVm-PBZv7AQB!kwTx`YiW^h$iMU8!2EVkCy=f@uZ_%i!C0Sy3f&(i@0 zRy_d^*}olHAcj)*?juI*lX-PY8i&7xmi3@bc%;&SA4Xril7XSbO7+7^1 zo0}DpQ7^sp)%|;C^R_u}Tf2tEi7$O&KATPVf-k)L-ngi$MfF8RR82v+N5pJ4%!Z+5 zlYapK2zP&gfmQa-JLf<9^i!F&zGwG0zx9nv?_XZ@eqjH;ef!oUdR1M$cH?(%{JtWp zFXuvMw#cZ6vG;bzPNbco&;S4kzyK@fwb#xZ*uU@S(MK|CKFbFmJQNX;)41ojd2{23 zKYn#%V^J~BT4vm;9@Vq8vA3#4ue-)a0|0O@8+r7OI zDQ@1{{L5ee_VUX=y>#jF81vRzWM;I;y#0#I9A>k2=z;sMUcGkt^7S)kPAe(1fgt<@ ovydRP1Rucv_Fn)10RR630BKo@m(}I>;{X5v07*qoM6N<$g3ANG>;M1& diff --git a/tasks/combat/assets/assets_combat_team.py b/tasks/combat/assets/assets_combat_team.py index 757daa624..01fd9adf8 100644 --- a/tasks/combat/assets/assets_combat_team.py +++ b/tasks/combat/assets/assets_combat_team.py @@ -50,16 +50,6 @@ TEAM_1_CHECK = ButtonWrapper( button=(391, 29, 424, 56), ), ) -TEAM_1_CLICK = ButtonWrapper( - name='TEAM_1_CLICK', - share=Button( - file='./assets/share/combat/team/TEAM_1_CLICK.png', - area=(395, 32, 421, 54), - search=(375, 12, 441, 74), - color=(80, 79, 96), - button=(395, 32, 421, 54), - ), -) TEAM_2_CHECK = ButtonWrapper( name='TEAM_2_CHECK', share=Button( @@ -70,16 +60,6 @@ TEAM_2_CHECK = ButtonWrapper( button=(491, 29, 528, 56), ), ) -TEAM_2_CLICK = ButtonWrapper( - name='TEAM_2_CLICK', - share=Button( - file='./assets/share/combat/team/TEAM_2_CLICK.png', - area=(512, 32, 525, 54), - search=(492, 12, 545, 74), - color=(86, 89, 108), - button=(512, 32, 525, 54), - ), -) TEAM_3_CHECK = ButtonWrapper( name='TEAM_3_CHECK', share=Button( @@ -90,16 +70,6 @@ TEAM_3_CHECK = ButtonWrapper( button=(591, 29, 629, 56), ), ) -TEAM_3_CLICK = ButtonWrapper( - name='TEAM_3_CLICK', - share=Button( - file='./assets/share/combat/team/TEAM_3_CLICK.png', - area=(612, 32, 625, 54), - search=(592, 12, 645, 74), - color=(78, 82, 95), - button=(612, 32, 625, 54), - ), -) TEAM_4_CHECK = ButtonWrapper( name='TEAM_4_CHECK', share=Button( @@ -110,16 +80,6 @@ TEAM_4_CHECK = ButtonWrapper( button=(691, 29, 730, 56), ), ) -TEAM_4_CLICK = ButtonWrapper( - name='TEAM_4_CLICK', - share=Button( - file='./assets/share/combat/team/TEAM_4_CLICK.png', - area=(712, 32, 726, 54), - search=(692, 12, 746, 74), - color=(67, 69, 82), - button=(712, 32, 726, 54), - ), -) TEAM_5_CHECK = ButtonWrapper( name='TEAM_5_CHECK', share=Button( @@ -130,16 +90,6 @@ TEAM_5_CHECK = ButtonWrapper( button=(791, 29, 829, 56), ), ) -TEAM_5_CLICK = ButtonWrapper( - name='TEAM_5_CLICK', - share=Button( - file='./assets/share/combat/team/TEAM_5_CLICK.png', - area=(813, 32, 825, 54), - search=(793, 12, 845, 74), - color=(83, 83, 93), - button=(813, 32, 825, 54), - ), -) TEAM_6_CHECK = ButtonWrapper( name='TEAM_6_CHECK', share=Button( @@ -150,16 +100,6 @@ TEAM_6_CHECK = ButtonWrapper( button=(551, 29, 589, 56), ), ) -TEAM_6_CLICK = ButtonWrapper( - name='TEAM_6_CLICK', - share=Button( - file='./assets/share/combat/team/TEAM_6_CLICK.png', - area=(572, 32, 586, 54), - search=(552, 12, 606, 74), - color=(86, 91, 109), - button=(572, 32, 586, 54), - ), -) TEAM_7_CHECK = ButtonWrapper( name='TEAM_7_CHECK', share=Button( @@ -170,16 +110,6 @@ TEAM_7_CHECK = ButtonWrapper( button=(651, 29, 689, 56), ), ) -TEAM_7_CLICK = ButtonWrapper( - name='TEAM_7_CLICK', - share=Button( - file='./assets/share/combat/team/TEAM_7_CLICK.png', - area=(673, 32, 685, 54), - search=(653, 12, 705, 74), - color=(63, 66, 76), - button=(673, 32, 685, 54), - ), -) TEAM_8_CHECK = ButtonWrapper( name='TEAM_8_CHECK', share=Button( @@ -190,16 +120,6 @@ TEAM_8_CHECK = ButtonWrapper( button=(751, 29, 789, 56), ), ) -TEAM_8_CLICK = ButtonWrapper( - name='TEAM_8_CLICK', - share=Button( - file='./assets/share/combat/team/TEAM_8_CLICK.png', - area=(772, 32, 786, 54), - search=(752, 12, 806, 74), - color=(92, 92, 100), - button=(772, 32, 786, 54), - ), -) TEAM_9_CHECK = ButtonWrapper( name='TEAM_9_CHECK', share=Button( @@ -210,14 +130,24 @@ TEAM_9_CHECK = ButtonWrapper( button=(851, 29, 889, 56), ), ) -TEAM_9_CLICK = ButtonWrapper( - name='TEAM_9_CLICK', +TEAM_NEXT = ButtonWrapper( + name='TEAM_NEXT', share=Button( - file='./assets/share/combat/team/TEAM_9_CLICK.png', - area=(872, 32, 886, 54), - search=(852, 12, 906, 74), - color=(73, 73, 83), - button=(872, 32, 886, 54), + file='./assets/share/combat/team/TEAM_NEXT.png', + area=(1202, 313, 1234, 375), + search=(1182, 293, 1254, 395), + color=(52, 56, 77), + button=(1202, 313, 1234, 375), + ), +) +TEAM_PREV = ButtonWrapper( + name='TEAM_PREV', + share=Button( + file='./assets/share/combat/team/TEAM_PREV.png', + area=(46, 314, 78, 375), + search=(26, 294, 98, 395), + color=(108, 113, 136), + button=(46, 314, 78, 375), ), ) TEAM_SEARCH = ButtonWrapper( diff --git a/tasks/combat/team.py b/tasks/combat/team.py index babd4d29e..2282c178c 100644 --- a/tasks/combat/team.py +++ b/tasks/combat/team.py @@ -1,7 +1,6 @@ import re from module.base.timer import Timer -from module.base.utils import random_rectangle_vector_opted from module.logger import logger from tasks.base.ui import UI from tasks.combat.assets.assets_combat_team import * @@ -13,74 +12,32 @@ def button_to_index(button: ButtonWrapper) -> int: return int(res.group(1)) else: logger.warning(f'Cannot convert team button to index: {button}') - return 1 - - -def index_to_button(index: int) -> ButtonWrapper: - match index: - case 1: - return TEAM_1_CLICK - case 2: - return TEAM_2_CLICK - case 3: - return TEAM_3_CLICK - case 4: - return TEAM_4_CLICK - case 5: - return TEAM_5_CLICK - case 6: - return TEAM_6_CLICK - case 7: - return TEAM_7_CLICK - case 8: - return TEAM_8_CLICK - case 9: - return TEAM_9_CLICK - case _: - logger.warning(f'Invalid team index: {index}') - return TEAM_1_CLICK + return 0 class CombatTeam(UI): - def _get_team(self) -> tuple[list[int], int]: + def _get_team(self) -> int: """ Returns: - list[str]: List of displayed team index. - int: Current team index, or None if current team is not insight + int: Current team index, or 0 if current team is not insight """ - list_team = [] - for button in [ - TEAM_1_CLICK, TEAM_2_CLICK, TEAM_3_CLICK, TEAM_4_CLICK, TEAM_5_CLICK, - TEAM_6_CLICK, TEAM_7_CLICK, TEAM_8_CLICK, TEAM_9_CLICK - ]: - button.load_search(TEAM_SEARCH.area) - if self.appear(button): - list_team.append(button_to_index(button)) - current_team = None + team = 0 for button in [ TEAM_1_CHECK, TEAM_2_CHECK, TEAM_3_CHECK, TEAM_4_CHECK, TEAM_5_CHECK, TEAM_6_CHECK, TEAM_7_CHECK, TEAM_8_CHECK, TEAM_9_CHECK ]: button.load_search(TEAM_SEARCH.area) - if self.appear(button): - current_team = button_to_index(button) - list_team.append(button_to_index(button)) - list_team = list(sorted(list_team)) + if self.appear(button, similarity=0.92): + if self.image_color_count(button.button, color=(255, 234, 191), threshold=180, count=50): + team = button_to_index(button) + break - def show(index): - if index == current_team: - return f'*0{index}*' - else: - return f'0{index}' + return team - # [Team] 01 02 *03* 04 05 06 - logger.attr('Team', ' '.join([show(i) for i in list_team])) - return list_team, current_team - - def team_set(self, team: int = 1, skip_first_screenshot=True) -> bool: + def team_set(self, index: int = 1, skip_first_screenshot=True) -> bool: """ Args: - team: Team index, 1 to 9. + index: Team index, 1 to 9. skip_first_screenshot: Returns: @@ -89,7 +46,7 @@ class CombatTeam(UI): Pages: in: page_team """ - logger.info(f'Team set: {team}') + logger.info(f'Team set: {index}') # Wait teams show up timeout = Timer(1, count=5).start() while 1: @@ -102,18 +59,18 @@ class CombatTeam(UI): if timeout.reached(): logger.warning('Wait current team timeout') break - _, current = self._get_team() - if current: - if current == team: - logger.info(f'Selected to the correct team') - return False - else: - break + current = self._get_team() + if current == index: + logger.attr('Team', current) + logger.info(f'Already selected to the correct team') + return False + else: + break # Set team - click_interval = Timer(2) - swipe_interval = Timer(2) + retry = Timer(2, count=10) skip_first_screenshot = True + clicked = False while 1: if skip_first_screenshot: skip_first_screenshot = False @@ -121,31 +78,26 @@ class CombatTeam(UI): self.device.screenshot() # End - list_team, current = self._get_team() - if current and current == team: + current = self._get_team() + logger.attr('Team', current) + if current == index: logger.info(f'Selected to the correct team') - return True - + return clicked # Click - if team in list_team: - if click_interval.reached(): - self.device.click(index_to_button(team)) - click_interval.reset() - continue - # At left - elif team < min(list_team): - if swipe_interval.reached(): - p1, p2 = random_rectangle_vector_opted( - (350, 0), box=TEAM_SEARCH.area, random_range=(-20, -10, 20, 10)) - self.device.drag(p1, p2, name=f'TEAM_DRAG') - swipe_interval.reset() - # At right - elif team > max(list_team): - if swipe_interval.reached(): - p1, p2 = random_rectangle_vector_opted( - (-350, 0), box=TEAM_SEARCH.area, random_range=(-20, -10, 20, 10)) - self.device.drag(p1, p2, name=f'TEAM_DRAG') - swipe_interval.reset() + if retry.reached(): + diff = index - current + right = diff % 9 + left = -diff % 9 + if right <= left: + self.device.multi_click(TEAM_NEXT, right) + clicked = True + else: + self.device.multi_click(TEAM_PREV, left) + clicked = True + retry.reset() + continue + + return clicked def handle_combat_team_prepare(self, team: int = 1) -> bool: """