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

761 Commits

Author SHA1 Message Date
LmeSzinc
317962c2ba Add: Chapter SP
(cherry picked from commit 17a385274b)
2026-03-27 22:49:35 +08:00
0O0o0oOoO00
e60b8c1d65 add: keep 1 level white flagship when auto retire
(cherry picked from commit b777b9656d)
2026-03-25 12:46:17 +08:00
Zuosizhu
457d03aa35 Merge new LuaHooks from branch "origin/dev" 2026-02-02 20:23:40 +08:00
Zuosizhu
b97212d2d2 Adj: configable AP preserve method. 2026-01-31 21:14:49 +08:00
Zuosizhu
d1174a7d88 Merge remote-tracking branch 'Lme/master' into unrefactor
# Conflicts:
#	module/campaign/campaign_event.py
#	module/campaign/os_run.py
#	module/coalition/coalition.py
#	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/os/operation_siren.py
#	module/os_handler/mission.py
#	module/webui/app.py
2026-01-24 14:18:46 +08:00
Zuosizhu
511249a4b9 Add: HookOp to tasks 2026-01-24 13:43:26 +08:00
LmeSzinc
bf4e06e565 Upd: Event stages 2026-01-23 01:32:27 +08:00
sui-feng-cb
14c70afe65 Add: war_archives_20221222_cn 2025-12-29 19:04:08 +08:00
Zuosizhu
0313dba2cd Merge new Hooks and full config from refactor 2025-12-24 23:38:01 +08:00
Zuosizhu
8e20d5a84e Fix: Old Gems_Farming method needs Change_Flagship option 2025-12-21 08:59:25 +08:00
xhqss
8c6cc62cdc UPD:without event 2025-12-19 15:15:18 +08:00
xhqss
a5dc9328c9 Merge branch 'master_lme' into dev
# Conflicts:
#	module/coalition/coalition.py
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/config_generated.py
#	module/os_shop/shop.py
2025-12-19 15:13:21 +08:00
LmeSzinc
fbb936f081 Del: Remove ship equipment change as lack of maintenance 2025-12-09 12:39:28 +08:00
Zuosizhu
5120649acb Merge remote-tracking branch 'Lme/master' into dev
# Conflicts:
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/i18n/en-US.json
2025-11-27 21:53:49 +08:00
guoh064
58ddb01976 Tmp: general config modification for coalition_20251120 2025-11-23 01:56:21 +08:00
xhqss
ad07ec150b Merge branch 'master_lme' into dev
# Conflicts:
#	module/config/argument/args.json
#	module/shop/ui.py
2025-11-07 18:11:22 +08:00
sui-feng-cb
d90390202b Add: war_archives_20220915_cn 2025-11-06 17:11:47 +08:00
xhqss
90c881fda0 Merge branch 'master_lme' into dev
# Conflicts:
#	module/coalition/coalition.py
#	module/config/argument/args.json
#	module/ui/assets.py
2025-10-17 00:30:43 +08:00
sui_feng
d89094b396 Add: war_archives_20231026_cn (#5221) 2025-10-16 19:46:24 +08:00
Zuosizhu
e8947aa534 Revert "Fix: temporary fix for OutOfMemory"
This reverts commit 48f7ce2637.
2025-09-28 20:03:23 +08:00
Zuosizhu
48f7ce2637 Fix: temporary fix for OutOfMemory 2025-09-28 13:04:13 +08:00
0O0o0oOoO00
f65933e89a Merge branch 'Lme/master' into dev
# Conflicts:
#	README.md
#	module/config/argument/args.json
2025-09-13 23:04:47 +08:00
LmeSzinc
8c4a9600e6 Refactor: Gitpython preparations 2025-09-02 00:59:07 +08:00
0O0o0oOoO00
eaf985d185 add: no damage for alas control 2025-09-01 18:12:51 +08:00
0O0o0oOoO00
ea2b678218 add: better global speedup for alas control 2025-08-30 22:17:06 +08:00
0O0o0oOoO00
065f0feca3 add: skip battle celebrate for alas 2025-08-30 21:16:59 +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
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
0O0o0oOoO00
ae1e32aef2 adj: separate the settings of the scheduler watcher 2025-08-09 20:13:32 +08:00
0O0o0oOoO00
bc44134e33 add: add scheduler watcher to alas task scheduler 2025-08-05 23:54:45 +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
726f61b10a Upd: Move coalition back after event 2025-07-24 21:48:01 +08:00
sui-feng-cb
6b49b92185 Add: war_archives_20220428_cn 2025-07-24 21:31:08 +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
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
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
64c5b5e30f Merge branch 'master' into dev 2025-06-15 16:59:21 -04: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