1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-22 03:29:28 +08:00

8905 Commits

Author SHA1 Message Date
0O0o0oOoO00
07768307f2 Merge remote-tracking branch 'LmeSzinc/dev' into dev
# Conflicts:
#	config/template.json
#	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-05-21 23:41:08 +08:00
LmeSzinc
4d836d34cf Fix: [ALAS] removesuffix() with overload 2026-05-21 23:34:12 +08:00
LmeSzinc
350cfe354f Fix: Missing fleet2.in_use() when using Perseus skin (#5678) 2026-05-21 22:58:48 +08:00
LmeSzinc
52bdbe39f7 Fix: [ALAS] Handle another format of multiscreen warning (#5682) 2026-05-21 22:34:25 +08:00
LmeSzinc
0134307f3f Fix: Ensure edge bottom-right in B2D2 2026-05-21 21:54:49 +08:00
LmeSzinc
cfccf933a4 Fix: Handle big pillar in SP 2026-05-21 00:36:06 +08:00
LmeSzinc
4aeaf1d598 Upd: Battle UI GildedReverie 2026-05-21 00:35:29 +08:00
LmeSzinc
d6cd9fb20d Fix: Handle big pillar covers map grids 2026-05-21 00:26:59 +08:00
0O0o0oOoO00
e09d617aab add: tool of removing inject 2026-05-20 23:37:19 +08:00
0O0o0oOoO00
c51f1c36f9 del: remove backup of libtolua 2026-05-20 23:37:19 +08:00
LmeSzinc
7955a5aaad Opt: camera data in event_20260520_cn 2026-05-20 23:20:41 +08:00
ArecaSapling
78e6c4d7bf Add: Event Alliance Before the Hagiobull (event_20260520_cn) (#5675) 2026-05-20 22:49:15 +08:00
guoh064
aa996ce1b6 Revert "Upd: [JP] TEMPLATE_COMBAT_LOADING (#5393)"
This reverts commit e51aed9ed6.
2026-05-20 22:47:59 +08:00
guoh064
47d2779bcb Fix: story option detection pre_process (#5669) 2026-05-20 22:45:04 +08:00
LmeSzinc
ffded5b82b Upd: [TW] Parallel Superimposition Rerun (event_20221222_cn) (#5666) 2026-05-16 00:02:22 +08:00
LmeSzinc
efbbaeb89f Fix: [TW] Goto main before entering rerun event 2026-05-11 19:48:42 +08:00
LmeSzinc
555ca89fa0 Bug fix (#5664)
* Fix: [TW] Enter event 20201126

* Upd: detect 5 story options at max (#5653)

* Add: war_archives_20220818_cn and war_archives_20230803_cn (#5660)

---------

Co-authored-by: ArecaSapling <115386623+sui-feng-cb@users.noreply.github.com>
2026-05-11 19:27:05 +08:00
ArecaSapling
d0b6e62964 Add: war_archives_20220818_cn and war_archives_20230803_cn (#5660) 2026-05-11 19:26:19 +08:00
LmeSzinc
f5e9952fc3 Upd: detect 5 story options at max (#5653) 2026-05-11 19:25:06 +08:00
LmeSzinc
0f679ce3e8 Fix: [TW] Enter event 20201126 2026-05-11 19:10:50 +08:00
LmeSzinc
8cb4384a22 Bug fix (#5663)
* Add: buy dorm food when oil overflow during commission receive

* Upd: method dorm_food_run

* Upd: exception OilMaxed to control buy food trial

* Upd: [TW] event entrance of event_20201126_cn rerun (#5615)

* Upd: method _load_file for class LuaLoader (#5662)

---------

Co-authored-by: sui-feng-cb <2518179942@qq.com>
Co-authored-by: guoh064 <50830808+guoh064@users.noreply.github.com>
2026-05-11 17:08:24 +08:00
guoh064
884c77c8f0 Upd: method _load_file for class LuaLoader (#5662) 2026-05-11 17:04:48 +08:00
LmeSzinc
558aab314d Add: buy dorm food when oil overflow during commission receive (#5659)
* Add: buy dorm food when oil overflow during commission receive

* Upd: method dorm_food_run

* Upd: exception OilMaxed to control buy food trial
2026-05-11 17:03:33 +08:00
LmeSzinc
6dd8eff8d3 Upd: [TW] event entrance of event_20201126_cn rerun (#5615) 2026-05-11 17:00:20 +08:00
sui-feng-cb
90c06f9054 Upd: exception OilMaxed to control buy food trial 2026-05-11 16:36:48 +08:00
sui-feng-cb
1155f277ef Upd: method dorm_food_run 2026-05-11 16:15:33 +08:00
sui-feng-cb
632b06780f Add: buy dorm food when oil overflow during commission receive 2026-05-11 16:13:06 +08:00
xhqss
7cac45afc8 Add dock shortage reminder during support_build 2026-05-08 10:23:16 +08:00
LmeSzinc
5f4f968c25 Fix: [TW] Enter event_20260417_cn from page_campaign (#5646) 2026-05-01 22:45:25 +08:00
0O0o0oOoO00
fce2f7b9e0 Merge remote-tracking branch 'LmeSzinc/master' into dev
# Conflicts:
#	module/config/argument/args.json
#	module/config/i18n/zh-TW.json
2026-05-01 12:08:12 +08:00
LmeSzinc
23f185c4cc Upd: button_extract 2026-05-01 04:39:08 +08:00
LmeSzinc
be200d4a3f Merge branch 'dev' 2026-05-01 04:34:12 +08:00
LmeSzinc
2a3f3b4941 Fix: No may_enemy override in 14-4 clear mode (#5637) 2026-05-01 04:25:45 +08:00
LmeSzinc
f36ae75ed3 Fix: Switch ui from other DOA events to event_20250424_cn 2026-05-01 04:15:35 +08:00
LmeSzinc
1c6b5eb4a6 Upd: [TW] Vacation Lane – Beachside Brilliance 2026-05-01 03:27:58 +08:00
guoh064
96c1317887 Upd: [JP] assets REWARD_*.BUTTON (#5644)
to avoid collision with REWARD_*_WHITE and misclicking
2026-05-01 03:04:49 +08:00
guoh064
ac7bedc192 Tmp: event entrance for event 20250424 cn rerun
The event date should be fixed after 20260502 to disable previous concurrent event entrance.
2026-05-01 03:04:34 +08:00
guoh064
0c26c5a355 Upd: event entrance for dual event 20201126/20260417 2026-05-01 03:04:34 +08:00
LmeSzinc
0dbac1950a Upd: [CN] EVENT_20201126_ENTRANCE_TEMP 2026-05-01 03:04:34 +08:00
dragonheart107
4b90a64dde Fix: EN event point position via offset (#5633) 2026-05-01 03:04:34 +08:00
shionari
6665ca2ece Fix:修复国内docker环境编译报错的问题 (#5624)
* 因pypi官网已移除低版本pyav的whl文件,改为自行编译安装,添加相关依赖
另外,因阿里云部分镜像失效导致下载超时,国内源改为清华

* 国内源切换回阿里云

* 指定python镜像的Debian版本为bullseye,默认版本为Bookworm
添加自行编译av所需的依赖
2026-05-01 03:03:51 +08:00
0O0o0oOoO00
58a9e049ed add: sort server events by date for gui selection 2026-04-28 16:50:14 +08:00
0O0o0oOoO00
96f0331e9f Add(for self-inherited ConfigUpdater): distangle Gemsfarming.Campaign.Event from Event.Campaign.Event for multi event 2026-04-26 19:12:48 +08:00
LmeSzinc
7466a3882d Upd: [CN] EVENT_20201126_ENTRANCE_TEMP 2026-04-26 05:49:31 +08:00
dragonheart107
04d900bb3b Fix: EN event point position via offset (#5633) 2026-04-26 03:29:27 +08:00
0O0o0oOoO00
7e3a4eed72 fix: unexpected instance startup caused by updating Alas after one click stopping all instances 2026-04-25 18:02:00 +08:00
0O0o0oOoO00
0ec7c136f1 del: remove duplicated self-inheritance on RewardSupportBuild 2026-04-25 16:55:08 +08:00
0O0o0oOoO00
4dda41a3a1 adj: move RewardSupportBuild to new AzurLaneAutoScript to avoid changing origin code 2026-04-25 16:52:18 +08:00
xhqss
6c65115363 UPD:event_20201126_cn(rerun) 2026-04-25 15:11:49 +08:00
xhqss
523aebb767 Merge branch 'master_lme' into dev
# Conflicts:
#	module/config/argument/args.json
#	module/config/argument/override.yaml
2026-04-25 15:09:43 +08:00