0O0o0oOoO00
e453c4464a
Merge branch 'Lme/master' into dev
...
# Conflicts:
# module/config/argument/args.json
# module/shop/shop_reward.py
# module/shop/ui.py
# module/ui/assets.py
2025-08-25 23:46:48 +08:00
0O0o0oOoO00
b2c55961c3
add: monster kill self crack
2025-08-24 17:46:13 +08:00
0O0o0oOoO00
255eb905f7
add: fast wave crack
2025-08-24 16:05:24 +08:00
LmeSzinc
bb4eec062c
Upd: [TW] Abyssal Refrain Rerun
2025-08-23 23:40:08 +08:00
0O0o0oOoO00
f96b13fea2
Merge branch 'Lme/master' into dev
...
# Conflicts:
# assets/cn/campaign/EVENT_20221124_ENTRANCE.png
# campaign/event_20221124_cn/campaign_base.py
# module/campaign/assets.py
# module/config/argument/override.yaml
# module/config/config_updater.py
# module/retire/assets.py
# module/shop/shop_reward.py
2025-08-16 14:24:45 +08:00
LmeSzinc
5fb2e0a1dd
Upd: Event entrance of Secrets of the Abyss (event_20250814_cn)
2025-08-15 22:26:44 +08:00
0O0o0oOoO00
ae1e32aef2
adj: separate the settings of the scheduler watcher
2025-08-09 20:13:32 +08:00
LmeSzinc
23fcfc0641
Upd: [TW] Alchemist collab and rerun ( #5007 )
2025-08-07 21:22:21 +08:00
0O0o0oOoO00
bc44134e33
add: add scheduler watcher to alas task scheduler
2025-08-05 23:54:45 +08:00
guoh064
d8bc97fa2e
Upd: event_20221124_cn rerun entrance
2025-08-02 01:16:47 +08:00
nEEtdo0d
a05403efda
Opt: Private Quarters refactor
...
Fix: addresses stale roses sold out reported bug (#4943 )
Fix: limited retry ocr read on daily count (#4969 )
Add: capability to purchase cake through config toggle
2025-07-26 03:27:10 +08: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
ada6e09798
Upd: Event entrance of The Alchemist and the Tower of Horizons (event_20250724_cn)
2025-07-24 21:52:16 +08:00
LmeSzinc
726f61b10a
Upd: Move coalition back after event
2025-07-24 21:48:01 +08:00
LmeSzinc
f061f518b3
Upd: [CN] channel server com.bilibili.blhx.honor
2025-07-24 21:45:20 +08:00
LmeSzinc
3560c8debe
Upd: [TW] Event Substellar Crepuscule (event_20241219_cn) ( #4970 )
2025-07-24 21:39:24 +08:00
sui-feng-cb
6b49b92185
Add: war_archives_20220428_cn
2025-07-24 21:31:08 +08:00
0O0o0oOoO00
9b74b79c01
add: add 8th research to ResearchFarming
2025-07-22 17:16:09 +08:00
sui_feng
64070437f0
Opt: Awaken Favourite Ships Only ( #4957 )
2025-07-16 12:24:08 +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
LmeSzinc
532e4c2eee
Merge branch 'bug_fix' into dev
2025-07-11 00:14:29 +08:00
LmeSzinc
d28ace6294
Upd: Research S8 configs and presets
2025-07-10 22:42:17 +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
nEEtdo0d
b85b47d67c
Merge branch 'master' into dev
2025-06-28 16:11:37 -04: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
37ad6c9d12
Upd: stage convert
2025-06-27 00:08:42 +08:00
LmeSzinc
373cf7e919
Add: Event entrance of Neon City Investigator (coalition_20250626)
2025-06-26 23:46:41 +08:00
ZuoSiZhu
b7ad8e7368
Adj: Remove config for OthersLogin.Method
2025-06-21 16:57:55 +08:00
LmeSzinc
0934746701
Upd: Event entrance of Confluence of Nothingness
2025-06-19 22:51:39 +08:00
0O0o0oOoO00
ab18217fa8
del: remove lock of daily event
2025-06-19 19:15:41 +08:00
guoh064
046e3fb377
Add: delay task after opsi level check passed
2025-06-17 14:41:16 +09: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
nEEtdo0d
f77aec689e
Add: [EN] Private Quarters support New Jersey; implement _pq_goto_room_seek and adapt asset's varying y-position for pq_interact
2025-06-15 17:09:52 -04:00
nEEtdo0d
64c5b5e30f
Merge branch 'master' into dev
2025-06-15 16:59:21 -04:00
LmeSzinc
9014b9640b
Upd: [TW] Event A Rose on the High Tower (event_20250520_cn)
2025-06-13 22:45:12 +08:00
guoh064
7cef54d350
Add: check leveling in cl1 daily
2025-06-08 13:08:19 +09:00
0O0o0oOoO00
54d5d018f0
add: exercise more power and exercise god mode
2025-06-08 09:57:30 +08:00
ZuoSiZhu
733b20a6db
fix: unexpected restarts caused by do_inject
2025-06-08 02:48:37 +08:00
ZuoSiZhu
dc1db0f0b4
adj: remove PushEverytime in Hook, set to auto update instead
2025-06-08 01:44:32 +08:00
xhqss
0339fe9dcc
Merge branch 'master_lme' into dev
...
# Conflicts:
# module/event_hospital/assets.py
2025-05-25 15:18:10 +08:00
travellerse
56a010366c
Add: [CN] Server 冬月计划 长弓计划
2025-05-24 00:34:21 +08:00
0O0o0oOoO00
f5191c03a1
add: push luahook resource everytime
2025-05-22 17:40:05 +08:00
LmeSzinc
23d4bd308e
Merge branch 'master' into dev
2025-05-22 14:23:40 +08:00
0O0o0oOoO00
16fa913b69
fix: merge mistake of more event
2025-05-21 13:17:53 +08:00
ZuoSiZhu
78112d5e2b
fix: Entrance of event_20250520
2025-05-21 09:31:48 +08:00
ZuoSiZhu
99ae4c66d4
Add: cheat support for daemon
2025-05-21 03:30:02 +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
0O0o0oOoO00
13eb3a079f
fix: lack of KeepOil setting
2025-05-19 11:37:17 +08:00
0O0o0oOoO00
75267083c9
Merge branch 'feature/more' into dev
...
# Conflicts:
# alas.py
# module/exception.py
2025-05-18 22:03:42 +08:00
