1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 16:39:26 +08:00
Commit Graph

7160 Commits

Author SHA1 Message Date
Zuosizhu
6a6fa5bde3 Del: Lme's shit 2026-01-28 07:42:51 +08:00
Zuosizhu
b504cea519 Adj: allow map rescan for os_init. 2026-01-27 13:24:33 +08:00
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
0affcacb26 Fix: Exercise power limit 2026-01-24 15:52:22 +08:00
Zuosizhu
d613145387 Fix: HookOp util 2026-01-24 14:24:05 +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
Zuosizhu
511249a4b9 Add: HookOp to tasks 2026-01-24 13:43:26 +08:00
LmeSzinc
f552360951 Fix: Startup at coalition fleet preparation 2026-01-23 17:43:04 +08:00
LmeSzinc
6d47f626d1 Opt: Disable event if current event type is raid or coalition 2026-01-23 17:39:46 +08:00
LmeSzinc
0b8d1a5b57 Fix: Empty fleet check should after switching fleet mode 2026-01-23 17:26:14 +08:00
guoh064
e01b77c6e5 Fix: more clear _coalition_has_oil_icon usage (#5473) 2026-01-23 17:25:15 +08:00
LmeSzinc
afbdd261e6 Fix: Handle coalition fleet reuse popup 2026-01-23 16:32:38 +08:00
LmeSzinc
f314caa862 Upd: [EN][JP] Coalition FASHION assets 2026-01-23 16:24:56 +08:00
LmeSzinc
43d3fa122c Fix: drop skip_first_screenshot in set_top 2026-01-23 15:53:03 +08:00
guoh064
36e998aed7 Upd: [JP] asset REWARD_2.BUTTON (#5465) 2026-01-23 02:47:59 +08:00
LmeSzinc
b65a951ce4 Add: FASHION Coalition assets 2026-01-23 02:40:22 +08:00
LmeSzinc
c37a52bf9c Fix: duplicate QUIT clicks canceling QUIT_RECONFIRM 2026-01-23 02:09:08 +08:00
LmeSzinc
bf4e06e565 Upd: Event stages 2026-01-23 01:32:27 +08:00
LmeSzinc
130edcde83 Add: Event entrance of Light & Shadow Fashion Shoot! (event_20260122_cn) 2026-01-23 01:24:30 +08:00
LmeSzinc
475c2dd2bc Chore: Use new syntax sugar in os_handler 2026-01-22 19:20:29 +08:00
LmeSzinc
8ea89756f1 Fix: [ALAS] Backport fix_py37_subprocess_communicate (#5226) 2026-01-19 12:20:44 +08:00
LmeSzinc
75af8e39be Perf: No campaign object caching to release memory 2026-01-17 23:49:06 +08:00
LmeSzinc
d1aed19f8f Refactor: Opsi task managing 2026-01-17 23:48:59 +08:00
LmeSzinc
12df3efeba Merge pull request #5445 from LmeSzinc/dev
Dev
2026-01-16 17:08:56 +08:00
Compeador
ad651eca4c feat: pq add aegir (#5423) 2026-01-16 17:08:24 +08:00
guoh064
6bd4a4ffed Fix: should add LEFT edge of first column of grids in Homography.to_perspective() (#5443) 2026-01-16 17:05:41 +08:00
guoh064
cc82d01353 Merge pull request #5441 from guoh064/event_rerun
Add: [CN, EN, JP] entrance for event_20231221_cn rerun
2026-01-16 17:05:28 +08:00
LmeSzinc
6ae47a39e4 Upd: [TW] TEMPLATE_COMBAT_LOADING 2026-01-04 02:29:43 +08:00
LmeSzinc
99de5e0d34 Upd: Battle UI MaidCafe 2026-01-01 23:36:25 +08:00
LmeSzinc
8ce61ac290 Upd: [TW] Event A Note Through the Firmament 2026-01-01 23:16:13 +08:00
LmeSzinc
72b6222a2f Fix: Remove trailing "\/" in zone name (fixed #5417) 2025-12-29 19:12:57 +08:00
sui-feng-cb
14c70afe65 Add: war_archives_20221222_cn 2025-12-29 19:04:08 +08:00
sui-feng-cb
83f167ccc1 Upd: [EN] USE_DATA_KEY_NOTIFIED asset 2025-12-29 19:04:08 +08:00
silvergundam
87942af94d Set new "AP limit" when Opsi reset less than 6 days,day0=300,day1=700,day2=1200,day3=1800,day4=2400,day5=3000. 2025-12-28 17:14:31 +08:00
Zuosizhu
0313dba2cd Merge new Hooks and full config from refactor 2025-12-24 23:38:01 +08:00
Zuosizhu
392a815b66 Revert "try to fix config errors in gems_farming.py running"
This reverts commit 567b252050.
2025-12-21 08:59:35 +08:00
Zuosizhu
8e20d5a84e Fix: Old Gems_Farming method needs Change_Flagship option 2025-12-21 08:59:25 +08:00
xhqss
a222fc0c2c Upd:event_20251218_cn 2025-12-20 23:32:17 +08:00
xhqss
a09ecb2ee1 Merge branch 'master_lme' into dev
# Conflicts:
#	module/config/argument/args.json
2025-12-20 23:31:25 +08:00
LmeSzinc
3fb7c54908 Add: Chapter B 2025-12-20 19:10:39 +08:00
Zuosizhu
6c53696fee Adj: map auto search more offensively 2025-12-20 13:00:46 +08:00
xhqss
567b252050 try to fix config errors in gems_farming.py running 2025-12-19 15:37:41 +08:00
xhqss
8c6cc62cdc UPD:without event 2025-12-19 15:15:18 +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
c9478cb542 Add: chapter A 2025-12-19 02:50:13 +08:00
LmeSzinc
c36586f8c5 Upd: TEMPLATE_COMBAT_LOADING 2025-12-19 02:48:11 +08:00
LmeSzinc
4a21f2e4e7 Fix: fallback interval set if is_combat_loading() not detected 2025-12-19 02:37:12 +08:00