|
|
@@ -64,8 +64,12 @@ class ScriptTask(WQExplore, SecretScriptTask, WantedQuestsAssets):
|
|
|
if self.ocr_appear(self.O_WQ_TEXT_1, interval=1):
|
|
|
cu, re, total = self.O_WQ_NUM_1.ocr(self.device.image)
|
|
|
if cu == re == total == 0:
|
|
|
- logger.warning('OCR failed and skip this round')
|
|
|
+ logger.warning('OCR failed and have a try')
|
|
|
ocr_error_count += 1
|
|
|
+ # 尝试打一次
|
|
|
+ unknown_num = self.O_WQ_NUM_UNKNOWN_1.ocr(self.device.image)
|
|
|
+ if unknown_num > 14:
|
|
|
+ self.execute_mission(self.O_WQ_TEXT_1, 1, number_challenge)
|
|
|
if cu > total:
|
|
|
logger.warning('Current number of wanted quests is greater than total number')
|
|
|
cu = cu % 10
|
|
|
@@ -75,8 +79,12 @@ class ScriptTask(WQExplore, SecretScriptTask, WantedQuestsAssets):
|
|
|
if self.ocr_appear(self.O_WQ_TEXT_2, interval=1):
|
|
|
cu, re, total = self.O_WQ_NUM_2.ocr(self.device.image)
|
|
|
if cu == re == total == 0:
|
|
|
- logger.warning('OCR failed and skip this round')
|
|
|
+ logger.warning('OCR failed and have a try')
|
|
|
ocr_error_count += 1
|
|
|
+ # 尝试打一次
|
|
|
+ unknown_num = self.O_WQ_NUM_UNKNOWN_2.ocr(self.device.image)
|
|
|
+ if unknown_num > 14:
|
|
|
+ self.execute_mission(self.O_WQ_TEXT_2, 1, number_challenge)
|
|
|
if cu > total:
|
|
|
logger.warning('Current number of wanted quests is greater than total number')
|
|
|
cu = cu % 10
|
|
|
@@ -177,8 +185,13 @@ class ScriptTask(WQExplore, SecretScriptTask, WantedQuestsAssets):
|
|
|
:return:
|
|
|
(type, destination, number, goto_button)
|
|
|
(类型, 地点层级,可以打败的数量,前往按钮)
|
|
|
- 类型: 探索0, 挑战1, 秘闻2
|
|
|
+ 类型: 挑战0, 秘闻1, 探索2
|
|
|
"""
|
|
|
+ layer_limit = {
|
|
|
+ # 低层不限制
|
|
|
+ # "壹", "贰", "叁", "肆", "伍", "陆",
|
|
|
+ "柒", "捌", "玖", "拾"
|
|
|
+ }
|
|
|
result = [-1, '', -1, GOTO_BUTTON[index]]
|
|
|
type_wq = OCR_WQ_TYPE[index].ocr(self.device.image)
|
|
|
info_wq_1 = OCR_WQ_INFO[index].ocr(self.device.image)
|
|
|
@@ -189,13 +202,17 @@ class ScriptTask(WQExplore, SecretScriptTask, WantedQuestsAssets):
|
|
|
return None
|
|
|
wq_destination = match.group(1)
|
|
|
wq_number = int(match.group(2))
|
|
|
+ # 跳过高层秘闻
|
|
|
+ if wq_destination[-1] in layer_limit:
|
|
|
+ logger.warning('This secret layer is too high')
|
|
|
+ return None
|
|
|
result[1] = wq_destination
|
|
|
result[2] = wq_number
|
|
|
- if type_wq == '探索':
|
|
|
- result[0] = 0
|
|
|
- elif type_wq == '挑战':
|
|
|
- result[0] = 1 if num_challenge >= 10 else -1
|
|
|
+ if type_wq == '挑战':
|
|
|
+ result[0] = 0 if num_challenge >= 10 else -1
|
|
|
elif type_wq == '秘闻':
|
|
|
+ result[0] = 1
|
|
|
+ elif type_wq == '探索':
|
|
|
result[0] = 2
|
|
|
logger.info(f'[Wanted Quests] type: {type_wq} destination: {wq_destination} number: {wq_number} ')
|
|
|
return tuple(result) if result[0] != -1 else None
|
|
|
@@ -229,11 +246,11 @@ class ScriptTask(WQExplore, SecretScriptTask, WantedQuestsAssets):
|
|
|
try:
|
|
|
match best_type:
|
|
|
case 0:
|
|
|
- self.explore(goto_button, do_number)
|
|
|
- case 1:
|
|
|
self.challenge(goto_button, do_number)
|
|
|
- case 2:
|
|
|
+ case 1:
|
|
|
self.secret(goto_button, do_number)
|
|
|
+ case 2:
|
|
|
+ self.explore(goto_button, do_number)
|
|
|
case _:
|
|
|
logger.warning('No wanted quests can be challenged')
|
|
|
except ExploreWantedBoss:
|