Compare commits
179 Commits
e0b231bc58
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f2fe9e814d | ||
| 112357951c | |||
|
|
efbbaeb89f | ||
|
|
555ca89fa0 | ||
|
|
d0b6e62964 | ||
|
|
f5e9952fc3 | ||
|
|
0f679ce3e8 | ||
|
|
8cb4384a22 | ||
|
|
884c77c8f0 | ||
|
|
558aab314d | ||
|
|
6dd8eff8d3 | ||
| 90c06f9054 | |||
| 1155f277ef | |||
| 632b06780f | |||
| 59e95e57ab | |||
| ac3cc79ce0 | |||
| 6789b6d6ef | |||
| 7c00e257c8 | |||
| 57d5f308aa | |||
|
|
e7060b45e1 | ||
|
|
c6acd48b83 | ||
|
|
1ee1edc288 | ||
|
|
5f4f968c25 | ||
| 722b5e87f8 | |||
|
|
23f185c4cc | ||
|
|
be200d4a3f | ||
|
|
2a3f3b4941 | ||
|
|
f36ae75ed3 | ||
|
|
03d80eb0f1 | ||
|
|
1c6b5eb4a6 | ||
|
|
96c1317887 | ||
|
|
ac7bedc192 | ||
|
|
0c26c5a355 | ||
|
|
0dbac1950a | ||
|
|
4b90a64dde | ||
|
|
6665ca2ece | ||
| 97b9a4f91f | |||
|
|
f13b6c7a5c | ||
|
|
7466a3882d | ||
|
|
ab561e025c | ||
|
|
04d900bb3b | ||
|
|
2a61e4ad11 | ||
|
|
9e58a9d8d4 | ||
| c457180080 | |||
|
|
1fd1b2d59a | ||
|
|
2c938c9dbf | ||
|
|
32ad98a79f | ||
|
|
cb061d9a5e | ||
|
|
f6b44d6582 | ||
| ed2582e719 | |||
| 822dbca8b2 | |||
| 93332a1d4b | |||
| 278750e78c | |||
|
|
0f199064c4 | ||
|
|
3855790bb0 | ||
| b3c9c5dd78 | |||
| 3d7cc68946 | |||
|
|
89f69079f1 | ||
|
|
c75dd9366b | ||
|
|
284e127d41 | ||
|
|
8318c42ce4 | ||
|
|
6562ce0522 | ||
|
|
4b83292c9e | ||
|
|
378d18a9a3 | ||
|
|
5cc986257f | ||
| fd2313f239 | |||
|
|
995376a5a0 | ||
|
|
d88b7f397a | ||
|
|
53d8ff8099 | ||
|
|
65cea8d07c | ||
|
|
25463b2dc1 | ||
|
|
45faa7c46d | ||
|
|
8ce450a42b | ||
|
|
31efe2a054 | ||
|
|
d1e3653c4a | ||
|
|
ba568b50c0 | ||
|
|
432c719f51 | ||
|
|
23723f14c7 | ||
|
|
a3c871f963 | ||
|
|
e9a09a368e | ||
|
|
5cf249c8e7 | ||
|
|
9ca2f99143 | ||
|
|
594a652819 | ||
|
|
37bf25c4b0 | ||
|
|
4e1673fe99 | ||
|
|
01c69f645e | ||
|
|
1e67ed613a | ||
|
|
032b2c1931 | ||
|
|
278edcdf12 | ||
|
|
aad22c753a | ||
| 27f9a23ad5 | |||
|
|
433059bc8e | ||
|
|
9ca4b263ad | ||
|
|
8c9a39b703 | ||
|
|
bf03867f0b | ||
|
|
8a7c9f3115 | ||
|
|
e8f5ad9830 | ||
|
|
b993a5e8b4 | ||
|
|
33e812adb8 | ||
|
|
4f917c8169 | ||
|
|
dce5261670 | ||
|
|
c60c343c68 | ||
|
|
5c9b955d24 | ||
|
|
960db91be9 | ||
|
|
b703cb10ea | ||
|
|
0c4f46180e | ||
|
|
e45fd05341 | ||
|
|
0c31b2c4ec | ||
| 52adbc54f2 | |||
| 275b36d041 | |||
|
|
483f6cc338 | ||
|
|
0ca7a52bcd | ||
|
|
9ebf8d7d06 | ||
|
|
428b8f3b00 | ||
|
|
65c303317a | ||
|
|
17a385274b | ||
|
|
d99af8fb07 | ||
|
|
b64d3e13e2 | ||
|
|
c422a4d58f | ||
|
|
e4a6a5728e | ||
|
|
37ef364631 | ||
|
|
3bd8a21d3b | ||
|
|
7cddbaf7a1 | ||
|
|
d7d69e95ef | ||
|
|
561aa27942 | ||
|
|
da0e2458b7 | ||
| 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 | ||
|
|
d8bba0331f |
26
alas.py
@@ -87,6 +87,20 @@ class AzurLaneAutoScript:
|
|||||||
self.config.task_call('Restart')
|
self.config.task_call('Restart')
|
||||||
self.device.sleep(10)
|
self.device.sleep(10)
|
||||||
return False
|
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:
|
except GameBugError as e:
|
||||||
logger.warning(e)
|
logger.warning(e)
|
||||||
self.save_error_log()
|
self.save_error_log()
|
||||||
@@ -434,6 +448,10 @@ class AzurLaneAutoScript:
|
|||||||
from module.storage.box_disassemble import StorageBox
|
from module.storage.box_disassemble import StorageBox
|
||||||
StorageBox(config=self.config, device=self.device, task="BoxDisassemble").run()
|
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):
|
def azur_lane_uncensored(self):
|
||||||
from module.daemon.uncensored import AzurLaneUncensored
|
from module.daemon.uncensored import AzurLaneUncensored
|
||||||
AzurLaneUncensored(config=self.config, device=self.device, task="AzurLaneUncensored").run()
|
AzurLaneUncensored(config=self.config, device=self.device, task="AzurLaneUncensored").run()
|
||||||
@@ -556,12 +574,8 @@ class AzurLaneAutoScript:
|
|||||||
_ = self.device
|
_ = self.device
|
||||||
self.device.config = self.config
|
self.device.config = self.config
|
||||||
# Skip first restart
|
# Skip first restart
|
||||||
if task == 'Restart':
|
if task == 'Restart' and self.is_first_task:
|
||||||
if self.is_first_task:
|
logger.info('Skip task `Restart` at scheduler start')
|
||||||
logger.info('Skip task `Restart` at scheduler start')
|
|
||||||
else:
|
|
||||||
from module.handler.login import LoginHandler
|
|
||||||
LoginHandler(self.config, self.device).app_restart()
|
|
||||||
self.config.task_delay(server_update=True)
|
self.config.task_delay(server_update=True)
|
||||||
del_cached_property(self, 'config')
|
del_cached_property(self, 'config')
|
||||||
continue
|
continue
|
||||||
|
|||||||
BIN
assets/cn/campaign/EVENT_20201126_DETAIL.png
Normal file
|
After Width: | Height: | Size: 14 KiB |
BIN
assets/cn/campaign/EVENT_20201126_DETAIL_CHECK.png
Normal file
|
After Width: | Height: | Size: 14 KiB |
BIN
assets/cn/campaign/EVENT_20201126_DETAIL_WHITE.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
BIN
assets/cn/campaign/EVENT_20201126_ENTRANCE.png
Normal file
|
After Width: | Height: | Size: 9.2 KiB |
BIN
assets/cn/campaign/EVENT_20201126_ENTRANCE_TEMP.png
Normal file
|
After Width: | Height: | Size: 7.6 KiB |
BIN
assets/cn/campaign/EVENT_20201126_PT_ICON.png
Normal file
|
After Width: | Height: | Size: 4.6 KiB |
BIN
assets/cn/campaign/EVENT_20250424_PT_ICON.png
Normal file
|
After Width: | Height: | Size: 4.3 KiB |
BIN
assets/cn/campaign/EVENT_20260417_DETAIL.png
Normal file
|
After Width: | Height: | Size: 14 KiB |
BIN
assets/cn/campaign/EVENT_20260417_DETAIL_CHECK.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
assets/cn/campaign/EVENT_20260417_DETAIL_WHITE.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
BIN
assets/cn/campaign/EVENT_20260417_ENTRANCE.png
Normal file
|
After Width: | Height: | Size: 9.2 KiB |
BIN
assets/cn/campaign/EVENT_20260417_PT_ICON.png
Normal file
|
After Width: | Height: | Size: 4.5 KiB |
|
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_ElvenVine.png
Normal file
|
After Width: | Height: | Size: 3.7 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/commission/OIL_MAXED.png
Normal file
|
After Width: | Height: | Size: 6.8 KiB |
BIN
assets/cn/dorm/DORM_BUY_FOOD_CHECK.png
Normal file
|
After Width: | Height: | Size: 6.3 KiB |
BIN
assets/cn/dorm/DORM_BUY_FOOD_CONFIRM.png
Normal file
|
After Width: | Height: | Size: 4.1 KiB |
BIN
assets/cn/dorm/DORM_BUY_FOOD_ENTER.png
Normal file
|
After Width: | Height: | Size: 3.5 KiB |
BIN
assets/cn/dorm/FOOD_MINUS.png
Normal file
|
After Width: | Height: | Size: 3.6 KiB |
BIN
assets/cn/dorm/FOOD_PLUS.png
Normal file
|
After Width: | Height: | Size: 3.5 KiB |
BIN
assets/cn/dorm/OCR_DORM_BUY_FOOD_AMOUNT.png
Normal file
|
After Width: | Height: | Size: 4.1 KiB |
|
Before Width: | Height: | Size: 7.8 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 7.8 KiB After Width: | Height: | Size: 10 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/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_EXPLORER_CHECK.png
Normal file
|
After Width: | Height: | Size: 11 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/TEMPLATE_EXPLORER.png
Normal file
|
After Width: | Height: | Size: 9.3 KiB |
BIN
assets/cn/island/TEMPLATE_FRIEND_VISIT.png
Normal file
|
After Width: | Height: | Size: 1.5 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/shop/SHOP_REFRESH_CHECK.png
Normal file
|
After Width: | Height: | Size: 4.0 KiB |
BIN
assets/cn/template/TEMPLATE_SIREN_ArkRoyalG.gif
Normal file
|
After Width: | Height: | Size: 2.2 KiB |
BIN
assets/cn/template/TEMPLATE_SIREN_Bremerton.gif
Normal file
|
After Width: | Height: | Size: 2.2 KiB |
BIN
assets/cn/template/TEMPLATE_SIREN_Cheshire.gif
Normal file
|
After Width: | Height: | Size: 5.3 KiB |
BIN
assets/cn/template/TEMPLATE_SIREN_FuShunG.gif
Normal file
|
After Width: | Height: | Size: 5.3 KiB |
BIN
assets/cn/template/TEMPLATE_SIREN_Lexington2.gif
Normal file
|
After Width: | Height: | Size: 3.2 KiB |
BIN
assets/cn/template/TEMPLATE_SIREN_Nakhimov.gif
Normal file
|
After Width: | Height: | Size: 6.4 KiB |
BIN
assets/cn/template/TEMPLATE_SIREN_Raffaello.gif
Normal file
|
After Width: | Height: | Size: 4.3 KiB |
BIN
assets/cn/template/TEMPLATE_SIREN_Yorktown2.gif
Normal file
|
After Width: | Height: | Size: 2.1 KiB |
BIN
assets/cn/war_archives/TEMPLATE_ANTHEM_OF_REMEMBRANCE.png
Normal file
|
After Width: | Height: | Size: 6.3 KiB |
BIN
assets/cn/war_archives/TEMPLATE_OPERATION_CONVERGENCE.png
Normal file
|
After Width: | Height: | Size: 6.5 KiB |
|
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 7.6 KiB |
|
Before Width: | Height: | Size: 5.7 KiB |
BIN
assets/en/template/TEMPLATE_SIREN_ArkRoyalG.gif
Normal file
|
After Width: | Height: | Size: 2.2 KiB |
BIN
assets/en/template/TEMPLATE_SIREN_Bremerton.gif
Normal file
|
After Width: | Height: | Size: 2.2 KiB |
BIN
assets/en/template/TEMPLATE_SIREN_Cheshire.gif
Normal file
|
After Width: | Height: | Size: 5.3 KiB |
BIN
assets/en/template/TEMPLATE_SIREN_FuShunG.gif
Normal file
|
After Width: | Height: | Size: 5.3 KiB |
BIN
assets/en/template/TEMPLATE_SIREN_Lexington2.gif
Normal file
|
After Width: | Height: | Size: 3.2 KiB |
BIN
assets/en/template/TEMPLATE_SIREN_Nakhimov.gif
Normal file
|
After Width: | Height: | Size: 6.4 KiB |
BIN
assets/en/template/TEMPLATE_SIREN_Raffaello.gif
Normal file
|
After Width: | Height: | Size: 4.3 KiB |
BIN
assets/en/template/TEMPLATE_SIREN_Yorktown2.gif
Normal file
|
After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 6.2 KiB |
|
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 7.6 KiB |
|
Before Width: | Height: | Size: 8.6 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 8.9 KiB |
|
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 8.7 KiB |
BIN
assets/jp/template/TEMPLATE_SIREN_ArkRoyalG.gif
Normal file
|
After Width: | Height: | Size: 2.2 KiB |
BIN
assets/jp/template/TEMPLATE_SIREN_Bremerton.gif
Normal file
|
After Width: | Height: | Size: 2.2 KiB |
BIN
assets/jp/template/TEMPLATE_SIREN_Cheshire.gif
Normal file
|
After Width: | Height: | Size: 5.3 KiB |
BIN
assets/jp/template/TEMPLATE_SIREN_FuShunG.gif
Normal file
|
After Width: | Height: | Size: 5.3 KiB |
BIN
assets/jp/template/TEMPLATE_SIREN_Lexington2.gif
Normal file
|
After Width: | Height: | Size: 3.2 KiB |
BIN
assets/jp/template/TEMPLATE_SIREN_Nakhimov.gif
Normal file
|
After Width: | Height: | Size: 6.4 KiB |
BIN
assets/jp/template/TEMPLATE_SIREN_Raffaello.gif
Normal file
|
After Width: | Height: | Size: 4.3 KiB |
BIN
assets/jp/template/TEMPLATE_SIREN_Yorktown2.gif
Normal file
|
After Width: | Height: | Size: 2.1 KiB |
BIN
assets/shop/cost/Coins_5.png
Normal file
|
After Width: | Height: | Size: 1.3 KiB |
BIN
assets/shop/cost/Coins_6.png
Normal file
|
After Width: | Height: | Size: 1.3 KiB |
BIN
assets/shop/cost/Core_4.png
Normal file
|
After Width: | Height: | Size: 993 B |
BIN
assets/shop/cost/Gems_5.png
Normal file
|
After Width: | Height: | Size: 1005 B |
BIN
assets/shop/cost/GuildCoins_6.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
BIN
assets/shop/cost/GuildCoins_7.png
Normal file
|
After Width: | Height: | Size: 1.3 KiB |
BIN
assets/shop/cost/Medal_4.png
Normal file
|
After Width: | Height: | Size: 1.0 KiB |
BIN
assets/shop/cost/Merit_5.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
BIN
assets/shop/cost/Merit_6.png
Normal file
|
After Width: | Height: | Size: 1.0 KiB |
BIN
assets/shop/os/METARedBookT1_2.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
BIN
assets/shop/os/OrdnanceTestingReportT3_6.png
Normal file
|
After Width: | Height: | Size: 19 KiB |
BIN
assets/shop/os/RepairPackFull2_2.png
Normal file
|
After Width: | Height: | Size: 20 KiB |
BIN
assets/shop/os/RepairPackFull_2.png
Normal file
|
After Width: | Height: | Size: 20 KiB |
BIN
assets/shop/os/TuningSampleOffence_4.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 7.6 KiB |
BIN
assets/tw/template/TEMPLATE_SIREN_ArkRoyalG.gif
Normal file
|
After Width: | Height: | Size: 2.2 KiB |
BIN
assets/tw/template/TEMPLATE_SIREN_Bremerton.gif
Normal file
|
After Width: | Height: | Size: 2.2 KiB |
BIN
assets/tw/template/TEMPLATE_SIREN_Cheshire.gif
Normal file
|
After Width: | Height: | Size: 5.3 KiB |
BIN
assets/tw/template/TEMPLATE_SIREN_FuShunG.gif
Normal file
|
After Width: | Height: | Size: 5.3 KiB |
BIN
assets/tw/template/TEMPLATE_SIREN_Lexington2.gif
Normal file
|
After Width: | Height: | Size: 3.2 KiB |
BIN
assets/tw/template/TEMPLATE_SIREN_Nakhimov.gif
Normal file
|
After Width: | Height: | Size: 6.4 KiB |