mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-20 22:35:35 +08:00
Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript
This commit is contained in:
@@ -4,7 +4,11 @@ from module.base.utils import get_color
|
||||
from module.combat.assets import BATTLE_PREPARATION
|
||||
from module.combat.combat import Combat
|
||||
from module.daily.assets import *
|
||||
<<<<<<< HEAD
|
||||
from module.equipment.fleet_equipment import DailyEquipment
|
||||
=======
|
||||
from module.daily.equipment import DailyEquipment
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
from module.logger import logger
|
||||
from module.ocr.ocr import Digit
|
||||
from module.ui.assets import BACK_ARROW, DAILY_CHECK
|
||||
|
||||
Reference in New Issue
Block a user