1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-21 01:49:29 +08:00
Commit Graph

5867 Commits

Author SHA1 Message Date
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
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
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
Air111
6107ce024e Upd: rename equipment buttons 2024-05-06 00:50:08 +08:00
Air111
5e77b8d6e9 Fix: check EQUIPMENT_OPEN using template matching 2024-05-06 00:50:08 +08:00
Zuosizhu
a3e1d994bb Merge branch 'LmeSzinc:master' into 20230309 2024-05-03 19:58:18 +08:00
LmeSzinc
b80f3533a1 Fix: [TW] OCR error on commission name 2024-05-03 16:49:11 +08:00
LmeSzinc
a5948df800 Fix: ship_info_enter with template matching check 2024-05-03 16:42:31 +08:00
LmeSzinc
6e7f92aae3 Fix: Array typo in DroidCast image parse 2024-05-03 16:37:25 +08:00
下面我簡單喵兩句
81b8ae1512 Upd:[TW]research assets (#3721) 2024-05-03 14:49:42 +08:00
Zuosizhu
af1f0a9056 Merge branch 'LmeSzinc:master' into 20230309 2024-05-03 12:58:36 +08:00
LmeSzinc
d7bb28323b Merge pull request #3716 from LmeSzinc/dev
Bug fix
2024-05-02 18:05:51 +08:00
LmeSzinc
91f2d9506c Opt: Improve memory performance in GlobeOperation.find_peaks 2024-05-02 17:41:12 +08:00
LmeSzinc
a59f82225c Opt: [ALAS] Replace cv2.multiply with cv2.convertScaleAbs for faster 2024-05-02 17:41:02 +08:00
LmeSzinc
5be152baf1 Fix: relative_hsv_count was counting pixels in 3 channels
causing lots of predict_current_fleet() mis-detection
2024-05-02 16:47:11 +08:00
LmeSzinc
24fa10c509 Opt: Faster DroidCast_raw image parsing 2024-05-02 16:35:34 +08:00
LmeSzinc
e2e431d3b1 Fix: Fleets not sorted if multiple current fleets found 2024-05-02 14:08:20 +08:00
LmeSzinc
e7bc1c94a4 Fix: [ALAS] Log empty command list 2024-05-01 23:59:59 +08:00
LmeSzinc
75333193ea Fix: [ALAS] insert_swipe() may return a length=1 list after deleting nearing points 2024-05-01 23:40:17 +08:00
LmeSzinc
04538c4b1a Fix: MAP_SWIPE_DROP should >= MAP_GRID_CENTER_TOLERANCE 2024-05-01 23:37:53 +08:00
LmeSzinc
11162310d1 Merge pull request #3708 from LmeSzinc/sync_test
Bug fix
2024-04-30 18:26:19 +08:00
LmeSzinc
741fc1c247 Chore: Remove debug loggers 2024-04-30 18:13:48 +08:00
LmeSzinc
107f88a275 Merge remote-tracking branch 'origin/dev' into sync_test 2024-04-30 17:43:32 +08:00
LmeSzinc
499639f657 Fix: Predict swipe end 2024-04-30 17:42:56 +08:00
LmeSzinc
58922cccb8 Opt: Improve memory performance in map detection 2024-04-30 17:42:56 +08:00
LmeSzinc
44c4ccc240 Opt: [ALAS] Improve memory performance in utils 2024-04-30 17:42:56 +08:00
LmeSzinc
0fb6a96691 Refactor: Make MaaTouch inputs synchronous 2024-04-30 17:42:52 +08:00
Zuosizhu
77e7276902 Merge branch 'lme_master'
# Conflicts:
#	module/equipment/equipment_change.py
2024-04-30 11:12:03 +08:00
Zuosizhu
1d73c9fef1 Merge branch 'master_lme' into lme_master
# Conflicts:
#	module/equipment/equipment_change.py
2024-04-30 11:10:58 +08:00
LmeSzinc
4d20b7ef20 Merge pull request #3704 from LmeSzinc/dev
Bug fix
2024-04-30 00:07:54 +08:00
LmeSzinc
152f5b596a Chore: [ALAS] Patch uiautomator2 loggers so they can be logged in Alas 2024-04-30 00:06:40 +08:00
LmeSzinc
57d42a14ae Chore: [ALAS] Add method uninstall_uiautomator2 2024-04-30 00:06:33 +08:00
LmeSzinc
4cff3e6283 Fix: [ALAS] Patch u2.init.appdir in runtime 2024-04-30 00:06:25 +08:00
LmeSzinc
74d3aa5ad5 Merge pull request #3701 from LmeSzinc/dev
Bug fix
2024-04-29 00:46:36 +08:00
LmeSzinc
30d4ffc644 Fix: _reward_mission_collect() calls should have minimum interval 2024-04-29 00:45:40 +08:00
Air111
b303d2279a Fix: equipment image record in fast PC (#3700) 2024-04-29 00:43:39 +08:00
LA_DI_DA
219bb4764b Del: screenshot interval limit 2024-04-28 23:36:09 +08:00
LA_DI_DA
e6f317de1b Revert "Del: screenshot interval limit"
This reverts commit 860bcf5760.
2024-04-28 23:34:16 +08:00
LA_DI_DA
efb36a7f45 Fix: should reset record que after loading config 2024-04-28 23:32:57 +08:00