1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-29 02:25:31 +08:00

merge alas

This commit is contained in:
SevCrane
2024-06-05 23:57:58 +08:00
parent 3cb29a9a37
commit abfbbe5064
146 changed files with 0 additions and 13646 deletions

View File

@@ -4,11 +4,7 @@ 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