1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 11:49:26 +08:00

487 Commits

Author SHA1 Message Date
0O0o0oOoO00
d27b4647cb add: skip commission notice check at campaign when do not run commission to avoid recursive calls between tasks 2026-03-21 20:39:14 +08:00
0O0o0oOoO00
76b6435ee6 Merge remote-tracking branch 'LmeSzinc/master' into dev
# Conflicts:
#	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
2026-02-28 12:16:28 +08:00
LmeSzinc
07bf9d9947 Fix: Handle wrong OCR error like "I4-4" (#5532) 2026-02-28 03:42:27 +08:00
0O0o0oOoO00
34bc2f7c37 fix: directly call CampaignRun.triggered_stop_condition when triggered_stop_condition 2026-01-28 21:45:19 +08:00
0O0o0oOoO00
e7ecb8cb77 fix: reset GemsFarming 2026-01-23 17:55:45 +08:00
0O0o0oOoO00
d4c3536af9 Merge remote-tracking branch 'LmeSzinc/master' into dev 2026-01-23 17:45:36 +08:00
LmeSzinc
6d47f626d1 Opt: Disable event if current event type is raid or coalition 2026-01-23 17:39:46 +08:00
0O0o0oOoO00
26cd23910a Merge remote-tracking branch 'LmeSzinc/master' into dev
# Conflicts:
#	module/webui/app.py
2026-01-20 13:03:45 +08:00
LmeSzinc
75af8e39be Perf: No campaign object caching to release memory 2026-01-17 23:49:06 +08:00
Zuosizhu
c85328bc79 Fix: Update config after ocr Pt 2026-01-17 20:47:33 +08:00
0O0o0oOoO00
5d2c46973c Merge remote-tracking branch 'LmeSzinc/master' into refactor
# Conflicts:
#	module/config/argument/args.json
2025-12-21 18:46:41 +08:00
LmeSzinc
fbb936f081 Del: Remove ship equipment change as lack of maintenance 2025-12-09 12:39:28 +08:00
0O0o0oOoO00
c6de0daf66 Merge remote-tracking branch 'LmeSzinc/master' into refactor
# Conflicts:
#	module/config/argument/args.json
2025-10-24 17:13:48 +08:00
LmeSzinc
767f13ae62 Add: Chapter T 2025-10-24 00:52:46 +08:00
0O0o0oOoO00
d1256f3866 Merge remote-tracking branch 'LmeSzinc/master' into refactor
# Conflicts:
#	module/config/argument/args.json
#	module/shop/shop_reward.py
2025-10-16 23:05:15 +08:00
sui_feng
d89094b396 Add: war_archives_20231026_cn (#5221) 2025-10-16 19:46:24 +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
42e6f89ccd fix: check tasks when disable event 2025-09-16 18:35:38 +08:00
0O0o0oOoO00
31c042d9be fix: use module.equipment.fleet_equipment.OCR_FLEET_INDEX to ocr 2025-09-16 17:58:24 +08:00
0O0o0oOoO00
747ad051ed fix: redirect _ship_detail_enter and _fleet_detail_enter to its real mode 2025-09-16 17:49:48 +08:00
0O0o0oOoO00
6e2173f074 fix: use CampaignRun.run directly 2025-09-16 12:44:39 +08:00
0O0o0oOoO00
9c50966a00 add: redirect gemsfarming to 15-2 after pt finished 2025-09-16 00:21:33 +08:00
0O0o0oOoO00
66301a68f5 fix: log oil resources when battle 2025-09-14 20:26:49 +08:00
0O0o0oOoO00
eeb41afcb5 fix: use my OCR_COIN to get coin 2025-09-14 19:34:31 +08:00
0O0o0oOoO00
f5cfb2c215 add: migrate dashboard update logic 2025-09-14 19:25:40 +08:00
0O0o0oOoO00
a5b77b50dd add: migrate gemsfarming 2025-09-14 17:06:37 +08:00
0O0o0oOoO00
4649e9afe5 Merge remote-tracking branch 'LmeSzinc/master' into refactor 2025-09-13 23:07:58 +08:00
0O0o0oOoO00
9c68c804a4 ref: use a wrap class to control scheduler watcher 2025-09-13 21:44:20 +08:00
LmeSzinc
bd217b739b Fix: Shorten ASIDE_SWITCH_20241219 unknown_timer 2025-09-13 20:39:11 +08:00
0O0o0oOoO00
c154e76f4e Merge remote-tracking branch 'LmeSzinc/master' into refactor
# Conflicts:
#	README.md
#	module/config/argument/args.json
2025-09-13 14:46:47 +08:00
LmeSzinc
6ed5709db4 Fix: Fallback MapAchievement since event doesn't have thread indicator 2025-09-13 03:14:40 +08:00
0O0o0oOoO00
998cf9c65f add: add scheduler watcher support 2025-09-12 22:35:00 +08:00
guoh064
31fa8ae3a5 Opt: call cl1 if enabled if meowfficerfarming ends with enough yellow coins 2025-09-05 14:32:37 +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
LmeSzinc
9fe7a79213 Add: Chapter T 2025-08-15 23:25:53 +08:00
guoh064
f714e2b575 Fix: Include GEMS_FARMINGS in event time limit task list 2025-08-07 17:29:41 +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
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
LmeSzinc
6d7e43974a Fix: handle game tips that infos skin feature when entering dock 2025-05-29 22:48:01 +08:00
LmeSzinc
c1eb1e47cc Add: Chapter T 2025-04-24 23:43:28 +08:00
LmeSzinc
c95816ecf7 Add: MAP_CHAPTER_SWITCH_20241219_SP to handle sp events 2025-04-24 22:49:31 +08:00
LmeSzinc
8321182fdc Fix: Disable task hospital when event is over 2025-03-28 04:00:17 +08:00
guoh064
edb8bcb5c7 Fix: vanguard_change logic (#4636)
* Add: support list types limitations in Ship class

* Opt: get_common_rarity_dd logic

get_common_rarity_dd should always check all available
ships and not just the ones in the current fleet.
2025-03-10 23:30:02 +08:00
qinsgit
c857ed4e22 Fix: spelling mistakes (#4648)
Co-authored-by: qinsgit <123123123@qq.com>
2025-03-10 23:28:12 +08:00
LmeSzinc
fc90b8e72b Fix: Disable raid tasks if another event is ongoing 2025-02-13 12:50:29 +08:00
LmeSzinc
2176fdf803 Fix: Getting index of a digit chapter when looking for a non-digit chapter (#4504) 2025-01-10 02:27:51 +08:00