LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 09:59:25 +08:00
Code Activity
10,175 Commits 12 Branches 0 Tags
d86d75735869ea2bc23a6548c6f4e040256c380d
Commit Graph

235 Commits

Author SHA1 Message Date
xhqss
a5dc9328c9 Merge branch 'master_lme' into dev 
# Conflicts:
#	module/coalition/coalition.py
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/config_generated.py
#	module/os_shop/shop.py
 2025-12-19 15:13:21 +08:00
LmeSzinc
265e33b93c Add: [ALAS] Syntactic sugar for state machine with timeout 2025-12-01 01:00:41 +08:00
xhqss
915364858f Fix timer.py 2025-10-24 13:06:01 +08:00
xhqss
092b813c25 Revert the lme changes to timer.py 2025-10-24 12:55:13 +08:00
xhqss
4137ff807c Merge branch 'master_lme' into dev 
# Conflicts:
#	module/config/argument/args.json
#	module/map/assets.py
#	module/shop/shop_reward.py
#	module/ui/assets.py
 2025-10-24 11:10:21 +08:00
LmeSzinc
01b3dc2369 Opt: [ALAS] handle first screenshot in loop() 2025-10-22 01:11:33 +08:00
LmeSzinc
d4142afa22 Refactor: Timer class 2025-10-22 01:09:45 +08:00
0O0o0oOoO00
f64bc96bb2 Merge remote-tracking branch 'LmeSzinc/master' into dev 
# Conflicts:
#	config/deploy.template-AidLux-cn.yaml
#	config/deploy.template-AidLux.yaml
#	config/deploy.template-cn.yaml
#	config/deploy.template-docker-cn.yaml
#	config/deploy.template-docker.yaml
#	config/deploy.template-linux-cn.yaml
#	config/deploy.template-linux.yaml
#	config/deploy.template.yaml
 2025-06-17 13:19:30 +08:00
LmeSzinc
25c81f08f4 Fix: [ALAS] close pillow Image object 2025-06-09 13:06:52 +08:00
ZuoSiZhu
609e466be6 Reapply "Pref: [ALAS] faster get_bbox()" 
This reverts commit a0d04bc7ec.
 2025-05-21 04:28:29 +08:00
ZuoSiZhu
dee0c1484f Merge branch 'master_lme' into dev 
# Conflicts:
#	campaign/Readme.md
#	module/base/utils.py
#	module/coalition/assets.py
#	module/config/argument/args.json
#	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
#	module/retire/dock.py
#	module/retire/enhancement.py
#	module/shop/shop_reward.py
 2025-05-21 04:17:08 +08:00
ZuoSiZhu
a0d04bc7ec Revert "Pref: [ALAS] faster get_bbox()" 
This reverts commit bc1046c79f.
 2025-05-21 03:36:05 +08:00
LmeSzinc
bc1046c79f Pref: [ALAS] faster get_bbox() 2025-05-20 00:37:33 +08:00
LmeSzinc
316966e60f Dev: [ALAS] add syntactic sugar to start a state loop 2025-05-19 02:49:21 +08:00
LmeSzinc
8311652caa Pref: [ALAS] Improve performance on various utils functions 2025-04-14 00:48:44 +08:00
ZuoSiZhu
39c18d8103 Merge remote-tracking branch 'lme/master' into dev 
# Conflicts:
#	deploy/AidLux/0.92/requirements.txt
#	module/campaign/campaign_event.py
#	module/os/map.py
#	module/os_ash/ash.py
#	module/webui/config.py
 2025-02-28 11:01:23 +08:00
LmeSzinc
abde744e29 Add: [ALAS] Util function xywh2xyxy(), xyxy2xywh() 2025-02-23 01:30:07 +08:00
LmeSzinc
5b4f4538ab Fix: [ALAS] get_bbox_reversed should have a reversed threshold by default 2025-02-20 12:09:27 +08:00
LA_DI_DA
531cf603a4 add: ApiCollectionSwitch 2025-02-14 15:59:46 +08:00
xhqss
2ddc7fff1c Merge branch 'master_lme' 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/config/config_manual.py
#	module/handler/assets.py
#	module/retire/retirement.py
#	module/tactical/tactical_class.py
 2025-01-16 08:52:42 +08:00
