LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-21 02:59:30 +08:00
Code Activity
8,065 Commits 12 Branches 0 Tags
a3e1d994bb6507e73b6369ec772010ffda30afd5
Commit Graph

5621 Commits

Author SHA1 Message Date
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
LmeSzinc
63fd8b63f6 Opt: [ALAS] Lazy import onepush 2024-04-28 17:12:03 +08:00
LmeSzinc
cdcdd16118 Fix: info_bar covers map clear percentage 2024-04-28 16:32:18 +08:00
Zuosizhu
8fd3c7eedd Merge branch 'master_lme_to_merge' 
# Conflicts:
#	assets/cn/equipment/FLEET_DETAIL_CHECK.png
#	assets/en/equipment/FLEET_DETAIL_CHECK.png
#	assets/jp/equipment/FLEET_DETAIL_CHECK.png
#	assets/tw/equipment/FLEET_DETAIL_CHECK.png
#	deploy/docker/requirements.txt
#	deploy/git.py
#	module/campaign/gems_farming.py
#	module/equipment/assets.py
#	module/equipment/equipment_change.py
#	requirements-in.txt
#	requirements.txt
 2024-04-27 13:00:39 +08:00
Zuosizhu
e99c8ad341 Revert "Upd: Flagship changing (#3556)" 
This reverts commit 2507b0fa
 2024-04-27 12:58:56 +08:00
Zuosizhu
4fcb955168 Revert "Fix: rename equip_enter" 
This reverts commit cddfea680d.
 2024-04-27 12:57:37 +08:00
Zuosizhu
f4245fef77 Revert "Fix: update [CN/JP/TW] asset EQUIPPING_ON to handle cat claw" 
This reverts commit 932cd6c370.
 2024-04-27 12:57:34 +08:00
Zuosizhu
7e75b7fdd7 Revert "Fix: scan ships in correct fleet" 
This reverts commit 0eee91a891.
 2024-04-27 12:57:29 +08:00
Zuosizhu
d43b218a0f Revert "Fix: lower SIM_VALUE in ship matching of GemsFarming" 
This reverts commit 194ec3e234.
 2024-04-27 12:57:26 +08:00
Zuosizhu
8ab056b5f6 Revert "Fix: rename equipment functions (#3665)" 
This reverts commit 250cf4e1a2.
 2024-04-27 12:57:18 +08:00
guoh064
faae3c9f21 Add: jp event entrance 20240425 (#3681) 2024-04-26 18:36:05 +08:00
LmeSzinc
cba28a8aac Fix: Full scan wasn't early stopped cuz mixed use of siren and boss 2024-04-26 13:37:25 +08:00
LmeSzinc
bfb9bd0d61 Fix: Convert stage names in event_20240425_cn 2024-04-26 04:07:31 +08:00
LmeSzinc
0437ae80e6 Fix: Increase MAP_GRID_CENTER_TOLERANCE since short swipes on map no longer be responded to 2024-04-26 04:06:23 +08:00
LmeSzinc
7a45fed67f Fix: Duplicated SheffieldIdol template 2024-04-26 04:01:06 +08:00
LmeSzinc
bbef93c03d Add: Heart-Linking Harmony chapter ISP 2024-04-26 03:25:58 +08:00
Zuosizhu
055720dd52 Merge branch 'master_lme' 
# Conflicts:
#	deploy/config.py
 2024-04-26 03:18:16 +08:00
LmeSzinc
fbf7bc02c6 Add: Heart-Linking Harmony chapter SP 2024-04-26 02:45:10 +08:00
LmeSzinc
75644f91d0 Add: Event entrance of Heart-Linking Harmony (event_20240425_cn) 2024-04-26 00:00:28 +08:00
LmeSzinc
c5415d15be Fix: [ALAS] Allow removing non-existent forwards and reverses 2024-04-25 19:05:42 +08:00