Zuosizhu
723c7be10b
Fix: merge faults and delete Lme's shit
2026-01-27 13:23:27 +08:00
Zuosizhu
80c12c0046
Fix: merge error in os level check
2026-01-25 00:33:17 +08:00
Zuosizhu
d1174a7d88
Merge remote-tracking branch 'Lme/master' into unrefactor
...
# Conflicts:
# module/campaign/campaign_event.py
# module/campaign/os_run.py
# module/coalition/coalition.py
# module/config/argument/args.json
# module/config/argument/menu.json
# module/config/argument/task.yaml
# module/config/i18n/en-US.json
# module/config/i18n/ja-JP.json
# module/os/operation_siren.py
# module/os_handler/mission.py
# module/webui/app.py
2026-01-24 14:18:46 +08:00
LmeSzinc
6d47f626d1
Opt: Disable event if current event type is raid or coalition
2026-01-23 17:39:46 +08:00
LmeSzinc
75af8e39be
Perf: No campaign object caching to release memory
2026-01-17 23:49:06 +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
fbb936f081
Del: Remove ship equipment change as lack of maintenance
2025-12-09 12:39:28 +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
767f13ae62
Add: Chapter T
2025-10-24 00:52:46 +08:00
xhqss
90c881fda0
Merge branch 'master_lme' into dev
...
# Conflicts:
# module/coalition/coalition.py
# module/config/argument/args.json
# module/ui/assets.py
2025-10-17 00:30:43 +08:00
sui_feng
d89094b396
Add: war_archives_20231026_cn ( #5221 )
2025-10-16 19:46:24 +08:00
Zuosizhu
26db9292c8
Fix: shit shop
2025-10-12 16:06:44 +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
4347616d55
Opt: call cl1 if enabled if meowfficerfarming ends with enough yellow coins ( #5020 )
...
* Opt: call cl1 if enabled if meowfficerfarming ends with enough yellow coins
* Revert "Add: continue cl1 if enabled after meowfficerfarming finished. (#2805 )"
This reverts commit 4c48b019bc
2025-10-11 00:42:05 +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
bd217b739b
Fix: Shorten ASIDE_SWITCH_20241219 unknown_timer
2025-09-13 20:39:11 +08:00
LmeSzinc
6ed5709db4
Fix: Fallback MapAchievement since event doesn't have thread indicator
2025-09-13 03:14:40 +08:00
guoh064
31fa8ae3a5
Opt: call cl1 if enabled if meowfficerfarming ends with enough yellow coins
2025-09-05 14:32:37 +08:00
0O0o0oOoO00
e453c4464a
Merge branch 'Lme/master' into dev
...
# Conflicts:
# module/config/argument/args.json
# module/shop/shop_reward.py
# module/shop/ui.py
# module/ui/assets.py
2025-08-25 23:46:48 +08:00
dragonheart107
6d3acaaddb
Fix: Exercise item during battle ( #5059 )
...
* Fix: event log
* Fix: random artefacts during exercise mistaken as Items
* Fix: small tweak
2025-08-23 22:26:48 +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
9fe7a79213
Add: Chapter T
2025-08-15 23:25:53 +08:00
0O0o0oOoO00
ea42b6a59f
opt: request extend task deadline before entering battle loop
2025-08-08 17:09:13 +08:00
0O0o0oOoO00
368d6c443e
fix: delay warning time before execute a battle
2025-08-08 12:42:59 +08:00
guoh064
f714e2b575
Fix: Include GEMS_FARMINGS in event time limit task list
2025-08-07 17:29:41 +08:00
0O0o0oOoO00
10a62a79b5
add: add scheduler watcher to tasks
2025-08-06 18:12:49 +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
4c8ecff046
Add: ui_goto_event for event 20221124 cn and event 20250724 cn
2025-07-29 17:31:37 +08:00
guoh064
1ac5298fb0
tmp: goto event 20221124 cn correctly
2025-07-26 13:30:49 +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
becf0ec1d9
Fix: Able to do stage loop TS
2025-07-25 01:09:15 +08:00
LmeSzinc
b13e92694b
Add: Chapter TS
2025-07-25 00:17:30 +08:00
LmeSzinc
6188bd069c
Add: Chapter SP
2025-07-24 23:41:15 +08:00
LmeSzinc
021cc4e26d
Add: Chapter T
2025-07-24 23:35:47 +08:00
guoh064
7cef54d350
Add: check leveling in cl1 daily
2025-06-08 13:08:19 +09: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
6d7e43974a
Fix: handle game tips that infos skin feature when entering dock
2025-05-29 22:48:01 +08:00
0O0o0oOoO00
2b832b9bb3
fix: switch gemsfarming to 15-1 when event limit is reached
2025-05-24 17:55:12 +08:00
0O0o0oOoO00
1053aa427e
fix: merge mistake of stop barrier
2025-05-21 14:07:57 +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
0O0o0oOoO00
13eb3a079f
fix: lack of KeepOil setting
2025-05-19 11:37:17 +08:00
0O0o0oOoO00
75267083c9
Merge branch 'feature/more' into dev
...
# Conflicts:
# alas.py
# module/exception.py
2025-05-18 22:03:42 +08:00
ZuoSiZhu
3c63b8d65d
adj: GemsFarming allow low vanguard level when hook is enabled
2025-05-12 23:28:44 +08:00
0O0o0oOoO00
03a59cca17
Merge branch 'dev' into feature/more
2025-05-11 15:29:08 +08:00
0O0o0oOoO00
50e1521de1
fix: chapter name convertion for event_20250424_cn
2025-04-25 14:34:42 +08:00
xhqss
f45ad334db
Add: MAP_CHAPTER_SWITCH_20241219_SP to handle event_20250424_cn
2025-04-25 13:25:31 +08:00
LmeSzinc
c1eb1e47cc
Add: Chapter T
2025-04-24 23:43:28 +08:00
LA-DI-DA
62c33f27e0
Merge the remaining functions in MoreAlas
2025-04-24 23:30:50 +08:00
LmeSzinc
c95816ecf7
Add: MAP_CHAPTER_SWITCH_20241219_SP to handle sp events
2025-04-24 22:49:31 +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
