|
@@ -44,29 +44,34 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
|
|
|
|
|
|
|
|
self.ui_get_current_page()
|
|
self.ui_get_current_page()
|
|
|
self.ui_goto(page_main)
|
|
self.ui_goto(page_main)
|
|
|
|
|
+
|
|
|
|
|
+ self.open_buff()
|
|
|
|
|
+ self.soul(is_open=True)
|
|
|
|
|
+ self.close_buff()
|
|
|
|
|
+
|
|
|
self.home_main()
|
|
self.home_main()
|
|
|
|
|
|
|
|
# 选择是游戏的体力还是活动的体力
|
|
# 选择是游戏的体力还是活动的体力
|
|
|
current_ap = config.general_climb.ap_mode
|
|
current_ap = config.general_climb.ap_mode
|
|
|
- self.switch(current_ap)
|
|
|
|
|
|
|
+ #self.switch(current_ap)
|
|
|
|
|
|
|
|
# 设定是否锁定阵容
|
|
# 设定是否锁定阵容
|
|
|
- if config.general_battle.lock_team_enable:
|
|
|
|
|
- logger.info("Lock team")
|
|
|
|
|
- while 1:
|
|
|
|
|
- self.screenshot()
|
|
|
|
|
- if self.appear_then_click(self.I_UNLOCK, interval=1):
|
|
|
|
|
- continue
|
|
|
|
|
- if self.appear(self.I_LOCK):
|
|
|
|
|
- break
|
|
|
|
|
- else:
|
|
|
|
|
- logger.info("Unlock team")
|
|
|
|
|
- while 1:
|
|
|
|
|
- self.screenshot()
|
|
|
|
|
- if self.appear_then_click(self.I_LOCK, interval=1):
|
|
|
|
|
- continue
|
|
|
|
|
- if self.appear(self.I_UNLOCK):
|
|
|
|
|
- break
|
|
|
|
|
|
|
+ # if config.general_battle.lock_team_enable:
|
|
|
|
|
+ # logger.info("Lock team")
|
|
|
|
|
+ # while 1:
|
|
|
|
|
+ # self.screenshot()
|
|
|
|
|
+ # if self.appear_then_click(self.I_UNLOCK, interval=1):
|
|
|
|
|
+ # continue
|
|
|
|
|
+ # if self.appear(self.I_LOCK):
|
|
|
|
|
+ # break
|
|
|
|
|
+ # else:
|
|
|
|
|
+ # logger.info("Unlock team")
|
|
|
|
|
+ # while 1:
|
|
|
|
|
+ # self.screenshot()
|
|
|
|
|
+ # if self.appear_then_click(self.I_LOCK, interval=1):
|
|
|
|
|
+ # continue
|
|
|
|
|
+ # if self.appear(self.I_UNLOCK):
|
|
|
|
|
+ # break
|
|
|
|
|
|
|
|
# 流程应该是 在页面处:
|
|
# 流程应该是 在页面处:
|
|
|
# 1. 判定计数是否超了,时间是否超了
|
|
# 1. 判定计数是否超了,时间是否超了
|
|
@@ -122,6 +127,9 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
|
|
|
logger.info("General battle success")
|
|
logger.info("General battle success")
|
|
|
|
|
|
|
|
self.main_home()
|
|
self.main_home()
|
|
|
|
|
+ self.open_buff()
|
|
|
|
|
+ self.soul(is_open=False)
|
|
|
|
|
+ self.close_buff()
|
|
|
if config.general_climb.active_souls_clean:
|
|
if config.general_climb.active_souls_clean:
|
|
|
self.set_next_run(task='SoulsTidy', success=False, finish=False, target=datetime.now())
|
|
self.set_next_run(task='SoulsTidy', success=False, finish=False, target=datetime.now())
|
|
|
self.set_next_run(task="ActivityShikigami", success=True)
|
|
self.set_next_run(task="ActivityShikigami", success=True)
|
|
@@ -140,8 +148,7 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
|
|
|
break
|
|
break
|
|
|
if self.appear_then_click(self.I_SHI, interval=1):
|
|
if self.appear_then_click(self.I_SHI, interval=1):
|
|
|
continue
|
|
continue
|
|
|
- if self.appear_then_click(self.I_DRUM, interval=1):
|
|
|
|
|
- continue
|
|
|
|
|
|
|
+
|
|
|
if self.appear_then_click(self.I_BATTLE, interval=1):
|
|
if self.appear_then_click(self.I_BATTLE, interval=1):
|
|
|
continue
|
|
continue
|
|
|
|
|
|