LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-21 20:29:29 +08:00
Code Activity
9,139 Commits 12 Branches 0 Tags
ca22f21108cc0daaa2ab4dc7b994f47d5df19a4d
Commit Graph

101 Commits

Author SHA1 Message Date
xhqss
ca22f21108 Merge branch 'master_GG' 2024-12-20 23:55:46 +08:00
xhqss
e7f93d8efe Merge branch 'master_lme' 
# Conflicts:
#	module/equipment/equipment.py
 2024-12-20 23:51:48 +08:00
LmeSzinc
ba5b853cb9 Refactor: Standardize the use of match_template_color() 2024-12-09 16:09:34 +08:00
LA_DI_DA
66d0734ea0 Merge branch 'refs/heads/0O0o0oOoO00-alas/master' into dev 
# Conflicts:
#	alas.py
#	module/exception.py
 2024-07-06 19:23:57 +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
58202c6a40 Pref: Reuse image array to improve memory performance 2024-06-05 01:15:41 +08:00
LA_DI_DA
f8964c88d9 Merge branch 'refs/heads/0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	.gitignore
#	alas.py
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/argument/task.yaml
#	module/config/config_generated.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
#	module/handler/login.py
 2024-05-23 13:07:57 +08:00
Zuosizhu
ddcfbb0a97 Merge branch 'master_lme' 
# Conflicts:
#	README.md
#	deploy/adb.py
#	deploy/pip.py
#	module/daily/equipment.py
 2024-05-23 02:31:29 +08:00
LmeSzinc
ecfd5d50bf Upd: [CN] Support UI in 2024.05.21 2024-05-23 01:16:41 +08:00
LA_DI_DA
6669aa99b4 Revert "fix: check if has login" 
This reverts commit 8fd1c2122b.
 2024-05-21 23:01:07 +08:00
LA_DI_DA
c19053125f Revert "fix: disable has_login before start" 
This reverts commit 12c99a3eae.
 2024-05-21 23:00:07 +08:00
LA_DI_DA
12c99a3eae fix: disable has_login before start 2024-05-18 22:50:45 +08:00
LA_DI_DA
8fd1c2122b fix: check if has login 2024-05-18 00:14:05 +08:00
mulaikurisu
ed5a8f4584 Merge branch 'smallkai' into dev 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/config/argument/args.json
#	module/device/device.py
 2024-04-12 00:16:19 +08:00
Zuosizhu
b6e6f60754 Merge branch 'LmeSzinc:master' into 20230309 2024-03-29 07:09:29 +08:00
LmeSzinc
32e4571afc Upd: LOGIN_ANNOUNCE 2024-03-28 23:43:18 +08:00
LA-DI-DA
85c03c063c Add: account data file check 2023-12-22 21:06:41 +08:00
LA-DI-DA
2e08b76ff1 Add: one click login 2023-12-22 21:06:25 +08:00
LA-DI-DA
1673a9d61d Add: switch account 2023-12-20 22:26:36 +08:00
Zuosizhu
9a908c3757 Merge branch 'LmeSzinc:master' into 20230309 2023-05-16 22:08:54 +08:00
LmeSzinc
437dbe6171 Fix: [CN] Handle bilibili user agreement 2023-05-16 00:51:58 +08:00
Zuosizhu
ccc991d098 Fix: redundant u2 restart 2023-03-29 23:52:11 +08:00
Zuosizhu
df1fcba2f8 Opt: restart u2 after GGStatus checked and before GG is set on to avoid U2 dies when using LDPlayer. 2023-03-29 23:36:16 +08:00
Zuosizhu
0a80de07af Fix: Auto handle game server maintenance 2023-03-09 14:07:57 +08:00
Zuosizhu
9f0ee98000 Fix: Restart ATX and UiAutomator at an incorrect situation 2023-02-24 21:01:00 +08:00
Zuosizhu
e3d77a62ca Fix: Set a timeout for restart atx, to fix no notify push if emulator died 2023-02-13 10:51:20 +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
26d32596b3 Feature: Remake GG Handler 2023-01-24 14:15:13 +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
be473c4682 Fix: Sometimes not sync config 2023-01-20 16:02:50 +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
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
0195a08b06 Fix: Not enabling multipier after restart 2023-01-19 02:37:35 +08:00
Zuosizhu
69519f96bd Add: Totally useful GG Handler 2023-01-19 01:45:56 +08:00
Zuosizhu
05007a9344 Fix: OCR_GEM Accuracy 2023-01-17 23:07:46 +08:00
Zuosizhu
b935eec635 Fix: GG_handler available to be modified 2023-01-17 13:38:45 +08:00
Zuosizhu
fe10942b9f Fix: GG_handler available to use 2023-01-17 11:46:36 +08:00
LmeSzinc
e59c7f7fc0 Fix: Remove emulator calls before refactored 2023-01-09 00:16:48 +08:00
SarContDeli
6a4d3b5da5 Opt: Independent option to restart emulator daily 2022-12-01 15:20:14 +08:00
LmeSzinc
7fb8092950 Refactor: Reuse ui_page_main_popups in LoginHandler 2022-10-02 21:29:56 +08:00
LmeSzinc
c4714f7638 Fix: Missing offset of LOGIN_CHECK (#1566) 2022-08-28 23:17:40 +08:00
SarContDeli
ac5466e5dc Upd: Modified some options for restart emulator 2022-08-17 20:22:11 +08:00
SarContDeli
3d6d777413 Add: Emulator auto detect and restart(experimental) 2022-08-05 09:53:28 +08:00
LmeSzinc
22ac87d9ae Fix: Don't check GET_SHIP before logged in (#1325) 2022-07-16 00:13:55 +08:00
LmeSzinc
ad3be48b5a Fix: Check LOGIN_CONFIRM before GET_SHIP (fixed #1152) 2022-07-09 13:03:49 +08:00