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

1063 Commits

Author SHA1 Message Date
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
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
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
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
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
guoh064
f6b44d6582 Add: event entrance for dual event 20201126/20260417 2026-04-24 14:52:43 +08:00
LmeSzinc
5cc986257f Fix: Random background hits EXP_INFO_B in event_20220915_cn chapter A 2026-04-21 23:22:02 +08:00
0O0o0oOoO00
e38ec5aa81 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-04-18 15:54:19 +08:00
LmeSzinc
45faa7c46d Add: Chapter SP 2026-04-18 02:54:46 +08:00
LmeSzinc
31efe2a054 Add: Event entrance of Vacation Lane – Beachside Brilliance (event_20260417_cn) 2026-04-18 00:18:14 +08:00
LmeSzinc
ba568b50c0 Upd: [TW] Event entrance of Violet Tempest Blooming Lycoris (fixed #5606) 2026-04-17 23:44:24 +08:00
YQY
432c719f51 Fix: Event 20220915 campaign (#5607)
Co-authored-by: YQY <91514918+5A8G0001@users.noreply.github.com>
2026-04-17 23:35:57 +08:00
0O0o0oOoO00
fcab4a1e2b add: sp1-4 for event general 2026-04-17 16:56:07 +08:00
LmeSzinc
e9a09a368e Upd: [TW] Event The Vagabond’s Recruitment Plan (event_20260326_cn) 2026-04-03 22:49:31 +08:00
0O0o0oOoO00
7b81911312 Merge remote-tracking branch 'LmeSzinc/master' into dev 2026-03-30 17:02:14 +08:00
0O0o0oOoO00
9b131f8957 Revert "add(tmp): add 16-4 for gamsfarming use"
This reverts commit 501be3448e.
2026-03-30 17:01:05 +08:00
LmeSzinc
b993a5e8b4 Fix: W16 map data 2026-03-30 02:39:51 +08:00
LmeSzinc
33e812adb8 Merge pull request #5455 from guoh064/campaign_16_main
Add: W16 preparations
2026-03-29 19:26:04 +08:00
xhqss
d2d524591a Merge branch 'master_LME' 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-03-27 10:04:18 +08:00
LmeSzinc
17a385274b Add: Chapter SP 2026-03-26 23:09:38 +08:00
LmeSzinc
d99af8fb07 Add: Chapter T HT 2026-03-26 23:04:52 +08:00
LmeSzinc
b64d3e13e2 Upd: Event entrance of The Vagabond’s Recruitment Plan 2026-03-26 21:37:14 +08:00
0O0o0oOoO00
08180a5d92 add: ht and t map for event general 2026-03-26 17:05:25 +08:00
guoh064
e4a6a5728e Opt: campaign_16_main MAP_SWIPE_MULTIPLY 2026-03-24 01:58:48 +08:00
guoh064
d7d69e95ef Opt: campaign_16_main clear mode battle function using mob move 2026-03-23 11:32:46 +08:00
0O0o0oOoO00
501be3448e add(tmp): add 16-4 for gamsfarming use 2026-03-20 23:16:03 +08:00
下面我簡單喵兩句
561aa27942 Upd:[TW]event 20260319 update (#5564) 2026-03-20 18:52:03 +08:00
guoh064
da0e2458b7 Upd: campaign_16_main clear mode 2026-03-19 20:54:51 +08:00
xhqss
1af31e1d91 Merge branch 'master_LME' into dev
# Conflicts:
#	module/config/argument/args.json
#	module/config/i18n/zh-TW.json
2026-03-12 22:15:51 +08:00
guoh064
9a9454df26 Add: event entrance for event_20240229_cn rerun (#5552) 2026-03-12 18:47:15 +08:00
LmeSzinc
b24d09f1a0 Upd: [TW] Event event_20260226_cn (fixed #5544) 2026-03-06 01:11:10 +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
bfe67e2922 Opt: swipe multiply in event_20260226_cn 2026-02-28 04:17:37 +08:00
guoh064
c8e8d0b2fe Add: Event Springtide Inn Online (event_20260226_cn) 2026-02-28 02:50:22 +08:00
0O0o0oOoO00
bbc27b1460 add: event general for cn gems farming 2026-02-26 16:51:39 +08:00
LmeSzinc
efeb222764 Upd: [TW] Event entrance of raid_20260212 2026-02-14 03:06:07 +08:00
sui-feng-cb
7e6b87bee8 Add: [CN] Spring Auction Adventure (raid_20260212) 2026-02-12 16:44:24 +08:00
sui-feng-cb
a4fec2e2a0 Upd: raid_20240328 rerun 2026-02-05 20:47:33 +08:00
LmeSzinc
87a031ed97 Upd: [TW] Event entrance of coalition_20260122 2026-01-31 03:18:38 +08:00
ArecaSapling
52444569a4 Add: war_archives_20230223_cn (#5479) 2026-01-30 10:56:16 +08:00
LmeSzinc
130edcde83 Add: Event entrance of Light & Shadow Fashion Shoot! (event_20260122_cn) 2026-01-23 01:24:30 +08:00
guoh064
1158a0535a Add: W16 preparations 2026-01-18 21:27:25 +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