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
LmeSzinc
48448e96b3
Add: Chapter A
2025-02-27 21:49:54 +08:00
LmeSzinc
8109b8c0be
Add: Event entrance of Paradiso of Shackled Light (event_20250227_cn)
2025-02-27 21:14:14 +08:00
LmeSzinc
7845b9b59e
Fix: Subpress EXP_INFO_B in event_20240815_cn ( #4588 )
2025-02-18 23:18:03 +08:00
LmeSzinc
2e395ac8ea
Upd: [TW] Event entrance of Windborne Steel Wings (event_20240815_cn) ( #4585 )
2025-02-13 12:50:32 +08:00
Shane (Treasure) Xue
e265eb57f0
Bugfix: clicking exercise button after stage 3-4 ( #4572 )
...
* Fix bugs (#4569 )
* fix: add PAUSE_HolyLight at `_at_low_hp`
* fix: handle map file name
* Bugfix
Resolved misrecognition of EXP_INFO_B in campaign_main_2 and campaign_main_3.
Refer to issue #4553 .
Reason was the background map was similar to the exp info page.
Recognition also appears in-stage since the chapter name flashes past but this will have no adverse affects.
* Remove mistakenly ctrl-c-ed override
---------
Co-authored-by: 霞飛 <saarchaffee@qq.com >
2025-02-08 00:53:03 +08:00
LmeSzinc
7627b91549
Upd: Config update
2025-02-06 22:34:38 +08:00
zhenghan123
b8dbed59f6
Add: event entrance for rerun event 20250206 ( #4564 )
...
* Update Readme.md
* Update args.json
* Update zh-CN.json
* Update args.json
* Update ja-JP.json
* Update en-US.json
* Update Readme.md
* Update Readme.md
* Update en-US.json
2025-02-06 22:25:17 +08:00
LmeSzinc
4cd0261fcd
Fix: Subpress EXP_INFO_B in Abyssal Refrain (event_20220224_cn) ( #4537 )
2025-02-03 23:39:21 +08:00
hephooey
419f2ed6d5
[TW] Event: Spring Fashion Festa ( #4539 )
2025-01-27 17:56:45 +08:00
xhqss
baa8d2ccd7
Merge branch 'master_lme'
...
# Conflicts:
# README.md
# module/ui_white/assets.py
2025-01-19 15:59:20 +08:00
LmeSzinc
5db4cbaeef
Add: Event entrance of Spring Fashion Festa (raid_20250116)
2025-01-17 12:46:34 +08:00