xhqss
d0677cd3c6
Merge branch 'master_lme' into dev
...
# Conflicts:
# module/config/argument/args.json
2025-11-18 16:30:05 +08:00
guoh064
1a29d642a0
Upd: [JP] USE_DATA_KEY_NOTIFIED asset ( #5303 )
2025-11-13 17:50:50 +08:00
xhqss
ad07ec150b
Merge branch 'master_lme' into dev
...
# Conflicts:
# module/config/argument/args.json
# module/shop/ui.py
2025-11-07 18:11:22 +08:00
sui-feng-cb
b14ab02c97
Upd: [CN] USE_DATA_KEY_NOTIFIED asset
2025-11-06 17:11:57 +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
d4142afa22
Refactor: Timer class
2025-10-22 01:09:45 +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
c5908433bf
Fix: fleet role settings is unlocked after clear mode
2025-09-22 04:48:43 +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
sui_feng
4d5c855e3a
Fix: FAST_FORWARD for minor icon shift ( #5131 )
2025-09-13 20:17:26 +08:00
LmeSzinc
913b019ee7
Fix: AUTO_SEARCH_OFF4 should in cn folder
2025-09-13 03:21:35 +08:00
LmeSzinc
88fc235a24
Upd: [EN] AUTO_SEARCH_ON AUTO_SEARCH_OFF
2025-09-13 03:09:06 +08:00
LmeSzinc
69e99e6692
Upd: [EN] MAP_STAR_*
2025-09-13 03:04:36 +08:00
LmeSzinc
59393d6d31
Fix: AUTO_SEARCH for minor icon shift ( #5126 )
2025-09-13 01:09:58 +08:00
LmeSzinc
d113f71a3d
Fix: Use template matching in MAP_GREEN
2025-09-13 00:04:24 +08:00
LmeSzinc
2028b7426c
Fix: MAP_STAR detection for minor icon shift
...
- TODO: [EN] Update MAP_STAR_*
2025-09-12 23:46:08 +08:00
LmeSzinc
776bd56e30
Fix: Check GAME_TIPS using matched area
2025-09-12 00:45:47 +08:00
guoh064
5e027ec923
Fix: handle_game_tips if only the background is dark ( #5103 )
2025-09-11 22:30:37 +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
nEEtdo0d
b4cceb7f8e
Upd: [EN] event current and rerun check icons; other button_extract output
2025-08-02 13:32:52 -04:00
guoh064
fca3522391
Fix: wait for intermittent manjuu loading
2025-08-01 00:53:02 +09:00
Zuosizhu
b8d12c405f
Merge branch 'master_lme' into brocore_dev
...
# Conflicts:
# config/template.json
# module/awaken/awaken.py
# module/config/argument/args.json
# module/config/argument/argument.yaml
# module/config/argument/menu.json
# module/config/config_generated.py
# module/config/i18n/en-US.json
# module/config/i18n/ja-JP.json
# module/config/i18n/zh-CN.json
# module/config/i18n/zh-TW.json
2025-07-25 11:46:23 +08:00
LmeSzinc
7e6487487b
Merge pull request #4973 from LmeSzinc/dev
...
Add: The Alchemist and the Tower of Horizons (event_20250724_cn)
2025-07-25 00:50:17 +08:00
LmeSzinc
021cc4e26d
Add: Chapter T
2025-07-24 23:35:47 +08:00
HexatomicRing
4f0f2a2c87
Fix: Emulator no respond ( #4947 )
...
* Fix Leidian Emulator no respond
* [fix] assets name
* [fix] Avoid clearing stuck record
2025-07-17 22:44:28 +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
guoh064
3b65dfe6f0
Add: check manjuu loading in os_mission_overview_accept
2025-06-06 01:57:43 +08:00
0O0o0oOoO00
45ac6bdf45
Merge remote-tracking branch 'LmeSzinc/master' into dev
...
# Conflicts:
# module/retire/assets.py
# module/retire/dock.py
2025-06-05 23:53:43 +08:00
LmeSzinc
4e7e2444d5
Fix: handle appear animation of AUTO_SEARCH after enabling clear mode
2025-05-29 23:28:38 +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
653601aa4f
Chore: Add MAP_CLEAR_PERCENTAGE_SHORT
2025-05-21 00:45:32 +08:00
LmeSzinc
5b20d80b5b
Chore: Log what triggers the click on CLICK_SAFE_AREA
2025-04-24 23:43:28 +08:00
LmeSzinc
bfbdbcc774
Fix: [ALAS] handle_app_login shouldn't handle startup retry, scheduler should
2025-04-17 21:38:29 +08:00
Zuosizhu
c0c184497f
fix: no check in_main before exit _handle_app_login after handle page_main popups
2025-04-01 01:46:25 +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
dragonheart107
2a02cb4aa2
Merge pull request #4662 from dragonheart107/Fix--Submarine-asset-en
...
Upd: Submarine EN assets
2025-03-15 21:27:28 +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
be90d02e52
Upd: Increase from chapter C to D also
2025-02-28 01:58:29 +08:00
LmeSzinc
f79781250c
Fix: Avoid potential duplicate STAGE_INCREASE inserting
2025-02-28 00:26:28 +08:00
LmeSzinc
e222c31fb7
Add: Auto increase from chapter A to B
2025-02-27 23:30:13 +08:00
LmeSzinc
0c3a3fa1d6
Fix: Use template match to check account kick
2025-02-20 12:12:19 +08:00
LmeSzinc
4082abda8f
Fix: Catch account kicked by server maintenance
2025-02-13 12:43:01 +08:00
xhqss
baa8d2ccd7
Merge branch 'master_lme'
...
# Conflicts:
# README.md
# module/ui_white/assets.py
2025-01-19 15:59:20 +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
dragonheart107
44742e3757
Updated EN assets for 2x book ( #4516 )
2025-01-16 00:08:29 +08:00
LmeSzinc
f434784c6e
Add: Do event story, not added to GUI yet
...
run with `python -m module.eventstory.eventstory`
2025-01-02 00:38:28 +08:00
LmeSzinc
1e7aaf5628
Fix: Handle BATTLE_PASS_NEW_SEASON
2024-12-27 00:58:07 +08:00
xhqss
e7f93d8efe
Merge branch 'master_lme'
...
# Conflicts:
# module/equipment/equipment.py
2024-12-20 23:51:48 +08:00
Shane (Treasure) Xue
27b92c9b58
Bugfix: to_map_input_name case issue ( #4433 )
...
After bugfixes #4423 logic in the function changed and on the line where CAMPAIGN_ is removed the name is actually in lower case. Moved upper case manupulation in order to ensure correct case.
Upper was not removed considering the function should turn d3 into D3.
Before this bugfix incrementing to the next stage was unusable (eg. 12-2 would be incremented to a strange "n2")
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com >
2024-12-16 00:05:50 +08:00
sui_feng
eb836d1b4f
Fix: correct check_button in add_state() ( #4429 )
2024-12-13 09:52:45 +08:00
