|
@@ -160,6 +160,7 @@ class LoginHandler(BaseTask, RestartAssets):
|
|
|
"""
|
|
"""
|
|
|
logger.hr('Harvest')
|
|
logger.hr('Harvest')
|
|
|
timer_harvest = Timer(5) # 如果连续5秒没有发现任何奖励,退出
|
|
timer_harvest = Timer(5) # 如果连续5秒没有发现任何奖励,退出
|
|
|
|
|
+ skip_default = False
|
|
|
while 1:
|
|
while 1:
|
|
|
self.screenshot()
|
|
self.screenshot()
|
|
|
|
|
|
|
@@ -181,12 +182,18 @@ class LoginHandler(BaseTask, RestartAssets):
|
|
|
timer_harvest.reset()
|
|
timer_harvest.reset()
|
|
|
logger.info('Close yellow close')
|
|
logger.info('Close yellow close')
|
|
|
continue
|
|
continue
|
|
|
- # 关闭宠物小屋
|
|
|
|
|
|
|
+ # 关闭宠物小屋
|
|
|
if self.appear_then_click(self.I_HARVEST_BACK_PET_HOUSE, interval=0.6):
|
|
if self.appear_then_click(self.I_HARVEST_BACK_PET_HOUSE, interval=0.6):
|
|
|
timer_harvest.reset()
|
|
timer_harvest.reset()
|
|
|
logger.info('Close yellow close')
|
|
logger.info('Close yellow close')
|
|
|
continue
|
|
continue
|
|
|
- # 关闭姿度出现的蒙版
|
|
|
|
|
|
|
+ # 御魂溢确认
|
|
|
|
|
+ if self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=2.5):
|
|
|
|
|
+ timer_harvest.reset()
|
|
|
|
|
+ skip_default = True
|
|
|
|
|
+ logger.info('Soul overflow')
|
|
|
|
|
+ continue
|
|
|
|
|
+ # 关闭姿度出现的蒙版
|
|
|
if self.appear(self.I_HARVEST_ZIDU, interval=1):
|
|
if self.appear(self.I_HARVEST_ZIDU, interval=1):
|
|
|
timer_harvest.reset()
|
|
timer_harvest.reset()
|
|
|
self.I_HARVEST_ZIDU.roi_front[0] -= 200
|
|
self.I_HARVEST_ZIDU.roi_front[0] -= 200
|
|
@@ -219,38 +226,8 @@ class LoginHandler(BaseTask, RestartAssets):
|
|
|
if self.appear_then_click(self.I_HARVEST_SIGN_999, interval=1.5):
|
|
if self.appear_then_click(self.I_HARVEST_SIGN_999, interval=1.5):
|
|
|
timer_harvest.reset()
|
|
timer_harvest.reset()
|
|
|
continue
|
|
continue
|
|
|
- # 邮件
|
|
|
|
|
# 判断是否勾选了收取邮件(不收取邮件可以查看每日收获)
|
|
# 判断是否勾选了收取邮件(不收取邮件可以查看每日收获)
|
|
|
- if self.config.restart.harvest_config.enable_mail:
|
|
|
|
|
- # if self.appear_then_click(self.I_HARVEST_MAIL, interval=3) or\
|
|
|
|
|
- # self.appear_then_click(self.I_HARVEST_MAIL_COPY, interval=3):
|
|
|
|
|
- # timer_harvest.reset()
|
|
|
|
|
- # self.wait_until_appear(self.I_HARVEST_MAIL_TITLE, wait_time=2)
|
|
|
|
|
- # if self.appear(self.I_HARVEST_MAIL_TITLE, interval=2.5):
|
|
|
|
|
- # while 1:
|
|
|
|
|
- # self.screenshot()
|
|
|
|
|
- # if self.appear_then_click(self.I_HARVEST_MAIL_ALL, interval=2):
|
|
|
|
|
- # timer_harvest.reset()
|
|
|
|
|
- # pass
|
|
|
|
|
- # if self.appear_then_click(self.I_HARVEST_MAIL_CONFIRM, interval=1):
|
|
|
|
|
- # continue
|
|
|
|
|
- #
|
|
|
|
|
- # # 如果一直出现收取全部,那就说明还在进行中
|
|
|
|
|
- # if self.appear(self.I_HARVEST_MAIL_ALL):
|
|
|
|
|
- # pass
|
|
|
|
|
- # # 如果没有出现 ‘收取全部’ 也没有出现 ‘还未读的邮件’ 那就可以退出了
|
|
|
|
|
- # if not self.appear(self.I_HARVEST_MAIL_ALL) and not self.appear(self.I_HARVEST_MAIL_OPEN):
|
|
|
|
|
- # logger.info('Mail has been harvested')
|
|
|
|
|
- # logger.info('Exit mail')
|
|
|
|
|
- # break
|
|
|
|
|
- # if self.appear(self.I_LOGIN_RED_CLOSE, interval=2):
|
|
|
|
|
- # self.click(self.I_LOGIN_RED_CLOSE)
|
|
|
|
|
- # break
|
|
|
|
|
- # if self.appear_then_click(self.I_HARVEST_MAIL_OPEN, interval=1):
|
|
|
|
|
- # timer_harvest.reset()
|
|
|
|
|
- # continue
|
|
|
|
|
- # continue
|
|
|
|
|
- # 体力
|
|
|
|
|
|
|
+ if not skip_default and self.config.restart.harvest_config.enable_mail:
|
|
|
if self.appear(self.I_HARVEST_MAIL_CONFIRM):
|
|
if self.appear(self.I_HARVEST_MAIL_CONFIRM):
|
|
|
self.click(self.I_HARVEST_MAIL_CONFIRM, interval=2)
|
|
self.click(self.I_HARVEST_MAIL_CONFIRM, interval=2)
|
|
|
timer_harvest.reset()
|
|
timer_harvest.reset()
|
|
@@ -288,7 +265,7 @@ class LoginHandler(BaseTask, RestartAssets):
|
|
|
timer_harvest.reset()
|
|
timer_harvest.reset()
|
|
|
continue
|
|
continue
|
|
|
# 自选御魂
|
|
# 自选御魂
|
|
|
- if self.appear(self.I_HARVEST_SOUL_1):
|
|
|
|
|
|
|
+ if not skip_default and self.appear(self.I_HARVEST_SOUL_1):
|
|
|
logger.info('Select soul 2')
|
|
logger.info('Select soul 2')
|
|
|
self.ui_click(self.I_HARVEST_SOUL_1, stop=self.I_HARVEST_SOUL_2)
|
|
self.ui_click(self.I_HARVEST_SOUL_1, stop=self.I_HARVEST_SOUL_2)
|
|
|
self.ui_click(self.I_HARVEST_SOUL_2, stop=self.I_HARVEST_SOUL_3, interval=3)
|
|
self.ui_click(self.I_HARVEST_SOUL_2, stop=self.I_HARVEST_SOUL_3, interval=3)
|