LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-16 15:19:28 +08:00
Code Activity
8,551 Commits 12 Branches 0 Tags
af5bcafcc5ccccbbf8d1db5d86d9b3c8a73da621
Commit Graph

230 Commits

Author SHA1 Message Date
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
Zuosizhu
2ad20039d9 Fix: Catch GameStuckError in GG set 2023-04-01 12:31:53 +08:00
0O0o0oOoO00
3d39768fa1 Merge pull request from 0O0o0oOoO00 
Bug fix
 2023-03-26 22:26:06 +08:00
0O0o0oOoO00
ec8cefb4ae Merge pull request from 0O0o0oOoO00 
Screenshot interval change
 2023-03-26 17:21:08 +08:00
0O0o0oOoO00
a66a13d917 Merge pull request from 0O0o0oOoO00 
Alas Change
 2023-03-25 11:42:29 +08:00
Zuosizhu
fb67ae3ab7 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	module/campaign/campaign_event.py
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/config_manual.py
#	module/config/config_updater.py
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
 2023-03-24 16:33:37 +08:00
LmeSzinc
8c8d44a09f Add: CoalitionSp task 2023-03-24 04:55:34 +08:00
LmeSzinc
7ecf3ac502 Add: Coalition task 2023-03-24 04:41:13 +08:00
Zuosizhu
cce684aa24 Add: Stop Alas or GemsFarming when auto search settings could not be set 2023-02-28 20:29:30 +08:00
Zuosizhu
e6a519f145 Fix: Connection error 2023-02-24 22:07:16 +08:00
Zuosizhu
9f0ee98000 Fix: Restart ATX and UiAutomator at an incorrect situation 2023-02-24 21:01:00 +08:00
Zuosizhu
db8aede987 Feature: Change flagship and vanguard in Event hard mode when GemsFarming 2023-02-24 18:37:14 +08:00
Zuosizhu
38d949ad3a Fix: Alas with GG support will now check the server status before the first forced restart(if chosen to) 2023-02-02 09:22:38 +08:00
Zuosizhu
d07264269e Merge branch master from "github.com/LmeSzinc/AzurLaneAutoScript" 2023-01-31 00:01:24 +08:00
Zuosizhu
9f4af57ad3 Mod: Move lua to /bin/Lua and some little rebuilds 2023-01-29 02:07:23 +08:00
Zuosizhu
1a8c22b6ec Fix: Another unstoppable restart. 
Add adb method in gghandler(not usable)
 2023-01-28 19:29:48 +08:00
Zuosizhu
3ff90bc0c6 Remake: Encapsulation of GG Handler 
* Remake: Encapsulation of GG Handler

* Fix: Unstoppable restart
 2023-01-28 15:46:53 +08:00
Zuosizhu
d0a2e4a916 Merge branch 'master' of http://github.com/LmeSzinc/AzurLaneAutoScript 2023-01-27 10:38:01 +08:00
Zuosizhu
d5aa2d5ed4 Fix: Alas crashes if uiautomator service down. And restart the game in GamePageUnknownError 2023-01-26 16:54:36 +08:00
Zuosizhu
128fba3851 Fix: GG won't start in War Archieve 2023-01-26 13:29:01 +08:00