1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 11:19:26 +08:00
Commit Graph

249 Commits

Author SHA1 Message Date
ZuoSiZhu
58a217d98f Merge branch 'master_lme' into dev
# Conflicts:
#	module/webui/app.py
#	module/webui/config.py
2025-03-28 00:23:16 +08:00
LA_DI_DA
6e5383f441 fix: wrong logic of check is_azur 2025-03-21 18:05:25 +08:00
LA_DI_DA
35819ec433 fix: check if is azurlane before ensure luahook resource 2025-03-21 18:02:41 +08:00
LA_DI_DA
82a2a79bab add: auto inject 2025-03-20 12:12:14 +08:00
ZuoSiZhu
85c76460ab Add: make hooklua usable 2025-03-19 19:13:48 +08:00
LmeSzinc
fd6556d5b1 Fix: [ALAS] Starting game after task wait has no retry
If it "start" fails next task would start
2025-03-19 16:42:18 +08:00
LA_DI_DA
48c57ee997 opt: no export for patchelf 2025-03-18 20:06:02 +08:00
LmeSzinc
477f917262 Refactor: deep methods reworked for better performance 2025-03-17 01:39:06 +08:00
ZuoSiZhu
b82b79988d Merge remote-tracking branch 'lme/master' into dev
# Conflicts:
#	module/config/argument/override.yaml
2025-03-14 00:57:23 +08:00
LmeSzinc
c5f1d6e18b Add: Tools to do event story 2025-03-10 23:02:16 +08:00
xhqss
2ddc7fff1c Merge branch 'master_lme'
# Conflicts:
#	module/campaign/gems_farming.py
#	module/config/config_manual.py
#	module/handler/assets.py
#	module/retire/retirement.py
#	module/tactical/tactical_class.py
2025-01-16 08:52:42 +08:00
LmeSzinc
da81498211 Add: Task Awaken to GUI 2025-01-04 22:19:30 +08:00
LA_DI_DA
559506d08b Fmt: use flag to check class 2024-08-25 12:20:59 +08:00
LA_DI_DA
4654d2ed56 Fix: check self in first start for maa submodule 2024-08-25 12:20:58 +08:00
Zuosizhu
3448e78a0d Fix: Call GG first instead of restarting game when exiting game while waiting. 2024-08-24 08:28:41 +08:00
LA_DI_DA
9b7852478a Fix: maa submodule 2024-08-04 17:26:57 +08:00
Zuosizhu
90bf70f578 Adj: Only enable ShipChanger in GemsFarming 2024-07-21 04:18:53 +08:00
LA_DI_DA
a12a831419 Merge branch 'refs/heads/lme-alas/master' into dev
# Conflicts:
#	alas.py
2024-07-18 23:12:53 +08:00
LmeSzinc
3e2c9c0a53 Fix: [ALAS] Device.config was never updated during scheduler run 2024-07-15 23:45:43 +08:00
LA-DI-DA
23152493b1 Add: pick out auto research farming from more alas 2024-07-07 11:53:00 +08:00
LA_DI_DA
573210af2b Merge branch 'refs/heads/lme-alas/master' into dev
# Conflicts:
#	alas.py
#	module/os/fleet.py
2024-06-22 20:31:35 +08:00
LmeSzinc
f810db8bea Fix: Skip first screenshot in tools
since you cannot run benchmark before benckmarked
2024-06-21 01:42:45 +08:00
LmeSzinc
5f56a2bdb7 Chore: [ALAS] Move func methods to the Alas class 2024-05-30 13:34:24 +08:00
LmeSzinc
6365693cef Fix: [ALAS] Game restarted twice if close game during wait 2024-05-30 12:37:03 +08:00
LmeSzinc
f16d648d84 Dev: [ALAS] Log ScriptError as exception so traceback can be logged 2024-05-30 12:36:49 +08:00
LA_DI_DA
7970d5b3a3 Merge branch 'refs/heads/smallkai' into smallkai-dev 2024-05-25 19:45:50 +08:00
LA_DI_DA
cd64d084b2 Fix: set gemsfarming's ship filter to default after this task is set to campaign_main 2024-05-25 19:43:00 +08:00
LA_DI_DA
0f80364ed3 Fix: save global to a single file for cross-module use 2024-05-25 11:16:00 +08:00
LA_DI_DA
ea6ad05290 Fix: let all main and event class to inherit old class 2024-05-24 20:59:47 +08:00
LA_DI_DA
945f7d49cf fix: get global when redirect inherit 2024-05-20 23:38:49 +08:00
LA_DI_DA
0101eaf3e3 fix: Adapt to new APIs from upstream
# fuck LmeSzinc/AzurLaneAutoScript#3556
# fuck @Air111
2024-05-19 19:59:03 +08:00
LA_DI_DA
06d9b8bcc9 Add: handle MapDetectionError 2024-02-12 16:32:05 +08:00
LA-DI-DA
d1f6154a31 Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 2023-10-01 15:27:45 +08:00
LA-DI-DA
e3db31de2e Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 2023-09-30 16:50:09 +08:00
LA-DI-DA
bb1de7b7fe Add: gg package check 2023-09-30 12:38:34 +08:00
Zuosizhu
4d4d2377dc Merge branch 'master_lme'
# Conflicts:
#	module/device/method/droidcast.py
2023-09-28 18:09:13 +08:00
LA-DI-DA
09f4a227bb Merge branch 'zuosizhu-alas/20230309' into smallkai
# Conflicts:
#	module/config/argument/task.yaml
2023-09-23 22:30:37 +08:00
Zuosizhu
6f37d69031 Opt: Restart emulator in some cases 2023-09-16 16:29:12 +08:00
Zuosizhu
3b27323132 Merge remote-tracking branch 'LmeSzinc/feature' into merged_origin_feature 2023-09-11 20:24:49 +08:00
LA_DI_DA
174ea3530b Add: more option for auto restart when alas get a error 2023-08-27 14:53:24 +08:00
LA-DI-DA
5711665c38 Del: useless small game 2023-08-18 20:34:54 +08:00
LA-DI-DA
b032b8e52b Add shabi small game 2023-07-23 01:39:32 +08:00
LA-DI-DA
d392dadf51 Add something special 2023-07-20 22:37:00 +08:00
LA-DI-DA
84b2dde422 Merge branch 'wait' into smallkai
# Conflicts:
#	README.md
#	alas.py
#	assets/cn/gg_handler/BUTTON_GG_ENTER_POS.png
#	assets/cn/gg_handler/BUTTON_GG_TAB_SEARCH_POS.png
#	assets/gui/css/alas.css
#	config/template.json
#	module/campaign/assets.py
#	module/campaign/campaign_event.py
#	module/config/argument/args.json
#	module/config/argument/task.yaml
#	module/config/config_updater.py
#	module/config/i18n/ja-JP.json
#	module/log_res/log_res.py
2023-07-17 18:45:43 +08:00
yypsybs
28cae91564 Opt: minigame
Opt: minigame multi language assets
Opt: minigame multi language i18n
Opt: minigame config
Fix: minigame-stuck when max ticket
2023-07-11 18:00:03 +08:00
LmeSzinc
c46feef6e8 Add: Auto start emulators 2023-04-25 23:51:54 +08:00
Zuosizhu
fa276716d1 Merge branch 'master_lme'
# Conflicts:
#	alas.py
2023-04-20 01:25:28 +08:00
LA-DI-DA
2092979b66 Merge branch 'lme-alas/master' into wait 2023-04-15 10:04:27 +08:00
LmeSzinc
0fd15a26c4 Fix: The task waited is not the first task (fixed #2489) 2023-04-14 19:08:43 +08:00
Zuosizhu
6a04de556e Fix: handle_notify error 2023-04-03 09:28:46 +08:00