sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-24 04:25:56 +08:00
Code Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
LmeSzinc
2020-07-17 05:32:31 +08:00
parent 618ca784da 41e33a5513
commit 914cbf5535
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
module/exercise/combat.py
View File

@@ -3,11 +3,12 @@ from module.exercise.assets import *
from module.exercise.equipment import ExerciseEquipment from module.exercise.equipment import ExerciseEquipment
from module.exercise.hp_daemon import HpDaemon from module.exercise.hp_daemon import HpDaemon
from module.exercise.opponent import OpponentChoose, OPPONENT from module.exercise.opponent import OpponentChoose, OPPONENT
from module.ui.assets import EXERCISE_CHECK
class ExerciseCombat(HpDaemon, OpponentChoose, ExerciseEquipment): class ExerciseCombat(HpDaemon, OpponentChoose, ExerciseEquipment):
def _in_exercise(self): def _in_exercise(self):
return self.appear(NEW_OPPONENT) return self.appear(EXERCISE_CHECK, offset=(20, 20))
def is_combat_executing(self): def is_combat_executing(self):
""" """

2
module/exercise/exercise.py
View File

@@ -19,8 +19,8 @@ class Exercise(ExerciseCombat):
self.device.sleep(1) self.device.sleep(1)
def _exercise_once(self): def _exercise_once(self):
self._opponent_fleet_check_all()
while self.opponent_change_count <= 5: while self.opponent_change_count <= 5:
self._opponent_fleet_check_all()
for opponent in self._opponent_sort(): for opponent in self._opponent_sort():
success = self._combat(opponent) success = self._combat(opponent)
if success: if success: