1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-21 02:59:30 +08:00
Commit Graph

1879 Commits

Author SHA1 Message Date
0O0o0oOoO00
eaf985d185 add: no damage for alas control 2025-09-01 18:12:51 +08:00
Zuosizhu
567e854546 Merge branch 'master_of_lme' into dev
# Conflicts:
#	module/config/argument/args.json
#	module/gacha/gacha_reward.py
#	module/shop/shop_reward.py
#	module/ui/assets.py
2025-09-01 16:07:45 +08:00
LmeSzinc
b911e53d3e Fix: War archive shouldn't have option_bold 2025-08-30 22:18:53 +08:00
0O0o0oOoO00
ea2b678218 add: better global speedup for alas control 2025-08-30 22:17:06 +08:00
LmeSzinc
719f225316 Gui: Show event as stored to prevent someone trying to select it 2025-08-30 22:15:53 +08:00
0O0o0oOoO00
065f0feca3 add: skip battle celebrate for alas 2025-08-30 21:16:59 +08:00
LmeSzinc
7f1021c79f I18n: Simplify Campaign.Name help text 2025-08-29 21:49:22 +08:00
下面我簡單喵兩句
fcbc77c887 Upd:[TW]Event:Secrets of the Abyss (#5087)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2025-08-29 21:34:09 +08:00
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
dragonheart107
4cd166212b Upd: GUI text 2025-08-23 20:29:41 +02: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
zhenghan123
145b4991d8 Merge pull request #5022 from zhenghan123/master
修改提醒,每周蛋糕礼盒消耗的是钻石而不是物资
2025-08-14 18:34:20 +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
guoh064
8b784616ae Add: config_updater for concurrent events 2025-08-02 01:16:17 +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
0O0o0oOoO00
05a6574b74 del: duplicate fields in task.yaml 2025-07-25 19:32:40 +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
0d38332185 Fix: loop stage TS 2025-07-25 00:49:49 +08:00
LmeSzinc
b13e92694b Add: Chapter TS 2025-07-25 00:17:30 +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
ChthoIly
9e91543a14 Add: [CN] Private Quarters localization (#4933)
* Upd: [CN] Private Quarters localization
Add: Add CN server asset for Private Quarters
Fix: Stuck in Private Quarters Shop when not enough gold coins
Changed DigitCounter OCR parameters for CN server to fix unexpected ocr result when reading daily intimacy count

* re-compress asset images using `image_fixup()` from #4849 (comment)
2025-07-11 00:04:28 +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
7e3bfdefd3 Fix: i18n 2025-06-21 21:06:26 +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