Skip to content

Commit 9dc3651

Browse files
committed
Fix: use appear with offset in gear code
1 parent f83325f commit 9dc3651

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

module/equipment/equipment_code.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ def enter_equip_code_page(self, skip_first_screenshot=True):
9292
self.device.screenshot()
9393

9494
# End
95-
if self.appear(EQUIPMENT_CODE_PAGE_CHECK):
95+
if self.appear(EQUIPMENT_CODE_PAGE_CHECK, offset=(5, 5)):
9696
break
9797

98-
if self.appear_then_click(EQUIPMENT_CODE_ENTRANCE):
98+
if self.appear_then_click(EQUIPMENT_CODE_ENTRANCE, offset=(5, 5)):
9999
continue
100100

101101
# def exit_equip_code_page(self):
@@ -122,7 +122,7 @@ def click_export_button(self, skip_first_screenshot=True):
122122
if self.info_bar_count():
123123
break
124124

125-
if self.appear_then_click(EQUIPMENT_CODE_EXPORT, interval=1):
125+
if self.appear_then_click(EQUIPMENT_CODE_EXPORT, offset=(5, 5), interval=1):
126126
continue
127127

128128
def export_equip_code(self, ship=None):
@@ -149,7 +149,7 @@ def equip_preview_empty(self):
149149
else:
150150
max_index = 6
151151
for index in range(max_index):
152-
if not self.appear(globals()['EQUIPMENT_CODE_EQUIP_{index}'.format(index=index)]):
152+
if not self.appear(globals()['EQUIPMENT_CODE_EQUIP_{index}'.format(index=index)], offset=(5, 5)):
153153
return False
154154

155155
return True
@@ -166,7 +166,7 @@ def clear_equip_preview(self, skip_first_screenshot=True):
166166
logger.info('Confirm equipment preview cleared.')
167167
break
168168

169-
if self.appear_then_click(EQUIPMENT_CODE_CLEAR):
169+
if self.appear_then_click(EQUIPMENT_CODE_CLEAR, offset=(5, 5)):
170170
continue
171171

172172
def enter_equip_code_input_mode(self, skip_first_screenshot=True):
@@ -176,7 +176,7 @@ def enter_equip_code_input_mode(self, skip_first_screenshot=True):
176176
else:
177177
self.device.screenshot()
178178

179-
if self.appear(EQUIPMENT_CODE_ENTER):
179+
if self.appear(EQUIPMENT_CODE_ENTER, offset=(5, 5)):
180180
self.device.click(EQUIPMENT_CODE_TEXTBOX)
181181
continue
182182

@@ -192,7 +192,7 @@ def confirm_equip_code(self, skip_first_screenshot=False):
192192
else:
193193
self.device.screenshot()
194194

195-
if self.appear_then_click(EQUIPMENT_CODE_ENTER, interval=1):
195+
if self.appear_then_click(EQUIPMENT_CODE_ENTER, offset=(5, 5), interval=1):
196196
continue
197197

198198
# End
@@ -212,14 +212,14 @@ def confirm_equip_preview(self, skip_first_screenshot=True):
212212
else:
213213
self.device.screenshot()
214214

215-
if self.appear_then_click(EQUIPMENT_CODE_CONFIRM, interval=5):
215+
if self.appear_then_click(EQUIPMENT_CODE_CONFIRM, offset=(5, 5), interval=5):
216216
continue
217217

218218
if self.handle_popup_confirm('EQUIPMENT_CODE'):
219219
continue
220220

221221
# End
222-
if self.appear(EQUIPMENT_CODE_ENTRANCE):
222+
if self.appear(EQUIPMENT_CODE_ENTRANCE, offset=(5, 5)):
223223
return True
224224
if self.appear(EQUIPMENT_FULL, offset=(30, 30)):
225225
return False

0 commit comments

Comments
 (0)