|
@@ -56,22 +56,44 @@ class ScriptTask(GameUi, DelegationAssets):
|
|
|
if not self.ocr_appear(self.O_D_NAME):
|
|
if not self.ocr_appear(self.O_D_NAME):
|
|
|
logger.warning(f'Delegation: {name} not found')
|
|
logger.warning(f'Delegation: {name} not found')
|
|
|
return False
|
|
return False
|
|
|
|
|
+ enter_timer = Timer(15).start()
|
|
|
while 1:
|
|
while 1:
|
|
|
self.screenshot()
|
|
self.screenshot()
|
|
|
if self.appear(self.I_D_START):
|
|
if self.appear(self.I_D_START):
|
|
|
break
|
|
break
|
|
|
|
|
+ if enter_timer.reached():
|
|
|
|
|
+ logger.warning(f'Delegation: {name} enter timeout')
|
|
|
|
|
+ return False
|
|
|
|
|
+
|
|
|
|
|
+ # 检测到弹出的勾玉确认框,优先点击取消保护勾玉
|
|
|
|
|
+ if self.appear_then_click(self.I_UI_CANCEL, interval=1):
|
|
|
|
|
+ continue
|
|
|
|
|
+
|
|
|
# 如果出现’召回‘ ’返回‘ 说明这个是现在委派中
|
|
# 如果出现’召回‘ ’返回‘ 说明这个是现在委派中
|
|
|
# 需要退出
|
|
# 需要退出
|
|
|
if self.appear(self.I_D_BACK):
|
|
if self.appear(self.I_D_BACK):
|
|
|
logger.warning(f'Delegation: {name} is in delegation')
|
|
logger.warning(f'Delegation: {name} is in delegation')
|
|
|
- self.ui_click_until_disappear(self.I_D_BACK)
|
|
|
|
|
- self.wait_until_appear(self.I_REWARDS_MIN)
|
|
|
|
|
|
|
+ back_timer = Timer(6).start()
|
|
|
|
|
+ while 1:
|
|
|
|
|
+ self.screenshot()
|
|
|
|
|
+ if not self.appear(self.I_D_BACK):
|
|
|
|
|
+ break
|
|
|
|
|
+ if back_timer.reached():
|
|
|
|
|
+ logger.warning('Exit delegation detail timeout')
|
|
|
|
|
+ break
|
|
|
|
|
+ # 若此时被取消弹窗遮挡返回,优先点取消
|
|
|
|
|
+ if self.appear_then_click(self.I_UI_CANCEL, interval=1):
|
|
|
|
|
+ continue
|
|
|
|
|
+ if self.appear_then_click(self.I_D_BACK, interval=1.2):
|
|
|
|
|
+ continue
|
|
|
|
|
+ self.wait_until_appear(self.I_REWARDS_MIN, wait_time=3)
|
|
|
return False
|
|
return False
|
|
|
if self.appear_then_click(self.I_D_SKIP, interval=0.8):
|
|
if self.appear_then_click(self.I_D_SKIP, interval=0.8):
|
|
|
continue
|
|
continue
|
|
|
if self.appear_then_click(self.I_D_CONFIRM, interval=0.8):
|
|
if self.appear_then_click(self.I_D_CONFIRM, interval=0.8):
|
|
|
continue
|
|
continue
|
|
|
- if self.ocr_appear_click(self.O_D_NAME, interval=1):
|
|
|
|
|
|
|
+ # 点击委派任务名:防抖由 1s 提升至 3s,杜绝跨页面过渡时误触右上角"完成(30勾玉)"
|
|
|
|
|
+ if self.ocr_appear_click(self.O_D_NAME, interval=3):
|
|
|
continue
|
|
continue
|
|
|
# 进入委派 fefe e fe
|
|
# 进入委派 fefe e fe
|
|
|
logger.info(f'Enter Delegation: {name}')
|
|
logger.info(f'Enter Delegation: {name}')
|
|
@@ -81,10 +103,14 @@ class ScriptTask(GameUi, DelegationAssets):
|
|
|
ui_click(self.C_D_4, self.I_D_SELECT_4)
|
|
ui_click(self.C_D_4, self.I_D_SELECT_4)
|
|
|
# 委派开始
|
|
# 委派开始
|
|
|
logger.info(f'Delegation: {name} start')
|
|
logger.info(f'Delegation: {name} start')
|
|
|
|
|
+ start_timer = Timer(10).start()
|
|
|
while 1:
|
|
while 1:
|
|
|
self.screenshot()
|
|
self.screenshot()
|
|
|
if not self.appear(self.I_D_START):
|
|
if not self.appear(self.I_D_START):
|
|
|
break
|
|
break
|
|
|
|
|
+ if start_timer.reached():
|
|
|
|
|
+ logger.warning(f'Delegation: {name} start timeout')
|
|
|
|
|
+ break
|
|
|
if self.click(self.C_D_5, interval=0.8):
|
|
if self.click(self.C_D_5, interval=0.8):
|
|
|
continue
|
|
continue
|
|
|
if self.appear_then_click(self.I_D_START, interval=1.8):
|
|
if self.appear_then_click(self.I_D_START, interval=1.8):
|