Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3ed07d0ba1 |
1
.github/workflows/main.yml
vendored
@@ -12,6 +12,7 @@ jobs:
|
|||||||
sync_with_upstream:
|
sync_with_upstream:
|
||||||
name: Sync with Upstream
|
name: Sync with Upstream
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
if: ${{ github.event.repository.fork }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout target repo
|
- name: Checkout target repo
|
||||||
|
|||||||
@@ -174,6 +174,6 @@ Alas 仍在活跃开发中,我们会不定期发布未来的工作在 [Issues]
|
|||||||
## 联系我们 Contact Us
|
## 联系我们 Contact Us
|
||||||
|
|
||||||
- Discord: [https://discord.gg/AQN6GeJ](https://discord.gg/AQN6GeJ)
|
- Discord: [https://discord.gg/AQN6GeJ](https://discord.gg/AQN6GeJ)
|
||||||
- QQ 八群:[938081688](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=3h8Gl323WkIt6yGx8Jx5Ht93puZxeA8T&authKey=xPT6kPm7W9jWO2TNzPdohJ27l1njxorwKmkDrbwwYGGA6Oni1xQSJhHsRIJ8w7GZ&noverify=0&group_code=938081688)
|
- QQ 七群:[1026960593](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=rPYxlGzFCRl1jK7cnUXrCzmX6KCEvc4U&authKey=XTLdoBWD6hFxx7sFVbF2L94XyjKnjAIoATzWQcJj98%2By%2BDW%2F%2BG6YbqVuF85FQkex&noverify=0&group_code=1026960593)
|
||||||
- QQ 一群:[1087735381](https://jq.qq.com/?_wv=1027&k=I4NSqX7g) (有开发意向请加一群,入群需要提供你的Github用户名)
|
- QQ 一群:[1087735381](https://jq.qq.com/?_wv=1027&k=I4NSqX7g) (有开发意向请加一群,入群需要提供你的Github用户名)
|
||||||
- Bilibili 直播间:https://live.bilibili.com/22216705 ,偶尔直播写Alas,~~为了拯救Alas,Lme决定出道成为偶像~~
|
- Bilibili 直播间:https://live.bilibili.com/22216705 ,偶尔直播写Alas,~~为了拯救Alas,Lme决定出道成为偶像~~
|
||||||
|
|||||||
16
alas.py
@@ -125,6 +125,10 @@ class AzurLaneAutoScript:
|
|||||||
content=f"<{self.config_name}> RequestHumanTakeover",
|
content=f"<{self.config_name}> RequestHumanTakeover",
|
||||||
)
|
)
|
||||||
exit(1)
|
exit(1)
|
||||||
|
except AutoSearchSetError:
|
||||||
|
logger.critical('Auto search could not be set correctly. Maybe your ships in hard mode are changed.')
|
||||||
|
logger.critical('Request human takeover.')
|
||||||
|
exit(1)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.exception(e)
|
logger.exception(e)
|
||||||
self.save_error_log()
|
self.save_error_log()
|
||||||
@@ -244,10 +248,6 @@ class AzurLaneAutoScript:
|
|||||||
from module.private_quarters.private_quarters import PrivateQuarters
|
from module.private_quarters.private_quarters import PrivateQuarters
|
||||||
PrivateQuarters(config=self.config, device=self.device).run()
|
PrivateQuarters(config=self.config, device=self.device).run()
|
||||||
|
|
||||||
def island(self):
|
|
||||||
from module.island.island import Island
|
|
||||||
Island(config=self.config, device=self.device).run()
|
|
||||||
|
|
||||||
def daily(self):
|
def daily(self):
|
||||||
from module.daily.daily import Daily
|
from module.daily.daily import Daily
|
||||||
Daily(config=self.config, device=self.device).run()
|
Daily(config=self.config, device=self.device).run()
|
||||||
@@ -418,6 +418,10 @@ class AzurLaneAutoScript:
|
|||||||
GemsFarming(config=self.config, device=self.device).run(
|
GemsFarming(config=self.config, device=self.device).run(
|
||||||
name=self.config.Campaign_Name, folder=self.config.Campaign_Event, mode=self.config.Campaign_Mode)
|
name=self.config.Campaign_Name, folder=self.config.Campaign_Event, mode=self.config.Campaign_Mode)
|
||||||
|
|
||||||
|
def daemon_15_1(self):
|
||||||
|
from module.daemon.daemon_15_1 import AzurLaneDaemon
|
||||||
|
AzurLaneDaemon(config=self.config, device=self.device, task="Daemon_15_1").run()
|
||||||
|
|
||||||
def daemon(self):
|
def daemon(self):
|
||||||
from module.daemon.daemon import AzurLaneDaemon
|
from module.daemon.daemon import AzurLaneDaemon
|
||||||
AzurLaneDaemon(config=self.config, device=self.device, task="Daemon").run()
|
AzurLaneDaemon(config=self.config, device=self.device, task="Daemon").run()
|
||||||
@@ -434,10 +438,6 @@ 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()
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 6.9 KiB |
|
Before Width: | Height: | Size: 6.9 KiB |
|
Before Width: | Height: | Size: 6.9 KiB |
|
Before Width: | Height: | Size: 6.9 KiB |
|
Before Width: | Height: | Size: 6.9 KiB |
|
Before Width: | Height: | Size: 6.9 KiB |
|
Before Width: | Height: | Size: 9.4 KiB |
|
Before Width: | Height: | Size: 5.6 KiB |
|
Before Width: | Height: | Size: 6.9 KiB |
|
Before Width: | Height: | Size: 6.9 KiB |
|
Before Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 5.0 KiB |
|
Before Width: | Height: | Size: 5.4 KiB |
|
Before Width: | Height: | Size: 8.1 KiB |
|
Before Width: | Height: | Size: 8.8 KiB |
|
Before Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 7.7 KiB |
|
Before Width: | Height: | Size: 8.6 KiB |
|
Before Width: | Height: | Size: 9.6 KiB |
|
Before Width: | Height: | Size: 9.6 KiB |
|
Before Width: | Height: | Size: 9.4 KiB |
|
Before Width: | Height: | Size: 9.4 KiB |
|
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 5.4 KiB |
|
Before Width: | Height: | Size: 7.6 KiB After Width: | Height: | Size: 6.1 KiB |
|
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 6.9 KiB |
|
Before Width: | Height: | Size: 5.1 KiB |
|
Before Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 6.1 KiB |
|
Before Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 5.4 KiB |
|
Before Width: | Height: | Size: 6.2 KiB |
|
Before Width: | Height: | Size: 7.1 KiB |
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 6.4 KiB |
BIN
assets/cn/exercise/QUIT_RECONFIRM.png
Normal file
|
After Width: | Height: | Size: 9.5 KiB |
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 49 KiB |
|
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 8.1 KiB |
BIN
assets/cn/freebies/MAIL_COLLECT.png
Normal file
|
After Width: | Height: | Size: 14 KiB |
BIN
assets/cn/freebies/MAIL_COLLECTED.png
Normal file
|
After Width: | Height: | Size: 10 KiB |
BIN
assets/cn/freebies/MAIL_DELETE.png
Normal file
|
After Width: | Height: | Size: 13 KiB |
BIN
assets/cn/freebies/MAIL_EMPTY.png
Normal file
|
After Width: | Height: | Size: 7.1 KiB |
BIN
assets/cn/freebies/MAIL_GUILD_MESSAGE.png
Normal file
|
After Width: | Height: | Size: 6.6 KiB |
|
Before Width: | Height: | Size: 7.8 KiB |
|
Before Width: | Height: | Size: 7.8 KiB |
|
Before Width: | Height: | Size: 8.9 KiB |
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 5.4 KiB |
|
Before Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 5.5 KiB |
|
Before Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 5.7 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 5.5 KiB |
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 5.5 KiB |
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 5.5 KiB |
|
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 5.4 KiB |
|
Before Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 6.9 KiB |
|
Before Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 5.2 KiB |
|
Before Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 5.0 KiB |
|
Before Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 3.2 KiB |
|
Before Width: | Height: | Size: 154 KiB |
|
Before Width: | Height: | Size: 9.0 KiB |
|
Before Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 7.1 KiB |
|
Before Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 6.4 KiB |
|
Before Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 8.9 KiB |
|
Before Width: | Height: | Size: 4.1 KiB |
|
Before Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 6.7 KiB |
|
Before Width: | Height: | Size: 7.5 KiB |
|
Before Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 7.3 KiB |
|
Before Width: | Height: | Size: 7.5 KiB |
|
Before Width: | Height: | Size: 6.9 KiB |
|
Before Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 6.9 KiB |
|
Before Width: | Height: | Size: 3.8 KiB |
|
Before Width: | Height: | Size: 7.5 KiB |
|
Before Width: | Height: | Size: 7.5 KiB |
|
Before Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 4.5 KiB |
|
Before Width: | Height: | Size: 13 KiB |