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

6007 Commits

Author SHA1 Message Date
LmeSzinc
d4dec4ed55 Upd: [TW] UI assets 2024-05-24 02:49:39 +08:00
LmeSzinc
b8613b30fb Upd: [JP] UI assets 2024-05-24 02:35:35 +08:00
LmeSzinc
e2bf7e2997 Upd: [EN] UI assets 2024-05-24 02:33:40 +08:00
LA_DI_DA
7289238d0b Revert "Add: add log for inherit redirection"
This reverts commit c4665071db.
2024-05-23 23:56:57 +08:00
LA_DI_DA
c4665071db Add: add log for inherit redirection 2024-05-23 23:29:12 +08:00
LA_DI_DA
3169912ec5 Fix: adaptation mistake 2024-05-23 21:27:18 +08:00
LA_DI_DA
41794891df Merge branch 'refs/heads/smallkai-dev' into smallkai
# Conflicts:
#	module/config/argument/args.json
#	module/config/i18n/zh-CN.json
2024-05-23 12:53:42 +08:00
LA_DI_DA
880a1834ec Merge branch 'refs/heads/zuosizhu-alas/20230309' into smallkai-dev
# Conflicts:
#	README.md
#	module/equipment/equipment.py
#	module/equipment/equipment_change.py
2024-05-23 12:51:24 +08:00
xhqss
584c58c3c2 Correct config 2024-05-23 08:29:30 +08:00
xhqss
c0c4913353 Merge branch '20230309' into smallkai
# Conflicts:
#	module/config/i18n/zh-CN.json
2024-05-23 08:25:21 +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
d20886131e Fix: Typo on IDLE.match_luma 2024-05-23 02:15:19 +08:00
LmeSzinc
a448e8f31d Fix: Missing mail assets import 2024-05-23 01:55:43 +08:00
LmeSzinc
66f66c998d Add: Sync get_interval_timer 2024-05-23 01:44:49 +08:00
LmeSzinc
254e9422ed Fix: auto_search_moving ends with is_combat_executing 2024-05-23 01:44:31 +08:00
LmeSzinc
f5f2112442 Upd: [CN][EN][JP] Dock favourite assets 2024-05-23 01:42:19 +08:00
LmeSzinc
3513daf926 Fix: match_binary in idle page for various background 2024-05-23 01:17:31 +08:00
LmeSzinc
ecfd5d50bf Upd: [CN] Support UI in 2024.05.21 2024-05-23 01:16:41 +08:00
LmeSzinc
339530c5d3 Add: Chapter B 2024-05-23 01:16:41 +08:00
Air111
608a4059a6 Fix: avoid continuous clicking AUTO_SEARCH_OS_MAP_OPTION_OFF 2024-05-23 01:16:12 +08:00
LA_DI_DA
8d8fc78735 add: add log for switching assets 2024-05-22 20:19:48 +08:00
LA_DI_DA
551d10cdb8 fix: Adapt to new APIs in retire, exercise, hard
# module/retire/dock.py
# module/exercise/equipment.py
# module/hard/equipment.py
2024-05-22 10:33:49 +08:00
LmeSzinc
a79562aebc Add: Chapter AC 2024-05-22 02:29:23 +08:00
LmeSzinc
ffe2a213ca Fix: Handle idle page 2024-05-22 01:44:45 +08:00
LmeSzinc
36f786ca53 Upd: [EN][JP] Assets in page_reward 2024-05-22 01:15:18 +08:00
LmeSzinc
aed4e7b499 Fix: Enlarge search area of rewards
since they are now floating
2024-05-21 23:23:48 +08:00
LmeSzinc
b85d646a84 Add: Event entrance of Light of the Martyrium (event_20240521_cn) 2024-05-21 22:53:12 +08:00
LA_DI_DA
945f7d49cf fix: get global when redirect inherit 2024-05-20 23:38:49 +08:00
LA_DI_DA
6c702d49ef fix(InstanceRestart): record instance which has restarted too many times 2024-05-20 22:39:25 +08:00
LA_DI_DA
72acfd999b fix(AutoRestart): lack of gui setting of InstanceRestart 2024-05-20 22:38:08 +08:00
LmeSzinc
307c9e75f5 Chore: AdaptiveScroll docstring 2024-05-19 23:10:09 +08:00
LmeSzinc
65fe0c1ebd Fix: center_offset hasn't been calculated if map detection failed 2024-05-19 23:06:52 +08:00
LA_DI_DA
eb066faf92 Merge branch 'refs/heads/smallkai' into smallkai-dev 2024-05-19 19:59:21 +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
Zuosizhu
5123bd9949 Merge branch 'lme_master'
# Conflicts:
#	README.md
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/equipment/equipment_change.py
2024-05-19 00:50:11 +08:00
Zuosizhu
f06d2b33df Merge branch 'master_lme' into lme_master
# Conflicts:
#	module/equipment/equipment.py
2024-05-19 00:46:33 +08:00
LA_DI_DA
85e4f8e15e Merge branch 'refs/heads/lme-alas/master' into smallkai
# Conflicts:
#	README.md
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/equipment/equipment.py
#	module/equipment/equipment_change.py
2024-05-17 18:38:32 +08:00
LA_DI_DA
4481519a82 Merge branch 'refs/heads/zuosizhu-alas/20230309' into smallkai 2024-05-17 18:09:32 +08:00
霞飛
034570f157 feat: Add SRC framework 2024-05-15 15:27:53 +08:00
LmeSzinc
382980ca06 Fix: Add PAUSE in stuck record since is_combat_executing() bypassed appear() 2024-05-09 21:40:37 +08:00
rilylc
bbe601b687 Upd:[TW]Event:Upon the Shimmering Blue Rerun 2024-05-09 18:58:41 +08:00
LmeSzinc
5aca54d438 Fix: Add atomic OCR method on client side 2024-05-09 18:51:52 +08:00
LmeSzinc
4e469098e2 Fix: Handle another PAUSE and remove direct use of PAUSE 2024-05-09 18:50:32 +08:00
LmeSzinc
6bd10d1a9d Chore: [ALAS] Default image name in image_save 2024-05-09 18:46:53 +08:00
LmeSzinc
28b452164f Pref: Release rpc connection on idle so OCR can be load balanced 2024-05-09 02:57:45 +08:00
LmeSzinc
c47c5b3bd1 Fix: Add atomic OCR method on rpc server 2024-05-09 02:24:28 +08:00
LmeSzinc
dbc80e3d26 Fix: [ALAS] socket timeout on scrcpy server startup
(cherry picked from commit 6e703ffb666fe9e2c4e7d42eee9fbd69f26451c7)
2024-05-08 01:04:04 +08:00
Air111
c5073e5917 Upd: gui text (#3735) 2024-05-08 01:01:12 +08:00
LmeSzinc
1fedcb6fda Fix: Retry getting stock limit 2024-05-06 00:59:16 +08:00
LmeSzinc
2650bc336a Fix: Retry getting shop item limit 2024-05-06 00:56:42 +08:00