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

10189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zuosizhu
57266f4b6f Merge: Campaign_general and lme updates 2026-04-18 15:05:11 +08:00
LmeSzinc
317962c2ba Add: Chapter SP 
(cherry picked from commit 17a385274b)
 2026-03-27 22:49:35 +08:00
LmeSzinc
0c774ede17 Add: Chapter T HT 
(cherry picked from commit d99af8fb07)
 2026-03-27 22:45:50 +08:00
0O0o0oOoO00
e60b8c1d65 add: keep 1 level white flagship when auto retire 
(cherry picked from commit b777b9656d)
 2026-03-25 12:46:17 +08:00
Zuosizhu
410836d7fc Fix: unused Metal_shop_scroll 2026-02-12 18:12:06 +08:00
Zuosizhu
59c767de5f Fix: Temporary New year Academy check for hook users buttons 2026-02-12 18:08:41 +08:00
Zuosizhu
a9670c3428 Fix: Temporary New year Academy check for hook users 2026-02-12 18:07:14 +08:00
Zuosizhu
38db66f9e8 Revert: Fixes of CL1 too fast. Just don't use it 2026-02-11 00:09:10 +08:00
Zuosizhu
9dca059809 Fix: handle retirement when handling More situation for Invalid repeated operation. 2026-02-03 13:48:37 +08:00
Zuosizhu
fdc2c5c0b1 Fix: More situation for Invalid repeated operation. 2026-02-02 22:22:03 +08:00
Zuosizhu
6f8f28ab84 Fix: Invalid repeated operation 2026-02-02 22:09:38 +08:00
Zuosizhu
e210009290 Fix: Some CL1 problems caused by luahook for entering 2 combats in too short 2026-02-02 21:56:24 +08:00
Zuosizhu
457d03aa35 Merge new LuaHooks from branch "origin/dev" 2026-02-02 20:23:40 +08:00
Zuosizhu
98a27c5836 Del: Lme's shit 2026-02-01 19:38:34 +08:00
Zuosizhu
d86d757358 Del: Lme's shit 2026-01-31 22:29:01 +08:00
Zuosizhu
b97212d2d2 Adj: configable AP preserve method. 2026-01-31 21:14:49 +08:00
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
64b284835e Fix: Gems report accuracy 2026-01-24 13:44:53 +08:00
Zuosizhu
511249a4b9 Add: HookOp to tasks 2026-01-24 13:43:26 +08:00
LmeSzinc
252e086db1 Bug fix (#5475) 
* Fix: drop skip_first_screenshot in set_top

* Upd: [EN][JP] Coalition FASHION assets

* Fix: Handle coalition fleet reuse popup

* Fix: more clear _coalition_has_oil_icon usage (#5473)

* Fix: Empty fleet check should after switching fleet mode

* Opt: Disable event if current event type is raid or coalition

* Fix: Startup at coalition fleet preparation

---------

Co-authored-by: guoh064 <50830808+guoh064@users.noreply.github.com>
 2026-01-23 17:45:10 +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
LmeSzinc
f9c8c9753f Merge pull request #5468 from LmeSzinc/dev 
Add: Light & Shadow Fashion Shoot! (event_20260122_cn)
 2026-01-23 02:50:57 +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
20fa8cffe0 Merge pull request #5459 from LmeSzinc/dev 
Bug fix
 2026-01-20 10:24:28 +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
ArecaSapling
37197f03bb Fix: event_20231026_cn has MAP_SIREN_HAS_BOSS_ICON_SMALL in t2 and t5 (#5444) 2026-01-16 17:06:05 +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