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

478 Commits

Author SHA1 Message Date
xhqss
a09ecb2ee1 Merge branch 'master_lme' into dev 
# Conflicts:
#	module/config/argument/args.json
 2025-12-20 23:31:25 +08:00
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
63a2d7388f Upd: crop fleet clear assets to avoid collision with info_bar 2025-12-19 03:54:21 +08:00
LmeSzinc
eb30860260 Opt: Faster fleet set by setting fleet 2 and submarine together 2025-12-19 03:44:02 +08:00
LmeSzinc
32d36cd06d Fix: No submarine in hard campaign if team not prepared 2025-12-09 12:40:52 +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
b56ab2d555 Fix: Add W15 spesific FLEET_2_IN_USE that does not intersect with info_bar 2025-10-24 01:11:52 +08:00
LmeSzinc
ebe5ca794b Fix: [TW] FLEET_2_IN_USE should not intersect with info_bar 2025-10-24 00:48:42 +08:00
guoh064
c6957dcee2 Fix: load offset of AUTO_SEARCH_SETTINGS first to avoid click effects masking buttons (#5238) 2025-10-20 11:57:28 +08:00
Zuosizhu
31c99d8953 Merge remote-tracking branch 'Lme/master' into dev 
# Conflicts:
#	module/campaign/os_run.py
#	module/config/argument/args.json
#	module/os/operation_siren.py
#	module/retire/assets.py
#	module/shop/shop_reward.py
#	module/shop/ui.py
#	module/ui/assets.py
 2025-10-12 11:28:13 +08:00
LmeSzinc
076996a76a Fix: Fixup submarine spawn point on init scan (#5117) 
If a grid is_submarine, the lower grid may detected as is_fleet, because they have the same ammo icon
 2025-09-22 04:29:46 +08:00
0O0o0oOoO00
f65933e89a Merge branch 'Lme/master' into dev 
# Conflicts:
#	README.md
#	module/config/argument/args.json
 2025-09-13 23:04:47 +08:00
LmeSzinc
44b3ae1884 Opt: Avoid extra clicking MAP_MODE_SWITCH_HARD on appear animation 2025-09-13 20:53:12 +08:00
LmeSzinc
a7434026a9 Fix: check CLEAR button to avoid early stopped at popup showing animation 2025-09-13 19:57:29 +08:00
LmeSzinc
ac63403cb3 Fix: handle flare animation upon MAP_MODE_SWITCH_HARD 2025-09-13 02:19:14 +08:00
0O0o0oOoO00
f96b13fea2 Merge branch 'Lme/master' into dev 
# Conflicts:
#	assets/cn/campaign/EVENT_20221124_ENTRANCE.png
#	campaign/event_20221124_cn/campaign_base.py
#	module/campaign/assets.py
#	module/config/argument/override.yaml
#	module/config/config_updater.py
#	module/retire/assets.py
#	module/shop/shop_reward.py
 2025-08-16 14:24:45 +08:00
LmeSzinc
f6cfe110bd Fix: Expand GET_ITEMS_1_RYZA to handle multiple drop rows 2025-08-03 03:05:41 +08:00
xhqss
0339fe9dcc Merge branch 'master_lme' into dev 
# Conflicts:
#	module/event_hospital/assets.py
 2025-05-25 15:18:10 +08:00
LmeSzinc
1bbd26c2b4 Fix: Inconsistent map_allow_submarine after choosing fleet_2 (#4824) 2025-05-24 00:29:03 +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
LmeSzinc
3c5eea5fb0 Fix: Keep untracked enemies if MAP_HAS_MOVABLE_NORMAL_ENEMY 2025-05-21 01:48:29 +08:00
LmeSzinc
c8b6f11382 Fix: When handing GAME_TIPS in perspective error it should check app_is_running 2025-05-11 18:28:45 +08:00
ZuoSiZhu
166b49f8f0 Merge branch 'master_lme' into dev 
# Conflicts:
#	alas.py
#	module/config/config_manual.py
#	module/ui/page.py
#	module/ui/ui.py
 2025-03-28 08:34:41 +08:00
ZuoSiZhu
58a217d98f Merge branch 'master_lme' into dev 
# Conflicts:
#	module/webui/app.py
#	module/webui/config.py
 2025-03-28 00:23:16 +08:00
LmeSzinc
34e22491f8 Add: Fleet recommend 2025-03-28 00:19:33 +08:00
LmeSzinc
a55d7504f7 Fix: Override to disable submarine if stage don't allow submarine (#4668) 2025-03-20 18:06:22 +08:00
xhqss
baa8d2ccd7 Merge branch 'master_lme' 
# Conflicts:
#	README.md
#	module/ui_white/assets.py
 2025-01-19 15:59:20 +08:00
LmeSzinc
22fedfefab Chore: Comments in catch_camera_repositioning 2025-01-17 12:37:49 +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
02fec1598d Merge branch 'refs/heads/LmeSzinc/master' into dev 2024-08-31 11:05:57 +08:00
LmeSzinc
782c8d0752 Opt: Skip waiting map clear percentage in SP 2024-08-30 23:04:36 +08:00
LmeSzinc
80baf3ee0c Opt: Ignore enemy filter if MAP_HAS_MOVABLE_NORMAL_ENEMY (#4095) 2024-08-20 02:19:52 +08:00
LmeSzinc
edbbc7b8cb Fix: Avoid turning_optimize in event maps 2024-08-20 02:14:00 +08:00
LA_DI_DA
89be3580ec Merge branch 'refs/heads/LmeSzinc/master' into dev 
# Conflicts:
#	module/ui/page.py
 2024-08-17 21:48:52 +08:00
LmeSzinc
95eb23de32 Opt: Show Map_clear_percentage as percentage instead of full float 2024-08-17 00:29:55 +08:00
Zuosizhu
1d85336ba4 Merge remote-tracking branch 'refs/remotes/Lme/master' into dev 
# Conflicts:
#	module/device/method/adb.py
#	module/device/screenshot.py
 2024-07-26 08:04:44 +08:00
LmeSzinc
5e05db05d0 Add: Switch mode in map preparation 2024-07-26 02:20:15 +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
58202c6a40 Pref: Reuse image array to improve memory performance 2024-06-05 01:15:41 +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
ecfd5d50bf Upd: [CN] Support UI in 2024.05.21 2024-05-23 01:16:41 +08:00
LmeSzinc
65fe0c1ebd Fix: center_offset hasn't been calculated if map detection failed 2024-05-19 23:06:52 +08:00
Zuosizhu
af1f0a9056 Merge branch 'LmeSzinc:master' into 20230309 2024-05-03 12:58:36 +08:00
LmeSzinc
499639f657 Fix: Predict swipe end 2024-04-30 17:42:56 +08:00
Zuosizhu
77e7276902 Merge branch 'lme_master' 
# Conflicts:
#	module/equipment/equipment_change.py
 2024-04-30 11:12:03 +08:00
LmeSzinc
cdcdd16118 Fix: info_bar covers map clear percentage 2024-04-28 16:32:18 +08:00