1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-17 03:09:28 +08:00
Commit Graph

1944 Commits

Author SHA1 Message Date
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
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
b65a951ce4 Add: FASHION Coalition assets 2026-01-23 02:40:22 +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
Compeador
ad651eca4c feat: pq add aegir (#5423) 2026-01-16 17:08:24 +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
8ce61ac290 Upd: [TW] Event A Note Through the Firmament 2026-01-01 23:16:13 +08:00
sui-feng-cb
14c70afe65 Add: war_archives_20221222_cn 2025-12-29 19:04:08 +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
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
7e42f0ea6c Add: Event entrance of A Note Through the Firmament (event_20251218_cn) 2025-12-19 01:21:03 +08:00
whjhs1010203
c02c11d725 Upd:[TW]event 20251023 update (#5383)
Co-authored-by: whjhs1010203 <26708256+whjhs1010203@users.noreply.github.com>
2025-12-12 19:23:05 +08:00
LmeSzinc
fbb936f081 Del: Remove ship equipment change as lack of maintenance 2025-12-09 12:39:28 +08:00
Zuosizhu
2d1d1cd164 Adj: Check furniture everyday. Fuck Lme 2025-12-04 18:26:56 +08:00
LmeSzinc
ed154c1920 Upd: Config update 2025-12-01 00:33:02 +08:00
Zuosizhu
7725fd03be Fix: Coalition should choose events 2025-11-28 10:58:36 +08:00
Zuosizhu
5120649acb Merge remote-tracking branch 'Lme/master' into dev
# Conflicts:
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/i18n/en-US.json
2025-11-27 21:53:49 +08:00
LmeSzinc
98c513baff Tmp: Move date a live collab event entrance upwards 2025-11-26 14:31:28 +08:00
guoh064
ae9d64c81f Del: redundant config redirect 2025-11-24 20:58:12 +08:00
guoh064
be012c843d Upd: [CN] assets for coalition_20251120 2025-11-23 22:54:11 +08:00
guoh064
58ddb01976 Tmp: general config modification for coalition_20251120 2025-11-23 01:56:21 +08:00
guoh064
c04f9ce964 Add: config for coalition_20251120 2025-11-23 00:33:39 +08:00
LmeSzinc
eac6ed2cf0 Upd: [TW] Rondo at Rainbow's End Rerun (fixed #5326) 2025-11-21 03:32:21 +08:00
whjhs1010203
a36d36c0d9 Upd: [TW]private_quarters update new_jersey (#5329)
* Upd: [TW] PRIVATE_QUARTERS update

* Upd: [TW] PRIVATE_QUARTERS update i18n

---------

Co-authored-by: whjhs1010203 <26708256+whjhs1010203@users.noreply.github.com>
2025-11-21 03:04:07 +08:00
xhqss
fccfd3ee82 UPD:config_event_20230914_cn 2025-11-18 16:30:40 +08:00
xhqss
d0677cd3c6 Merge branch 'master_lme' into dev
# Conflicts:
#	module/config/argument/args.json
2025-11-18 16:30:05 +08:00
ArecaSapling
51934ff3f6 Upd: Effulgence Before Eclipse Rerun (event_20230914_cn) (#5315) 2025-11-13 17:53:06 +08:00
whjhs1010203
a680c07706 Upd: [tw] PRIVATE_QUARTERS i18n help 2025-11-13 17:52:00 +08:00
whjhs1010203
df6bc4b69c Upd: [tw] PRIVATE_QUARTERS 2025-11-13 17:52:00 +08:00
xhqss
e28b717bd1 UPD:config_event_20250227_cn 2025-11-07 18:12:55 +08:00
xhqss
ad07ec150b Merge branch 'master_lme' into dev
# Conflicts:
#	module/config/argument/args.json
#	module/shop/ui.py
2025-11-07 18:11:22 +08:00
LmeSzinc
c235247eb4 Upd: [TW] Event Paradiso of Shackled Light (fixed #5294) 2025-11-07 16:21:24 +08:00
ArecaSapling
02b459c6af Upd: Event Anthem of Remembrance Rerun (event_20230803_cn) (#5297) 2025-11-07 16:07:33 +08:00
sui-feng-cb
d90390202b Add: war_archives_20220915_cn 2025-11-06 17:11:47 +08:00
LmeSzinc
8d75bfa848 Merge pull request #5278 from wess09/patch-2
FIX:修改了错误的功能帮助
2025-11-03 19:32:10 +08:00
nEEtdo0d
a64f1e9157 Add: PrivateQuarters Taihou option 2025-10-31 16:28:27 -04:00
2148f7d53a fix:英文 2025-10-29 21:08:51 +08:00
d6f24187ae Update help text for ChangeFlagship in zh-CN.json 2025-10-29 21:04:43 +08:00
a85f2c781c fix:繁体中文 2025-10-29 21:01:57 +08:00
xhqss
7caf72a65c UPD:config_event_20251023_cn 2025-10-24 13:13:07 +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