Compare commits
126 Commits
68e19053c5
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bf03867f0b | ||
|
|
8a7c9f3115 | ||
|
|
4f917c8169 | ||
|
|
dce5261670 | ||
|
|
c60c343c68 | ||
|
|
5c9b955d24 | ||
|
|
960db91be9 | ||
|
|
b703cb10ea | ||
|
|
0c4f46180e | ||
|
|
e45fd05341 | ||
|
|
0c31b2c4ec | ||
| 52adbc54f2 | |||
| 275b36d041 | |||
|
|
483f6cc338 | ||
|
|
0ca7a52bcd | ||
|
|
9ebf8d7d06 | ||
|
|
428b8f3b00 | ||
|
|
65c303317a | ||
|
|
17a385274b | ||
|
|
d99af8fb07 | ||
|
|
b64d3e13e2 | ||
|
|
c422a4d58f | ||
|
|
37ef364631 | ||
|
|
3bd8a21d3b | ||
|
|
7cddbaf7a1 | ||
|
|
561aa27942 | ||
| 74e6fd021a | |||
| b0b77e7097 | |||
|
|
58d9a9f653 | ||
|
|
adfe9783b9 | ||
|
|
a11876976c | ||
|
|
a4fd8c126d | ||
|
|
a6f1695de5 | ||
|
|
9a9454df26 | ||
|
|
3f9e7edf4e | ||
|
|
5611dce94b | ||
| d7af303d04 | |||
| 69cdd06e60 | |||
|
|
71f8051b82 | ||
|
|
a07dffbeda | ||
|
|
b5fe8e425b | ||
|
|
da7ca5d706 | ||
|
|
ecf2a841cf | ||
|
|
3ceade600f | ||
|
|
b687048405 | ||
|
|
c9e95702dc | ||
|
|
b24d09f1a0 | ||
|
|
4e2e4572c3 | ||
|
|
8618ea2352 | ||
|
|
dbc5fe42e8 | ||
| 2eec1333ad | |||
|
|
2a2901d218 | ||
|
|
66fa598e75 | ||
|
|
bfe67e2922 | ||
|
|
bd108dc35f | ||
|
|
07bf9d9947 | ||
|
|
c8e8d0b2fe | ||
| 37a1d8bb8e | |||
| 3b8271fbca | |||
|
|
4b05184cbd | ||
| a97af04d85 | |||
| 8f933b5468 | |||
|
|
5c7f57f3b2 | ||
| 45b7c2cdba | |||
|
|
ce23ea94a5 | ||
|
|
ad623f6332 | ||
|
|
c014140c6e | ||
|
|
a538739910 | ||
|
|
0a4f2a89fc | ||
|
|
986d825a81 | ||
|
|
74bbaf8395 | ||
|
|
d99b759a08 | ||
|
|
102b7eeaf7 | ||
| 76eeba667f | |||
| 1e5a7d444b | |||
| 7b48e1ac58 | |||
| a136cbe1ff | |||
|
|
39ee794e41 | ||
| e0b231bc58 | |||
| 44eb4dbcf2 | |||
| 95c1128c73 | |||
|
|
cc089b6223 | ||
|
|
7eb80ca6f4 | ||
|
|
9bb8e191ac | ||
|
|
efeb222764 | ||
|
|
11405cf0c3 | ||
|
|
3623d4c70a | ||
| 5ab18b27fd | |||
| 5fceeddcb1 | |||
| c4961c80eb | |||
| 7e6b87bee8 | |||
|
|
fc0e4ce016 | ||
|
|
eb73b3cfd8 | ||
|
|
7118c30fea | ||
|
|
7d9e77e4fd | ||
|
|
5a32d9444c | ||
| 530efc628e | |||
| f981ec614d | |||
| 054da57f5b | |||
| 3767be643a | |||
| dfed4c9578 | |||
| 352f7412a6 | |||
| 10e302f37e | |||
| 5c7b2b695b | |||
|
|
cd1ef2cf95 | ||
|
|
0a0e41c07f | ||
| 18049bbc7d | |||
| 7e1a2322a6 | |||
| 701807ec9f | |||
| 6f1bdf1315 | |||
| a4fec2e2a0 | |||
| b8144ce41a | |||
| ab18dfe420 | |||
|
|
eb33bdd747 | ||
| b7c31e16e6 | |||
| f20aab0463 | |||
|
|
b99311a001 | ||
|
|
bb349af001 | ||
|
|
87a031ed97 | ||
| ebbecbd207 | |||
|
|
61e6a76644 | ||
|
|
52444569a4 | ||
| 5f2606dc92 | |||
| 9e75d03d91 | |||
|
|
f23d4fb681 | ||
|
|
912c74b8e1 |
26
alas.py
@@ -87,6 +87,20 @@ class AzurLaneAutoScript:
|
||||
self.config.task_call('Restart')
|
||||
self.device.sleep(10)
|
||||
return False
|
||||
except EmulatorNetworkError as e:
|
||||
logger.error(e)
|
||||
self.save_error_log()
|
||||
if self.device.is_emulator:
|
||||
logger.info('Game update stuck 3 times. Checking network status on both ends.')
|
||||
self.checker.check_now()
|
||||
if self.checker.is_available() and not self.device.is_network_available():
|
||||
logger.critical('Emulator network is disconnected despite host being online.')
|
||||
logger.warning('Restarting emulator to fix internal network.')
|
||||
self.device.emulator_start()
|
||||
deep_set(self.failure_record, keys='Restart', value=1)
|
||||
self.config.task_call('Restart')
|
||||
self.device.sleep(10)
|
||||
return False
|
||||
except GameBugError as e:
|
||||
logger.warning(e)
|
||||
self.save_error_log()
|
||||
@@ -434,6 +448,10 @@ class AzurLaneAutoScript:
|
||||
from module.storage.box_disassemble import StorageBox
|
||||
StorageBox(config=self.config, device=self.device, task="BoxDisassemble").run()
|
||||
|
||||
def island_pearl(self):
|
||||
from module.island.pearl_daemon import IslandPearl
|
||||
IslandPearl(config=self.config, device=self.device, task="IslandPearl").run()
|
||||
|
||||
def azur_lane_uncensored(self):
|
||||
from module.daemon.uncensored import AzurLaneUncensored
|
||||
AzurLaneUncensored(config=self.config, device=self.device, task="AzurLaneUncensored").run()
|
||||
@@ -556,12 +574,8 @@ class AzurLaneAutoScript:
|
||||
_ = self.device
|
||||
self.device.config = self.config
|
||||
# Skip first restart
|
||||
if task == 'Restart':
|
||||
if self.is_first_task:
|
||||
logger.info('Skip task `Restart` at scheduler start')
|
||||
else:
|
||||
from module.handler.login import LoginHandler
|
||||
LoginHandler(self.config, self.device).app_restart()
|
||||
if task == 'Restart' and self.is_first_task:
|
||||
logger.info('Skip task `Restart` at scheduler start')
|
||||
self.config.task_delay(server_update=True)
|
||||
del_cached_property(self, 'config')
|
||||
continue
|
||||
|
||||
|
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 7.6 KiB |
BIN
assets/cn/combat/MOVE_LEFT_UP.png
Normal file
|
After Width: | Height: | Size: 6.9 KiB |
BIN
assets/cn/combat_ui/PAUSE_Ancient.png
Normal file
|
After Width: | Height: | Size: 3.4 KiB |
BIN
assets/cn/combat_ui/PAUSE_SpringInn.png
Normal file
|
After Width: | Height: | Size: 3.6 KiB |
BIN
assets/cn/combat_ui/QUIT_SpringInn.png
Normal file
|
After Width: | Height: | Size: 7.1 KiB |
BIN
assets/cn/island/ISLAND_FRIEND.png
Normal file
|
After Width: | Height: | Size: 3.9 KiB |
BIN
assets/cn/island/ISLAND_FRIEND_CHECK.png
Normal file
|
After Width: | Height: | Size: 5.2 KiB |
BIN
assets/cn/island/ISLAND_FRIEND_LEAVE.png
Normal file
|
After Width: | Height: | Size: 3.3 KiB |
BIN
assets/cn/island/ISLAND_FRIEND_SCROLL.png
Normal file
|
After Width: | Height: | Size: 3.9 KiB |
BIN
assets/cn/island/ISLAND_INFO_EXIT.png
Normal file
|
After Width: | Height: | Size: 3.6 KiB |
BIN
assets/cn/island/PEARL_CHECK.png
Normal file
|
After Width: | Height: | Size: 8.9 KiB |
BIN
assets/cn/island/PEARL_ENTER.png
Normal file
|
After Width: | Height: | Size: 4.1 KiB |
BIN
assets/cn/island/PEARL_PRICE_OCR.png
Normal file
|
After Width: | Height: | Size: 4.0 KiB |
BIN
assets/cn/island/PROJECT_ATAGO_CHECK.png
Normal file
|
After Width: | Height: | Size: 7.3 KiB |
BIN
assets/cn/island/PROJECT_CHEN_HAI_CHECK.png
Normal file
|
After Width: | Height: | Size: 6.9 KiB |
BIN
assets/cn/island/PROJECT_EXPLORER_CHECK.png
Normal file
|
After Width: | Height: | Size: 11 KiB |
BIN
assets/cn/island/PROJECT_FRIEDRICH_DER_GROBE_CHECK.png
Normal file
|
After Width: | Height: | Size: 7.5 KiB |
BIN
assets/cn/island/PROJECT_HELENA_CHECK.png
Normal file
|
After Width: | Height: | Size: 7.5 KiB |
BIN
assets/cn/island/PROJECT_HOOD_CHECK.png
Normal file
|
After Width: | Height: | Size: 12 KiB |
BIN
assets/cn/island/PROJECT_OCEANA_CHECK.png
Normal file
|
After Width: | Height: | Size: 11 KiB |
BIN
assets/cn/island/PROJECT_PRINZ_EUGEN_CHECK.png
Normal file
|
After Width: | Height: | Size: 13 KiB |
BIN
assets/cn/island/PROJECT_TB_CHECK.png
Normal file
|
After Width: | Height: | Size: 12 KiB |
BIN
assets/cn/island/PROJECT_WILLIAM_D_PORTER_CHECK.png
Normal file
|
After Width: | Height: | Size: 10 KiB |
BIN
assets/cn/island/ROLE_SELECT_TITLE_AREA.png
Normal file
|
After Width: | Height: | Size: 9.1 KiB |
BIN
assets/cn/island/ROLE_SORTING_CLICK.png
Normal file
|
After Width: | Height: | Size: 7.1 KiB |
BIN
assets/cn/island/ROLE_SORT_ASC.png
Normal file
|
After Width: | Height: | Size: 2.7 KiB |
BIN
assets/cn/island/ROLE_SORT_DESC.png
Normal file
|
After Width: | Height: | Size: 2.8 KiB |
BIN
assets/cn/island/TEMPLATE_ATAGO.png
Normal file
|
After Width: | Height: | Size: 11 KiB |
BIN
assets/cn/island/TEMPLATE_CHEN_HAI.png
Normal file
|
After Width: | Height: | Size: 9.4 KiB |
BIN
assets/cn/island/TEMPLATE_EXPLORER.png
Normal file
|
After Width: | Height: | Size: 9.3 KiB |
BIN
assets/cn/island/TEMPLATE_FRIEDRICH_DER_GROBE.png
Normal file
|
After Width: | Height: | Size: 9.4 KiB |
BIN
assets/cn/island/TEMPLATE_FRIEND_VISIT.png
Normal file
|
After Width: | Height: | Size: 1.5 KiB |
BIN
assets/cn/island/TEMPLATE_HELENA.png
Normal file
|
After Width: | Height: | Size: 10 KiB |
BIN
assets/cn/island/TEMPLATE_HOOD.png
Normal file
|
After Width: | Height: | Size: 10 KiB |
BIN
assets/cn/island/TEMPLATE_OCEANA.png
Normal file
|
After Width: | Height: | Size: 8.8 KiB |
BIN
assets/cn/island/TEMPLATE_PRINZ_EUGEN.png
Normal file
|
After Width: | Height: | Size: 11 KiB |
BIN
assets/cn/island/TEMPLATE_TB.png
Normal file
|
After Width: | Height: | Size: 8.2 KiB |
BIN
assets/cn/island/TEMPLATE_WILLIAM_D_PORTER.png
Normal file
|
After Width: | Height: | Size: 9.8 KiB |
BIN
assets/cn/raid/CHANGWU_OCR_PT.png
Normal file
|
After Width: | Height: | Size: 7.1 KiB |
BIN
assets/cn/raid/CHANGWU_OCR_REMAIN_EASY.png
Normal file
|
After Width: | Height: | Size: 5.0 KiB |
BIN
assets/cn/raid/CHANGWU_OCR_REMAIN_EX.png
Normal file
|
After Width: | Height: | Size: 3.2 KiB |
BIN
assets/cn/raid/CHANGWU_OCR_REMAIN_HARD.png
Normal file
|
After Width: | Height: | Size: 5.0 KiB |
BIN
assets/cn/raid/CHANGWU_OCR_REMAIN_NORMAL.png
Normal file
|
After Width: | Height: | Size: 5.0 KiB |
BIN
assets/cn/raid/CHANGWU_RAID_EASY.png
Normal file
|
After Width: | Height: | Size: 6.0 KiB |
BIN
assets/cn/raid/CHANGWU_RAID_EX.png
Normal file
|
After Width: | Height: | Size: 7.3 KiB |
BIN
assets/cn/raid/CHANGWU_RAID_HARD.png
Normal file
|
After Width: | Height: | Size: 6.2 KiB |
BIN
assets/cn/raid/CHANGWU_RAID_NORMAL.png
Normal file
|
After Width: | Height: | Size: 6.6 KiB |
BIN
assets/cn/raid/RPG_BACK.png
Normal file
|
After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 7.4 KiB After Width: | Height: | Size: 4.5 KiB |
BIN
assets/cn/war_archives/TEMPLATE_REVELATIONS_OF_DUST.png
Normal file
|
After Width: | Height: | Size: 6.2 KiB |
|
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 7.6 KiB |
BIN
assets/en/os_handler/MISSION_OVERVIEW_EMPTY.png
Normal file
|
After Width: | Height: | Size: 7.7 KiB |
BIN
assets/en/raid/CHANGWU_OCR_PT.png
Normal file
|
After Width: | Height: | Size: 7.1 KiB |
BIN
assets/en/raid/CHANGWU_OCR_REMAIN_EASY.png
Normal file
|
After Width: | Height: | Size: 5.0 KiB |
BIN
assets/en/raid/CHANGWU_OCR_REMAIN_EX.png
Normal file
|
After Width: | Height: | Size: 3.2 KiB |
BIN
assets/en/raid/CHANGWU_OCR_REMAIN_HARD.png
Normal file
|
After Width: | Height: | Size: 5.0 KiB |
BIN
assets/en/raid/CHANGWU_OCR_REMAIN_NORMAL.png
Normal file
|
After Width: | Height: | Size: 5.0 KiB |
BIN
assets/en/raid/CHANGWU_RAID_EASY.png
Normal file
|
After Width: | Height: | Size: 5.2 KiB |
BIN
assets/en/raid/CHANGWU_RAID_EX.png
Normal file
|
After Width: | Height: | Size: 7.3 KiB |
BIN
assets/en/raid/CHANGWU_RAID_HARD.png
Normal file
|
After Width: | Height: | Size: 4.8 KiB |
BIN
assets/en/raid/CHANGWU_RAID_NORMAL.png
Normal file
|
After Width: | Height: | Size: 6.1 KiB |
BIN
assets/en/raid/RPG_BACK.png
Normal file
|
After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 7.4 KiB After Width: | Height: | Size: 4.5 KiB |
BIN
assets/en/war_archives/TEMPLATE_REVELATIONS_OF_DUST.png
Normal file
|
After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 7.6 KiB |
BIN
assets/jp/os_handler/MISSION_OVERVIEW_EMPTY.png
Normal file
|
After Width: | Height: | Size: 7.7 KiB |
BIN
assets/jp/raid/CHANGWU_OCR_PT.png
Normal file
|
After Width: | Height: | Size: 7.1 KiB |
BIN
assets/jp/raid/CHANGWU_OCR_REMAIN_EASY.png
Normal file
|
After Width: | Height: | Size: 5.0 KiB |
BIN
assets/jp/raid/CHANGWU_OCR_REMAIN_EX.png
Normal file
|
After Width: | Height: | Size: 3.2 KiB |
BIN
assets/jp/raid/CHANGWU_OCR_REMAIN_HARD.png
Normal file
|
After Width: | Height: | Size: 5.0 KiB |
BIN
assets/jp/raid/CHANGWU_OCR_REMAIN_NORMAL.png
Normal file
|
After Width: | Height: | Size: 5.0 KiB |
BIN
assets/jp/raid/CHANGWU_RAID_EASY.png
Normal file
|
After Width: | Height: | Size: 5.6 KiB |
BIN
assets/jp/raid/CHANGWU_RAID_EX.png
Normal file
|
After Width: | Height: | Size: 7.3 KiB |
BIN
assets/jp/raid/CHANGWU_RAID_HARD.png
Normal file
|
After Width: | Height: | Size: 6.4 KiB |
BIN
assets/jp/raid/CHANGWU_RAID_NORMAL.png
Normal file
|
After Width: | Height: | Size: 6.0 KiB |
BIN
assets/jp/raid/RPG_BACK.png
Normal file
|
After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 7.4 KiB After Width: | Height: | Size: 4.5 KiB |
BIN
assets/tw/coalition/FASHION_COALITION_CHECK.png
Normal file
|
After Width: | Height: | Size: 8.5 KiB |
BIN
assets/tw/coalition/FASHION_MODE_BATTLE.png
Normal file
|
After Width: | Height: | Size: 7.3 KiB |
BIN
assets/tw/coalition/FASHION_MODE_STORY.png
Normal file
|
After Width: | Height: | Size: 8.7 KiB |
BIN
assets/tw/coalition/FASHION_SWITCH_MULTI.png
Normal file
|
After Width: | Height: | Size: 9.5 KiB |
BIN
assets/tw/coalition/FASHION_SWITCH_SINGLE.png
Normal file
|
After Width: | Height: | Size: 9.8 KiB |
|
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 7.6 KiB |
BIN
assets/tw/os_handler/MISSION_OVERVIEW_EMPTY.png
Normal file
|
After Width: | Height: | Size: 7.7 KiB |
BIN
assets/tw/raid/CHANGWU_OCR_PT.png
Normal file
|
After Width: | Height: | Size: 7.1 KiB |
BIN
assets/tw/raid/CHANGWU_OCR_REMAIN_EASY.png
Normal file
|
After Width: | Height: | Size: 5.0 KiB |
BIN
assets/tw/raid/CHANGWU_OCR_REMAIN_EX.png
Normal file
|
After Width: | Height: | Size: 3.2 KiB |
BIN
assets/tw/raid/CHANGWU_OCR_REMAIN_HARD.png
Normal file
|
After Width: | Height: | Size: 5.0 KiB |
BIN
assets/tw/raid/CHANGWU_OCR_REMAIN_NORMAL.png
Normal file
|
After Width: | Height: | Size: 5.0 KiB |
BIN
assets/tw/raid/CHANGWU_RAID_EASY.png
Normal file
|
After Width: | Height: | Size: 6.1 KiB |
BIN
assets/tw/raid/CHANGWU_RAID_EX.png
Normal file
|
After Width: | Height: | Size: 7.3 KiB |
BIN
assets/tw/raid/CHANGWU_RAID_HARD.png
Normal file
|
After Width: | Height: | Size: 6.3 KiB |
BIN
assets/tw/raid/CHANGWU_RAID_NORMAL.png
Normal file
|
After Width: | Height: | Size: 6.6 KiB |
BIN
assets/tw/raid/RPG_BACK.png
Normal file
|
After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 7.4 KiB After Width: | Height: | Size: 4.5 KiB |
@@ -1901,5 +1901,5 @@
|
||||
183
|
||||
],
|
||||
"heads": [[146, 0, 0], [150, 0, 0]],
|
||||
"attrs": {"mxnet_version": ["int", 10600]}
|
||||
"attrs": {"mxnet_version": ["int", 10901]}
|
||||
}
|
||||
@@ -57,6 +57,7 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
|
||||
| 20251016 | war archives 20231026 cn | Tempesta and the Fountain of Youth | 飓风与青春之泉 | Tempesta and the Fountain of Youth | テンペスタと若返りの泉 | 飓風與青春之泉 |
|
||||
| 20251106 | war archives 20220915 cn | Violet Tempest Blooming Lycoris | 紫绛槿岚 | Violet Tempest Blooming Lycoris | 赫の涙月 菫の暁風 | 紫絳槿嵐 |
|
||||
| 20251218 | war archives 20221222 cn | Parallel Superimposition | 定向折叠 | Parallel Superimposition | 積重なる事象の幻界 | 定向折疊 |
|
||||
| 20260129 | war archives 20230223 cn | Revelations of Dust | 湮烬尘墟 | Revelations of Dust | 黙示の遺構 | 湮燼塵墟 |
|
||||
| 20200227 | event 20200227 cn | Northern Overture | 北境序曲 | Northern Overture | 凍絶の北海 | - |
|
||||
| 20200312 | event 20200312 cn | The Solomon Ranger | 复刻斯图尔特的硝烟 | The Solomon Ranger Rerun | 南洋に靡く硝煙(復刻) | - |
|
||||
| 20200326 | event 20200326 cn | Microlayer Medley | 微层混合 | Microlayer Medley | 闇靄払う銀翼 | - |
|
||||
@@ -278,3 +279,10 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
|
||||
| 20260115 | event 20231221 cn | Light-Chasing Sea of Stars Rerun | 复刻星海逐光 | Light-Chasing Sea of Stars Rerun | 光追う星の海(復刻) | - |
|
||||
| 20260122 | coalition 20260122 | Light & Shadow Fashion Shoot! | 光影风尚-拍摄进行时 | Light & Shadow Fashion Shoot! | 特集写真-撮影進行中 | - |
|
||||
| 20260122 | event 20220526 cn | Pledge of the Radiant Court | - | - | - | 泠誓光庭 |
|
||||
| 20260129 | coalition 20260122 | Light & Shadow Fashion Shoot! | - | - | - | 光影風尚-拍攝進行時 |
|
||||
| 20260205 | raid 20240328 | From Zero to Hero | 复刻从零开始的魔王讨伐之旅 | From Zero to Hero Rerun | ゼロから頑張る魔王討伐(復刻) | - |
|
||||
| 20260212 | raid 20260212 | Spring Auction Adventure | 春宴怀玉香满庭 | Spring Auction Adventure | 新春玉逸品会 | 春宴懷玉香滿庭 |
|
||||
| 20260226 | event 20260226 cn | Springtide Inn Online | 春满客栈Online | Springtide Inn Online | 春色旅籠Online | 春滿客棧Online |
|
||||
| 20260312 | event 20240229 cn | Snowrealm Peregrination Rerun | 复刻雪境迷踪 | Snowrealm Peregrination Rerun | 銀界遊廻(復刻) | - |
|
||||
| 20260319 | event 20220728 cn | Aquilifer's Ballade | - | - | - | 復刻雄鷹的敘事歌 |
|
||||
| 20260326 | event 20260326 cn | The Vagabond’s Recruitment Plan | 漫游者招募计划 | The Vagabond’s Recruitment Plan | ワンダラー募集計画 | - |
|
||||
|
||||