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

1011 Commits

Author SHA1 Message Date
guoh064
1ac5298fb0 tmp: goto event 20221124 cn correctly 2025-07-26 13:30:49 +09:00
Zuosizhu
b8d12c405f Merge branch 'master_lme' into brocore_dev
# Conflicts:
#	config/template.json
#	module/awaken/awaken.py
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/argument/menu.json
#	module/config/config_generated.py
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
2025-07-25 11:46:23 +08:00
LmeSzinc
becf0ec1d9 Fix: Able to do stage loop TS 2025-07-25 01:09:15 +08:00
LmeSzinc
b13e92694b Add: Chapter TS 2025-07-25 00:17:30 +08:00
LmeSzinc
6188bd069c Add: Chapter SP 2025-07-24 23:41:15 +08:00
LmeSzinc
021cc4e26d Add: Chapter T 2025-07-24 23:35:47 +08:00
LmeSzinc
ada6e09798 Upd: Event entrance of The Alchemist and the Tower of Horizons (event_20250724_cn) 2025-07-24 21:52:16 +08:00
LmeSzinc
3560c8debe Upd: [TW] Event Substellar Crepuscule (event_20241219_cn) (#4970) 2025-07-24 21:39:24 +08:00
sui-feng-cb
1d22dd4d2e Fix: Avoid clicking EXP_INFO_B in chapter A and chapter C 2025-07-24 21:31:08 +08:00
sui-feng-cb
6b49b92185 Add: war_archives_20220428_cn 2025-07-24 21:31:08 +08:00
MetricVoid
f99d149388 Feature: Add 121 strategy for 15-4 | 给15-4添加121策略 (#4946)
* Add 15-4 121 strategy

* Assign a different CampaignMap::name so load_campaign can differentiate 15-4 and 15-4(121)

* Fix campaign map name again to prevent unnecessary reloading

* Inherit map
2025-07-16 12:43:28 +08:00
Zuosizhu
de303b492e Merge branch 'master_lme' into brocore_dev
# Conflicts:
#	module/config/argument/override.yaml
#	module/research/selector.py
#	module/ui/ui.py
#	module/webui/app.py
2025-07-11 23:03:05 +08:00
sui-feng-cb
3001ae011a Add: war_archives_20220728_cn 2025-07-07 18:00:53 +08:00
LmeSzinc
0ab6d50656 Upd: [TW] Event Toward Tulipa’s Seas (#4922) 2025-07-03 22:59:22 +08:00
0O0o0oOoO00
171520adfb Merge remote-tracking branch 'LmeSzinc/master' into dev
# Conflicts:
#	config/template.json
#	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/config/i18n/zh-CN.json
#	module/ui/ui.py
2025-06-28 23:09:47 +08:00
LmeSzinc
373cf7e919 Add: Event entrance of Neon City Investigator (coalition_20250626) 2025-06-26 23:46:41 +08:00
LmeSzinc
0934746701 Upd: Event entrance of Confluence of Nothingness 2025-06-19 22:51:39 +08:00
0O0o0oOoO00
f64bc96bb2 Merge remote-tracking branch 'LmeSzinc/master' into dev
# Conflicts:
#	config/deploy.template-AidLux-cn.yaml
#	config/deploy.template-AidLux.yaml
#	config/deploy.template-cn.yaml
#	config/deploy.template-docker-cn.yaml
#	config/deploy.template-docker.yaml
#	config/deploy.template-linux-cn.yaml
#	config/deploy.template-linux.yaml
#	config/deploy.template.yaml
2025-06-17 13:19:30 +08:00
LmeSzinc
9014b9640b Upd: [TW] Event A Rose on the High Tower (event_20250520_cn) 2025-06-13 22:45:12 +08:00
xhqss
791f4bfd5a Merge branch 'master' into dev 2025-05-23 00:03:44 +08:00
LmeSzinc
f68ef322e2 Fix: clear_any_enemy if no fleet 2 2025-05-21 22:50:34 +08:00
LmeSzinc
c1d2490e5e Fix: set HOMO_STORAGE in SP because too many enemies cover sea grids 2025-05-21 22:25:58 +08:00
ZuoSiZhu
dee0c1484f Merge branch 'master_lme' into dev
# Conflicts:
#	campaign/Readme.md
#	module/base/utils.py
#	module/coalition/assets.py
#	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
#	module/handler/login.py
#	module/retire/dock.py
#	module/retire/enhancement.py
#	module/shop/shop_reward.py
2025-05-21 04:17:08 +08:00
LmeSzinc
8a52877333 Add: chapter SP 2025-05-21 03:02:53 +08:00
LmeSzinc
6f7605747a Add: chapter BD 2025-05-21 02:56:07 +08:00
LmeSzinc
d3ad772a36 Add: chapter B 2025-05-21 01:42:32 +08:00
LmeSzinc
84cda80ae2 Add: chapter A 2025-05-21 00:26:24 +08:00
LmeSzinc
92a93eeaf1 Add: Event entrance of A Rose on the High Tower (event_20250520_cn) 2025-05-20 23:53:42 +08:00
LmeSzinc
5721f7faa3 Fix: [TW] Set chapter SP in event_20240912_cn (#4770) 2025-05-04 22:46:39 +08:00
LmeSzinc
b24717d6ee Fix: [TW] Set chapter in event_20240912_cn 2025-05-02 01:25:22 +08:00
下面我簡單喵兩句
ca3ad5db41 Upd:[TW]Event:Ode of Everblooming Crimson (#4768) 2025-05-02 00:53:17 +08:00
xhqss
557127f167 upd:event_20250424_cn 2025-04-25 10:34:42 +08:00
sui_feng
978167218d Merge pull request #4750 from sui-feng-cb/war_archives_update
Add: war_archives_20220526_cn
2025-04-25 00:00:02 +08:00
LmeSzinc
ce9bdd5e86 Add: Chapter HT 2025-04-24 23:53:50 +08:00
LmeSzinc
221d6a4f5b Add: Chapter SP 2025-04-24 23:43:28 +08:00
LmeSzinc
c1eb1e47cc Add: Chapter T 2025-04-24 23:43:28 +08:00
LmeSzinc
fe6e7e39fd Add: Event entrance of Toward Tulipa’s Seas (event_20250424_cn) 2025-04-24 21:48:13 +08:00
xhqss
f35c9d289f Brute-force porting of LME updates to the event_20250417 branch 2025-04-18 00:07:46 +08:00
LmeSzinc
bc74e8c5e8 Chore: Air date of Frostfall rerun 2025-04-17 22:33:10 +08:00
LmeSzinc
84da230fd9 Upd: Toggle coalition to Frostfall 2025-04-17 22:13:06 +08:00
LmeSzinc
2b0020a79b Fix: Duplicate campaign_set_chapter_20241219 calls (#4728) 2025-04-15 00:41:45 +08:00
LmeSzinc
4f2a786d8c Add: [TW] Tempesta and the Sleeping Sea (event_20241024_cn) (#4722) 2025-04-12 03:28:26 +08:00
silvergundam
73eaab8ace Merge remote-tracking branch 'lme/master' into dev 2025-04-03 11:57:44 +08:00
sui_feng
4768c9e46c Add: War Archives 20220324 (#4698) 2025-03-29 01:11:26 +08:00
ZuoSiZhu
58a217d98f Merge branch 'master_lme' into dev
# Conflicts:
#	module/webui/app.py
#	module/webui/config.py
2025-03-28 00:23:16 +08:00
LmeSzinc
2a67d0a52e Upd: Event Revelations of Dust Rerun (event_20230223_cn)
- [TW] Light of the Martyrium (event_20240521_cn)
2025-03-20 18:53:39 +08:00
ZuoSiZhu
39c18d8103 Merge remote-tracking branch 'lme/master' into dev
# Conflicts:
#	deploy/AidLux/0.92/requirements.txt
#	module/campaign/campaign_event.py
#	module/os/map.py
#	module/os_ash/ash.py
#	module/webui/config.py
2025-02-28 11:01:23 +08:00
LmeSzinc
4bc278b00e Add: Chapter SP 2025-02-27 23:40:47 +08:00
LmeSzinc
852fe6fbf8 Add: Chapter CD 2025-02-27 23:19:14 +08:00
LmeSzinc
b7e5bcf49c Add: Chapter B 2025-02-27 23:03:27 +08:00