|
@@ -292,7 +292,9 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
|
|
|
self.screenshot()
|
|
self.screenshot()
|
|
|
if not self.appear(self.I_FORM_TEAM):
|
|
if not self.appear(self.I_FORM_TEAM):
|
|
|
break
|
|
break
|
|
|
- if self.appear_then_click(self.I_BACK_BL, interval=1):
|
|
|
|
|
|
|
+ if self.appear_then_click(self.I_BACK_BL, interval=2):
|
|
|
|
|
+ continue
|
|
|
|
|
+ if self.appear_then_click(self.I_UI_BACK_YELLOW, interval=2):
|
|
|
continue
|
|
continue
|
|
|
|
|
|
|
|
self.ui_current = page_soul_zones
|
|
self.ui_current = page_soul_zones
|
|
@@ -302,159 +304,161 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
|
|
|
logger.error('Wild mode is not implemented')
|
|
logger.error('Wild mode is not implemented')
|
|
|
pass
|
|
pass
|
|
|
|
|
|
|
|
|
|
+ # def battle_wait(self, random_click_swipt_enable: bool) -> bool:
|
|
|
|
|
+ # """
|
|
|
|
|
+ # 重写战斗等待
|
|
|
|
|
+ # # https://github.com/runhey/OnmyojiAutoScript/issues/95
|
|
|
|
|
+ # :param random_click_swipt_enable:
|
|
|
|
|
+ # :return:
|
|
|
|
|
+ # """
|
|
|
|
|
+ # """
|
|
|
|
|
+ # # 重写
|
|
|
|
|
+ # self.device.stuck_record_add('BATTLE_STATUS_S')
|
|
|
|
|
+ # self.device.click_record_clear()
|
|
|
|
|
+ # self.C_REWARD_1.name = 'C_REWARD'
|
|
|
|
|
+ # self.C_REWARD_2.name = 'C_REWARD'
|
|
|
|
|
+ # self.C_REWARD_3.name = 'C_REWARD'
|
|
|
|
|
+ # # 战斗过程 随机点击和滑动 防封
|
|
|
|
|
+ # logger.info("Start battle process")
|
|
|
|
|
+ # while 1:
|
|
|
|
|
+ # self.screenshot()
|
|
|
|
|
+ # action_click = random.choice([self.C_WIN_1, self.C_WIN_2, self.C_WIN_3])
|
|
|
|
|
+ # if self.appear_then_click(self.I_WIN, action=action_click ,interval=0.8):
|
|
|
|
|
+ # # 赢的那个鼓
|
|
|
|
|
+ # continue
|
|
|
|
|
+ # if self.appear(self.I_GREED_GHOST):
|
|
|
|
|
+ # # 贪吃鬼
|
|
|
|
|
+ # logger.info('Win battle')
|
|
|
|
|
+ # self.wait_until_appear(self.I_REWARD, wait_time=1.5)
|
|
|
|
|
+ # self.screenshot()
|
|
|
|
|
+ # if not self.appear(self.I_GREED_GHOST):
|
|
|
|
|
+ # logger.warning('Greedy ghost disappear. Maybe it is a false battle')
|
|
|
|
|
+ # continue
|
|
|
|
|
+ # while 1:
|
|
|
|
|
+ # self.screenshot()
|
|
|
|
|
+ # action_click = random.choice([self.C_REWARD_1, self.C_REWARD_2, self.C_REWARD_3])
|
|
|
|
|
+ # if not self.appear(self.I_GREED_GHOST):
|
|
|
|
|
+ # break
|
|
|
|
|
+ # if self.click(action_click, interval=1.5):
|
|
|
|
|
+ # continue
|
|
|
|
|
+ # return True
|
|
|
|
|
+ # if self.appear(self.I_REWARD):
|
|
|
|
|
+ # # 魂
|
|
|
|
|
+ # logger.info('Win battle')
|
|
|
|
|
+ # while 1:
|
|
|
|
|
+ # self.screenshot()
|
|
|
|
|
+ # action_click = random.choice([self.C_REWARD_1, self.C_REWARD_2, self.C_REWARD_3])
|
|
|
|
|
+ # if self.appear_then_click(self.I_REWARD, action=action_click, interval=1.5):
|
|
|
|
|
+ # continue
|
|
|
|
|
+ # if not self.appear(self.I_REWARD):
|
|
|
|
|
+ # break
|
|
|
|
|
+ # return True
|
|
|
|
|
+ #
|
|
|
|
|
+ # if self.appear(self.I_FALSE):
|
|
|
|
|
+ # logger.warning('False battle')
|
|
|
|
|
+ # self.ui_click_until_disappear(self.I_FALSE)
|
|
|
|
|
+ # return False
|
|
|
|
|
+ #
|
|
|
|
|
+ # # 如果开启战斗过程随机滑动
|
|
|
|
|
+ # if random_click_swipt_enable:
|
|
|
|
|
+ # self.random_click_swipt()
|
|
|
|
|
+ # """
|
|
|
|
|
+ # """
|
|
|
|
|
+ # 等待战斗结束 !!!
|
|
|
|
|
+ # 很重要 这个函数是原先写的, 优化版本在tasks/Secret/script_task下。本着不改动原先的代码的原则,所以就不改了
|
|
|
|
|
+ # :param random_click_swipt_enable:
|
|
|
|
|
+ # :return:
|
|
|
|
|
+ # """
|
|
|
|
|
+ # # 有的时候是长战斗,需要在设置stuck检测为长战斗
|
|
|
|
|
+ # # 但是无需取消设置,因为如果有点击或者滑动的话 handle_control_check会自行取消掉
|
|
|
|
|
+ # self.device.stuck_record_add('BATTLE_STATUS_S')
|
|
|
|
|
+ # self.device.click_record_clear()
|
|
|
|
|
+ # # 战斗过程 随机点击和滑动 防封
|
|
|
|
|
+ # logger.info("Start battle process")
|
|
|
|
|
+ # win: bool = False
|
|
|
|
|
+ # while 1:
|
|
|
|
|
+ # self.screenshot()
|
|
|
|
|
+ # # 如果出现赢 就点击, 第二个是针对封魔的图片
|
|
|
|
|
+ # if self.appear(self.I_WIN, threshold=0.8) or self.appear(self.I_DE_WIN):
|
|
|
|
|
+ # logger.info("Battle result is win")
|
|
|
|
|
+ # if self.appear(self.I_DE_WIN):
|
|
|
|
|
+ # self.ui_click_until_disappear(self.I_DE_WIN)
|
|
|
|
|
+ # win = True
|
|
|
|
|
+ # break
|
|
|
|
|
+ #
|
|
|
|
|
+ # # 如果出现失败 就点击,返回False
|
|
|
|
|
+ # if self.appear(self.I_FALSE, threshold=0.8):
|
|
|
|
|
+ # logger.info("Battle result is false")
|
|
|
|
|
+ # win = False
|
|
|
|
|
+ # break
|
|
|
|
|
+ #
|
|
|
|
|
+ # # 如果领奖励
|
|
|
|
|
+ # if self.appear(self.I_REWARD, threshold=0.6):
|
|
|
|
|
+ # win = True
|
|
|
|
|
+ # break
|
|
|
|
|
+ #
|
|
|
|
|
+ # # 如果领奖励出现金币
|
|
|
|
|
+ # if self.appear(self.I_REWARD_GOLD, threshold=0.8):
|
|
|
|
|
+ # win = True
|
|
|
|
|
+ # break
|
|
|
|
|
+ # if self.appear(self.I_REWARD_PURPLE_SNAKE_SKIN, threshold=0.8):
|
|
|
|
|
+ # win = True
|
|
|
|
|
+ # break
|
|
|
|
|
+ # # 如果开启战斗过程随机滑动
|
|
|
|
|
+ # if random_click_swipt_enable:
|
|
|
|
|
+ # self.random_click_swipt()
|
|
|
|
|
+ #
|
|
|
|
|
+ # # 再次确认战斗结果
|
|
|
|
|
+ # logger.info("Reconfirm the results of the battle")
|
|
|
|
|
+ # while 1:
|
|
|
|
|
+ # self.screenshot()
|
|
|
|
|
+ # if win:
|
|
|
|
|
+ # # 点击赢了
|
|
|
|
|
+ # action_click = random.choice([self.C_WIN_1, self.C_WIN_2, self.C_WIN_3])
|
|
|
|
|
+ # if self.appear_then_click(self.I_WIN, action=action_click, interval=0.5):
|
|
|
|
|
+ # continue
|
|
|
|
|
+ # if not self.appear(self.I_WIN):
|
|
|
|
|
+ # break
|
|
|
|
|
+ # else:
|
|
|
|
|
+ # # 如果失败且 点击失败后
|
|
|
|
|
+ # if self.appear_then_click(self.I_FALSE, threshold=0.6):
|
|
|
|
|
+ # continue
|
|
|
|
|
+ # if not self.appear(self.I_FALSE, threshold=0.6):
|
|
|
|
|
+ # return False
|
|
|
|
|
+ # # 最后保证能点击 获得奖励
|
|
|
|
|
+ # if not self.wait_until_appear(self.I_REWARD):
|
|
|
|
|
+ # # 有些的战斗没有下面的奖励,所以直接返回
|
|
|
|
|
+ # logger.info("There is no reward, Exit battle")
|
|
|
|
|
+ # return win
|
|
|
|
|
+ # logger.info("Get reward")
|
|
|
|
|
+ # while 1:
|
|
|
|
|
+ # self.screenshot()
|
|
|
|
|
+ # # 如果出现领奖励
|
|
|
|
|
+ # action_click = random.choice([self.C_REWARD_1, self.C_REWARD_2, self.C_REWARD_3])
|
|
|
|
|
+ # if (self.appear_then_click(self.I_REWARD, action=action_click, interval=1.5) or
|
|
|
|
|
+ # self.appear_then_click(self.I_REWARD_GOLD, action=action_click, interval=1.5) or
|
|
|
|
|
+ # # self.appear_then_click(self.I_REWARD_STATISTICS, action=action_click, interval=1.5) or
|
|
|
|
|
+ # self.appear_then_click(self.I_REWARD_PURPLE_SNAKE_SKIN, action=action_click, interval=1.5) #or
|
|
|
|
|
+ # # self.appear_then_click(self.I_REWARD_GOLD_SNAKE_SKIN, action=action_click, interval=1.5) or
|
|
|
|
|
+ # # self.appear_then_click(self.I_REWARD_EXP_SOUL_4, action=action_click, interval=1.5) or
|
|
|
|
|
+ # # self.appear_then_click(self.I_REWARD_SOUL_5, action=action_click, interval=1.5) or
|
|
|
|
|
+ # # self.appear_then_click(self.I_REWARD_SOUL_6, action=action_click, interval=1.5)
|
|
|
|
|
+ # ):
|
|
|
|
|
+ # continue
|
|
|
|
|
+ # if (not self.appear(self.I_REWARD) and
|
|
|
|
|
+ # not self.appear(self.I_REWARD_GOLD) and
|
|
|
|
|
+ # # not self.appear(self.I_REWARD_STATISTICS) and
|
|
|
|
|
+ # not self.appear(self.I_REWARD_PURPLE_SNAKE_SKIN) #and
|
|
|
|
|
+ # # not self.appear(self.I_REWARD_GOLD_SNAKE_SKIN) and
|
|
|
|
|
+ # # not self.appear(self.I_REWARD_EXP_SOUL_4) and
|
|
|
|
|
+ # # not self.appear(self.I_REWARD_SOUL_5) and
|
|
|
|
|
+ # # not self.appear(self.I_REWARD_SOUL_6)
|
|
|
|
|
+ # ):
|
|
|
|
|
+ # break
|
|
|
|
|
+ #
|
|
|
|
|
+ # return win
|
|
|
def battle_wait(self, random_click_swipt_enable: bool) -> bool:
|
|
def battle_wait(self, random_click_swipt_enable: bool) -> bool:
|
|
|
- """
|
|
|
|
|
- 重写战斗等待
|
|
|
|
|
- # https://github.com/runhey/OnmyojiAutoScript/issues/95
|
|
|
|
|
- :param random_click_swipt_enable:
|
|
|
|
|
- :return:
|
|
|
|
|
- """
|
|
|
|
|
- """
|
|
|
|
|
- # 重写
|
|
|
|
|
- self.device.stuck_record_add('BATTLE_STATUS_S')
|
|
|
|
|
- self.device.click_record_clear()
|
|
|
|
|
- self.C_REWARD_1.name = 'C_REWARD'
|
|
|
|
|
- self.C_REWARD_2.name = 'C_REWARD'
|
|
|
|
|
- self.C_REWARD_3.name = 'C_REWARD'
|
|
|
|
|
- # 战斗过程 随机点击和滑动 防封
|
|
|
|
|
- logger.info("Start battle process")
|
|
|
|
|
- while 1:
|
|
|
|
|
- self.screenshot()
|
|
|
|
|
- action_click = random.choice([self.C_WIN_1, self.C_WIN_2, self.C_WIN_3])
|
|
|
|
|
- if self.appear_then_click(self.I_WIN, action=action_click ,interval=0.8):
|
|
|
|
|
- # 赢的那个鼓
|
|
|
|
|
- continue
|
|
|
|
|
- if self.appear(self.I_GREED_GHOST):
|
|
|
|
|
- # 贪吃鬼
|
|
|
|
|
- logger.info('Win battle')
|
|
|
|
|
- self.wait_until_appear(self.I_REWARD, wait_time=1.5)
|
|
|
|
|
- self.screenshot()
|
|
|
|
|
- if not self.appear(self.I_GREED_GHOST):
|
|
|
|
|
- logger.warning('Greedy ghost disappear. Maybe it is a false battle')
|
|
|
|
|
- continue
|
|
|
|
|
- while 1:
|
|
|
|
|
- self.screenshot()
|
|
|
|
|
- action_click = random.choice([self.C_REWARD_1, self.C_REWARD_2, self.C_REWARD_3])
|
|
|
|
|
- if not self.appear(self.I_GREED_GHOST):
|
|
|
|
|
- break
|
|
|
|
|
- if self.click(action_click, interval=1.5):
|
|
|
|
|
- continue
|
|
|
|
|
- return True
|
|
|
|
|
- if self.appear(self.I_REWARD):
|
|
|
|
|
- # 魂
|
|
|
|
|
- logger.info('Win battle')
|
|
|
|
|
- while 1:
|
|
|
|
|
- self.screenshot()
|
|
|
|
|
- action_click = random.choice([self.C_REWARD_1, self.C_REWARD_2, self.C_REWARD_3])
|
|
|
|
|
- if self.appear_then_click(self.I_REWARD, action=action_click, interval=1.5):
|
|
|
|
|
- continue
|
|
|
|
|
- if not self.appear(self.I_REWARD):
|
|
|
|
|
- break
|
|
|
|
|
- return True
|
|
|
|
|
-
|
|
|
|
|
- if self.appear(self.I_FALSE):
|
|
|
|
|
- logger.warning('False battle')
|
|
|
|
|
- self.ui_click_until_disappear(self.I_FALSE)
|
|
|
|
|
- return False
|
|
|
|
|
-
|
|
|
|
|
- # 如果开启战斗过程随机滑动
|
|
|
|
|
- if random_click_swipt_enable:
|
|
|
|
|
- self.random_click_swipt()
|
|
|
|
|
- """
|
|
|
|
|
- """
|
|
|
|
|
- 等待战斗结束 !!!
|
|
|
|
|
- 很重要 这个函数是原先写的, 优化版本在tasks/Secret/script_task下。本着不改动原先的代码的原则,所以就不改了
|
|
|
|
|
- :param random_click_swipt_enable:
|
|
|
|
|
- :return:
|
|
|
|
|
- """
|
|
|
|
|
- # 有的时候是长战斗,需要在设置stuck检测为长战斗
|
|
|
|
|
- # 但是无需取消设置,因为如果有点击或者滑动的话 handle_control_check会自行取消掉
|
|
|
|
|
- self.device.stuck_record_add('BATTLE_STATUS_S')
|
|
|
|
|
- self.device.click_record_clear()
|
|
|
|
|
- # 战斗过程 随机点击和滑动 防封
|
|
|
|
|
- logger.info("Start battle process")
|
|
|
|
|
- win: bool = False
|
|
|
|
|
- while 1:
|
|
|
|
|
- self.screenshot()
|
|
|
|
|
- # 如果出现赢 就点击, 第二个是针对封魔的图片
|
|
|
|
|
- if self.appear(self.I_WIN, threshold=0.8) or self.appear(self.I_DE_WIN):
|
|
|
|
|
- logger.info("Battle result is win")
|
|
|
|
|
- if self.appear(self.I_DE_WIN):
|
|
|
|
|
- self.ui_click_until_disappear(self.I_DE_WIN)
|
|
|
|
|
- win = True
|
|
|
|
|
- break
|
|
|
|
|
-
|
|
|
|
|
- # 如果出现失败 就点击,返回False
|
|
|
|
|
- if self.appear(self.I_FALSE, threshold=0.8):
|
|
|
|
|
- logger.info("Battle result is false")
|
|
|
|
|
- win = False
|
|
|
|
|
- break
|
|
|
|
|
-
|
|
|
|
|
- # 如果领奖励
|
|
|
|
|
- if self.appear(self.I_REWARD, threshold=0.6):
|
|
|
|
|
- win = True
|
|
|
|
|
- break
|
|
|
|
|
-
|
|
|
|
|
- # 如果领奖励出现金币
|
|
|
|
|
- if self.appear(self.I_REWARD_GOLD, threshold=0.8):
|
|
|
|
|
- win = True
|
|
|
|
|
- break
|
|
|
|
|
- if self.appear(self.I_REWARD_PURPLE_SNAKE_SKIN, threshold=0.8):
|
|
|
|
|
- win = True
|
|
|
|
|
- break
|
|
|
|
|
- # 如果开启战斗过程随机滑动
|
|
|
|
|
- if random_click_swipt_enable:
|
|
|
|
|
- self.random_click_swipt()
|
|
|
|
|
-
|
|
|
|
|
- # 再次确认战斗结果
|
|
|
|
|
- logger.info("Reconfirm the results of the battle")
|
|
|
|
|
- while 1:
|
|
|
|
|
- self.screenshot()
|
|
|
|
|
- if win:
|
|
|
|
|
- # 点击赢了
|
|
|
|
|
- action_click = random.choice([self.C_WIN_1, self.C_WIN_2, self.C_WIN_3])
|
|
|
|
|
- if self.appear_then_click(self.I_WIN, action=action_click, interval=0.5):
|
|
|
|
|
- continue
|
|
|
|
|
- if not self.appear(self.I_WIN):
|
|
|
|
|
- break
|
|
|
|
|
- else:
|
|
|
|
|
- # 如果失败且 点击失败后
|
|
|
|
|
- if self.appear_then_click(self.I_FALSE, threshold=0.6):
|
|
|
|
|
- continue
|
|
|
|
|
- if not self.appear(self.I_FALSE, threshold=0.6):
|
|
|
|
|
- return False
|
|
|
|
|
- # 最后保证能点击 获得奖励
|
|
|
|
|
- if not self.wait_until_appear(self.I_REWARD):
|
|
|
|
|
- # 有些的战斗没有下面的奖励,所以直接返回
|
|
|
|
|
- logger.info("There is no reward, Exit battle")
|
|
|
|
|
- return win
|
|
|
|
|
- logger.info("Get reward")
|
|
|
|
|
- while 1:
|
|
|
|
|
- self.screenshot()
|
|
|
|
|
- # 如果出现领奖励
|
|
|
|
|
- action_click = random.choice([self.C_REWARD_1, self.C_REWARD_2, self.C_REWARD_3])
|
|
|
|
|
- if (self.appear_then_click(self.I_REWARD, action=action_click, interval=1.5) or
|
|
|
|
|
- self.appear_then_click(self.I_REWARD_GOLD, action=action_click, interval=1.5) or
|
|
|
|
|
- # self.appear_then_click(self.I_REWARD_STATISTICS, action=action_click, interval=1.5) or
|
|
|
|
|
- self.appear_then_click(self.I_REWARD_PURPLE_SNAKE_SKIN, action=action_click, interval=1.5) #or
|
|
|
|
|
- # self.appear_then_click(self.I_REWARD_GOLD_SNAKE_SKIN, action=action_click, interval=1.5) or
|
|
|
|
|
- # self.appear_then_click(self.I_REWARD_EXP_SOUL_4, action=action_click, interval=1.5) or
|
|
|
|
|
- # self.appear_then_click(self.I_REWARD_SOUL_5, action=action_click, interval=1.5) or
|
|
|
|
|
- # self.appear_then_click(self.I_REWARD_SOUL_6, action=action_click, interval=1.5)
|
|
|
|
|
- ):
|
|
|
|
|
- continue
|
|
|
|
|
- if (not self.appear(self.I_REWARD) and
|
|
|
|
|
- not self.appear(self.I_REWARD_GOLD) and
|
|
|
|
|
- # not self.appear(self.I_REWARD_STATISTICS) and
|
|
|
|
|
- not self.appear(self.I_REWARD_PURPLE_SNAKE_SKIN) #and
|
|
|
|
|
- # not self.appear(self.I_REWARD_GOLD_SNAKE_SKIN) and
|
|
|
|
|
- # not self.appear(self.I_REWARD_EXP_SOUL_4) and
|
|
|
|
|
- # not self.appear(self.I_REWARD_SOUL_5) and
|
|
|
|
|
- # not self.appear(self.I_REWARD_SOUL_6)
|
|
|
|
|
- ):
|
|
|
|
|
- break
|
|
|
|
|
-
|
|
|
|
|
- return win
|
|
|
|
|
|
|
+ return self.battle_wait_v2(random_click_swipt_enable=random_click_swipt_enable)
|
|
|
|
|
|
|
|
|
|
|
|
|
if __name__ == '__main__':
|
|
if __name__ == '__main__':
|