|
|
@@ -20,7 +20,7 @@ class ScriptTask(GameUi, SoulsTidyAssets):
|
|
|
self.ui_get_current_page()
|
|
|
self.ui_goto(page_shikigami_records)
|
|
|
con = self.config.souls_tidy
|
|
|
- if con.simple_tidy.greed_maneki:
|
|
|
+ if con.simple_tidy.enable_greed or con.simple_tidy.enable_maneki:
|
|
|
self.goto_souls()
|
|
|
self.greed_maneki()
|
|
|
self.back_records()
|
|
|
@@ -61,31 +61,32 @@ class ScriptTask(GameUi, SoulsTidyAssets):
|
|
|
:return:
|
|
|
"""
|
|
|
# 先是贪吃鬼
|
|
|
- logger.hr('Greed Ghost')
|
|
|
- self.ui_click(self.I_ST_GREED, self.I_ST_GREED_HABIT)
|
|
|
- self.ui_click(self.I_ST_GREED_HABIT, self.I_ST_FEED_NOW)
|
|
|
- logger.info('Feed greed ghost')
|
|
|
- feed_count = 0
|
|
|
- while 1:
|
|
|
- self.screenshot()
|
|
|
- if self.appear(self.I_ST_UNSELECTED):
|
|
|
- self.ui_click_until_disappear(self.I_ST_UNSELECTED)
|
|
|
- continue
|
|
|
- if self.appear_then_click(self.I_UI_CONFIRM, interval=0.5):
|
|
|
- continue
|
|
|
- if feed_count >= 3:
|
|
|
- break
|
|
|
- if self.appear_then_click(self.I_ST_FEED_NOW, interval=3.5):
|
|
|
- feed_count += 1
|
|
|
- continue
|
|
|
- logger.info('Feed greed ghost done')
|
|
|
+ if self.config.souls_tidy.simple_tidy.enable_greed:
|
|
|
+ logger.hr('Greed Ghost')
|
|
|
+ self.ui_click(self.I_ST_GREED, self.I_ST_GREED_HABIT)
|
|
|
+ self.ui_click(self.I_ST_GREED_HABIT, self.I_ST_FEED_NOW)
|
|
|
+ logger.info('Feed greed ghost')
|
|
|
+ feed_count = 0
|
|
|
+ while 1:
|
|
|
+ self.screenshot()
|
|
|
+ if self.appear(self.I_ST_UNSELECTED):
|
|
|
+ self.ui_click_until_disappear(self.I_ST_UNSELECTED)
|
|
|
+ continue
|
|
|
+ if self.appear_then_click(self.I_UI_CONFIRM, interval=0.5):
|
|
|
+ continue
|
|
|
+ if feed_count >= 3:
|
|
|
+ break
|
|
|
+ if self.appear_then_click(self.I_ST_FEED_NOW, interval=3.5):
|
|
|
+ feed_count += 1
|
|
|
+ continue
|
|
|
+ logger.info('Feed greed ghost done')
|
|
|
# 关闭贪吃鬼, 进入奉纳
|
|
|
while 1:
|
|
|
self.screenshot()
|
|
|
if self.appear(self.I_ST_CAT):
|
|
|
# 出现招财猫
|
|
|
break
|
|
|
-
|
|
|
+
|
|
|
# https://github.com/runhey/OnmyojiAutoScript/issues/662
|
|
|
if self.appear(self.I_ST_UNSELECTED):
|
|
|
self.ui_click_until_disappear(self.I_ST_UNSELECTED)
|
|
|
@@ -97,76 +98,77 @@ class ScriptTask(GameUi, SoulsTidyAssets):
|
|
|
continue
|
|
|
if self.appear_then_click(self.I_ST_BONGNA, interval=1, threshold=0.6):
|
|
|
continue
|
|
|
- logger.hr('Enter bongna')
|
|
|
- # 进入已弃置界面
|
|
|
- """
|
|
|
- 现在默认进入就是已弃置界面,所以不需要点击
|
|
|
- """
|
|
|
- # 确保是按照等级来排序的
|
|
|
- while 1:
|
|
|
- self.screenshot()
|
|
|
- if self.ocr_appear(self.O_ST_SORT_LEVEL_1):
|
|
|
- break
|
|
|
- if self.ocr_appear_click(self.O_ST_SORT_LEVEL_2, interval=0.6):
|
|
|
- continue
|
|
|
- if self.ocr_appear_click(self.O_ST_SORT_TIME, interval=2):
|
|
|
- continue
|
|
|
- if self.ocr_appear_click(self.O_ST_SORT_TYPE, interval=2):
|
|
|
- continue
|
|
|
- if self.ocr_appear_click(self.O_ST_SORT_LOCATION, interval=2):
|
|
|
- continue
|
|
|
- logger.info('Sort by level')
|
|
|
- # 开始奉纳
|
|
|
- while 1:
|
|
|
- self.wait_until_appear(self.I_ST_LEVEL_0, wait_time=2)
|
|
|
- self.screenshot()
|
|
|
- # 非+0的不弃置 双保险
|
|
|
- if not self.appear(self.I_ST_LEVEL_0):
|
|
|
- logger.info("First Orichi isn't Level 0,quit")
|
|
|
- break
|
|
|
- firvel = self.O_ST_FIRSET_LEVEL.ocr(self.device.image)
|
|
|
- if firvel is None or firvel == '':
|
|
|
- logger.info('ocr result is Null')
|
|
|
- continue
|
|
|
- if firvel != '古':
|
|
|
- # 问就是 把 +0 识别成了 古
|
|
|
- logger.info('No zero level, bongna done')
|
|
|
- break
|
|
|
-
|
|
|
- # !!!!!! 这里没有检查金币是否足够
|
|
|
- # 长按
|
|
|
- self.click(self.L_ONE, interval=2.5)
|
|
|
- self.screenshot()
|
|
|
- gold_amount = self.O_ST_GOLD.ocr(self.device.image)
|
|
|
- if not isinstance(gold_amount, int):
|
|
|
- logger.warning('Gold amount not int, skip')
|
|
|
- continue
|
|
|
- if gold_amount == 0:
|
|
|
- continue
|
|
|
-
|
|
|
- # 点击奉纳收取奖励
|
|
|
- if not self.appear(self.I_ST_DONATE):
|
|
|
- logger.warning('Donate button not appear, skip')
|
|
|
- continue
|
|
|
- # 点击奉纳 及收取奖励
|
|
|
+ if self.config.souls_tidy.simple_tidy.enable_maneki:
|
|
|
+ logger.hr('Enter bongna')
|
|
|
+ # 进入已弃置界面
|
|
|
+ """
|
|
|
+ 现在默认进入就是已弃置界面,所以不需要点击
|
|
|
+ """
|
|
|
+ # 确保是按照等级来排序的
|
|
|
while 1:
|
|
|
self.screenshot()
|
|
|
- if self.appear_then_click(self.I_UI_CONFIRM, interval=0.5):
|
|
|
+ if self.ocr_appear(self.O_ST_SORT_LEVEL_1):
|
|
|
+ break
|
|
|
+ if self.ocr_appear_click(self.O_ST_SORT_LEVEL_2, interval=0.6):
|
|
|
+ continue
|
|
|
+ if self.ocr_appear_click(self.O_ST_SORT_TIME, interval=2):
|
|
|
continue
|
|
|
- # 如果奉纳少就不是神赐而是获得奖励
|
|
|
- if self.ui_reward_appear_click():
|
|
|
+ if self.ocr_appear_click(self.O_ST_SORT_TYPE, interval=2):
|
|
|
continue
|
|
|
- # 出现神赐, 就点击然后消失,
|
|
|
- if self.appear(self.I_ST_GOD_PRESENT):
|
|
|
- logger.info('God present appear')
|
|
|
- self.click(self.C_ST_GOD_PRSENT, interval=2)
|
|
|
+ if self.ocr_appear_click(self.O_ST_SORT_LOCATION, interval=2):
|
|
|
continue
|
|
|
- if self.appear_then_click(self.I_ST_DONATE, interval=5.5):
|
|
|
- self.wait_until_appear(self.I_ST_GOLD, True, wait_time=5)
|
|
|
+ logger.info('Sort by level')
|
|
|
+ # 开始奉纳
|
|
|
+ while 1:
|
|
|
+ self.wait_until_appear(self.I_ST_LEVEL_0, wait_time=2)
|
|
|
+ self.screenshot()
|
|
|
+ # 非+0的不弃置 双保险
|
|
|
+ if not self.appear(self.I_ST_LEVEL_0):
|
|
|
+ logger.info("First Orichi isn't Level 0,quit")
|
|
|
+ break
|
|
|
+ firvel = self.O_ST_FIRSET_LEVEL.ocr(self.device.image)
|
|
|
+ if firvel is None or firvel == '':
|
|
|
+ logger.info('ocr result is Null')
|
|
|
continue
|
|
|
- if not self.appear(self.I_ST_GOLD):
|
|
|
+ if firvel != '古':
|
|
|
+ # 问就是 把 +0 识别成了 古
|
|
|
+ logger.info('No zero level, bongna done')
|
|
|
break
|
|
|
- logger.info('Donate one')
|
|
|
+
|
|
|
+ # !!!!!! 这里没有检查金币是否足够
|
|
|
+ # 长按
|
|
|
+ self.click(self.L_ONE, interval=2.5)
|
|
|
+ self.screenshot()
|
|
|
+ gold_amount = self.O_ST_GOLD.ocr(self.device.image)
|
|
|
+ if not isinstance(gold_amount, int):
|
|
|
+ logger.warning('Gold amount not int, skip')
|
|
|
+ continue
|
|
|
+ if gold_amount == 0:
|
|
|
+ continue
|
|
|
+
|
|
|
+ # 点击奉纳收取奖励
|
|
|
+ if not self.appear(self.I_ST_DONATE):
|
|
|
+ logger.warning('Donate button not appear, skip')
|
|
|
+ continue
|
|
|
+ # 点击奉纳 及收取奖励
|
|
|
+ while 1:
|
|
|
+ self.screenshot()
|
|
|
+ if self.appear_then_click(self.I_UI_CONFIRM, interval=0.5):
|
|
|
+ continue
|
|
|
+ # 如果奉纳少就不是神赐而是获得奖励
|
|
|
+ if self.ui_reward_appear_click():
|
|
|
+ continue
|
|
|
+ # 出现神赐, 就点击然后消失,
|
|
|
+ if self.appear(self.I_ST_GOD_PRESENT):
|
|
|
+ logger.info('God present appear')
|
|
|
+ self.click(self.C_ST_GOD_PRSENT, interval=2)
|
|
|
+ continue
|
|
|
+ if self.appear_then_click(self.I_ST_DONATE, interval=5.5):
|
|
|
+ self.wait_until_appear(self.I_ST_GOLD, True, wait_time=5)
|
|
|
+ continue
|
|
|
+ if not self.appear(self.I_ST_GOLD):
|
|
|
+ break
|
|
|
+ logger.info('Donate one')
|
|
|
|
|
|
logger.info('Bongna done')
|
|
|
|
|
|
@@ -175,7 +177,7 @@ if __name__ == '__main__':
|
|
|
from module.config.config import Config
|
|
|
from module.device.device import Device
|
|
|
|
|
|
- c = Config('oas1')
|
|
|
+ c = Config('oas3')
|
|
|
d = Device(c)
|
|
|
t = ScriptTask(c, d)
|
|
|
|