LmeSzinc
42b4eb38b7 Opt: [ALAS] Match luma template in match_template_color 
This is an untested change
 2024-12-27 02:57:08 +08:00
xhqss
e7f93d8efe Merge branch 'master_lme' 
# Conflicts:
#	module/equipment/equipment.py
 2024-12-20 23:51:48 +08:00
LmeSzinc
48e4c78a43 Fix: Default color match threshold should be the original value 
COLOR_SIMILAR_THRESHOLD
 2024-12-11 11:46:23 +08:00
LmeSzinc
ba5b853cb9 Refactor: Standardize the use of match_template_color() 2024-12-09 16:09:34 +08:00
LmeSzinc
164db6f4da Chore: Rename "threshold" in template matching to "similarity" 
to be differ from the "threshold" in color matching
 2024-12-09 15:37:25 +08:00
LA_DI_DA
a2e6986dcd Merge branch 'refs/heads/LmeSzinc/master' into dev 
# Conflicts:
#	module/campaign/campaign_status.py
#	module/exercise/combat.py
#	module/retire/dock.py
#	module/retire/enhancement.py
 2024-10-25 12:01:29 +08:00
LmeSzinc
34eb6c481e Fix: color_bar_percentage should get prev_color from similar color 
not average
 2024-09-25 14:29:49 +08:00
Zuosizhu
90bf70f578 Adj: Only enable ShipChanger in GemsFarming 2024-07-21 04:18:53 +08:00
ReLU
fceeff25e0 Merge remote-tracking branch 'upstream/master' into dev 2024-07-12 03:54:22 +08:00
LmeSzinc
b6fd913b56 Add: [ALAS] set_cached_property 2024-07-12 01:45:26 +08:00
Zuosizhu
1e31cb6de5 Merge branch 'master_lme' into AlasGGdev 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/coalition/coalition.py
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/os/operation_siren.py
#	module/os_handler/os_status.py
 2024-06-28 16:01:16 +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
霞飛
0b97b40c46 Feature: New OpsiShop. (#3086) 
* feat: New OpsiShop

* fix: use AdaptiveScroll

* feat: scan counter

* perf: calculate y value
 2024-06-17 11:24:40 +08:00
LmeSzinc
a668840ee9 Pref: Faster is_combat_loading() 2024-06-05 02:24:47 +08:00
LmeSzinc
58202c6a40 Pref: Reuse image array to improve memory performance 2024-06-05 01:15:41 +08:00
LmeSzinc
5f56a2bdb7 Chore: [ALAS] Move func methods to the Alas class 2024-05-30 13:34:24 +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
66f66c998d Add: Sync get_interval_timer 2024-05-23 01:44:49 +08:00
LmeSzinc
ecfd5d50bf Upd: [CN] Support UI in 2024.05.21 2024-05-23 01:16:41 +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
LmeSzinc
28b452164f Pref: Release rpc connection on idle so OCR can be load balanced 2024-05-09 02:57:45 +08:00
Zuosizhu
af1f0a9056 Merge branch 'LmeSzinc:master' into 20230309 2024-05-03 12:58:36 +08:00
LmeSzinc
a59f82225c Opt: [ALAS] Replace cv2.multiply with cv2.convertScaleAbs for faster 2024-05-02 17:41:02 +08:00
LmeSzinc
44c4ccc240 Opt: [ALAS] Improve memory performance in utils 2024-04-30 17:42:56 +08:00
Zuosizhu
4486c8cff6 Merge branch 'LmeSzinc:master' into 20230309 2024-04-15 23:25:52 +08:00
LmeSzinc
31da8d42a1 Opt: Early init minitouch and MaaTouch for faster startup 2024-04-15 03:48:37 +08:00
LmeSzinc
16ba4aaad6 Chore: Poorly search mxnet-cu* instead of using pkg_resources 2024-04-15 02:55:06 +08:00
LmeSzinc
8ee4405d49 Add: [ALAS] Add background worker 2024-04-13 23:32:13 +08:00
LmeSzinc
43bdc7e610 Opt: Add early_ocr_import for faster mxnet import 2024-04-13 22:48:12 +08:00
Zuosizhu
7f9c64e284 Merge branch 'LmeSzinc:master' into 20230309 2023-11-10 14:33:24 +08:00