LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 17:09:26 +08:00
Code Activity
7,599 Commits 12 Branches 0 Tags
4caa2e2aec2ffd1c37253fbcddf4c6bdbfca7120
Commit Graph

205 Commits

Author SHA1 Message Date
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
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
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
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
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
Zuosizhu
26d32596b3 Feature: Remake GG Handler 2023-01-24 14:15:13 +08:00
Zuosizhu
71ce73fbef Fix： Reduce one possible restart. Event3 support. 2023-01-21 07:31:36 +08:00
Zuosizhu
b79e0490f3 Fix: Fatal error not discovered last commit 2023-01-21 06:30:40 +08:00
Zuosizhu
2a76ef57fd Fix: Checkbox AutoRestartGG of no use 2023-01-21 05:49:05 +08:00
Zuosizhu
a496f8b39e Feature: Auto restart in unsafe situations when GG is on 2023-01-21 05:06:56 +08:00
Zuosizhu
f43c27d29b Fix: Most errors in GG pop_up 2023-01-20 19:58:14 +08:00
Zuosizhu
c71819cbde Feature: Less protection(which means restart) for users choose not to restart AL everytime start Alas 2023-01-20 16:05:55 +08:00
Zuosizhu
1e39700677 Fix: Wrong GG Handler's config spelling 2023-01-20 04:32:10 +08:00
Zuosizhu
9bfafaa8d3 Fix: Login method 2023-01-19 17:49:05 +00:00
Zuosizhu
2ccf82a58c Fix: Circle of Task Restart 2023-01-19 17:49:05 +00:00
Zuosizhu
beace0a593 Fix: GG Handler's Logic and GG Handler not available if starting Alas in GameManager 2023-01-19 14:09:03 +08:00
Zuosizhu
b85d18f53f Fix: One should not use GG in raid and GG Handler's Logical issue 2023-01-19 12:25:01 +08:00
Zuosizhu
928f8f7660 Fix: Lots of bugs 2023-01-19 09:37:57 +08:00
Zuosizhu
69519f96bd Add: Totally useful GG Handler 2023-01-19 01:45:56 +08:00
LmeSzinc
37e0d70e0d Opt: Stop scrcpy server during wait 2023-01-01 02:36:28 +08:00
YJGeng-Iriy
a361d8ad0d opsi month boss init 2022-12-11 20:59:16 +08:00
nEEtdo0d
1d433efc7b Fix: merge LmeSzinc/dev into branch, resolve conflicts 2022-12-01 10:52:40 -05:00
SarContDeli
c9d9ca6cc5 Merge branch 'bug_fix' into base 
# Conflicts:
#	alas.py
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/os/map.py
 2022-11-30 20:56:52 +08:00
nEEtdo0d
bc3376e191 Fix: merge LmeSzinc/dev into branch, resolve conflicts 2022-11-29 15:04:47 -05:00
LmeSzinc
b8d06b12e5 Add: OpsiCrossMonth, not tested 2022-11-30 01:40:53 +08:00
nEEtdo0d
afc8468e0a Add: Opsi archive zone monthly task support 2022-11-28 00:21:52 -05:00
nEEtdo0d
629addada4 Add: Opsi voucher monthly task support 2022-11-26 23:44:38 -05:00
SarContDeli
1f38e92e02 Add: hazard 1 leveling 2022-11-12 00:05:30 +08:00
LmeSzinc
bb61f2f9b6 Merge branch 'dev' into mail_reward 2022-10-23 17:03:32 +08:00
LmeSzinc
50b2a64c9e Revert "Fix: [TW] Rollback to old daily module (#1293)" (#1760) 
This reverts commit a2921dcd
 2022-10-23 02:17:31 +08:00