Zuosizhu
511249a4b9
Add: HookOp to tasks
2026-01-24 13:43:26 +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
LmeSzinc
98c513baff
Tmp: Move date a live collab event entrance upwards
2025-11-26 14:31:28 +08:00
0O0o0oOoO00
ae1e32aef2
adj: separate the settings of the scheduler watcher
2025-08-09 20:13:32 +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
726f61b10a
Upd: Move coalition back after event
2025-07-24 21:48:01 +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
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
373cf7e919
Add: Event entrance of Neon City Investigator (coalition_20250626)
2025-06-26 23:46:41 +08:00
guoh064
7cef54d350
Add: check leveling in cl1 daily
2025-06-08 13:08:19 +09:00
ZuoSiZhu
99ae4c66d4
Add: cheat support for daemon
2025-05-21 03:30:02 +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
0O0o0oOoO00
423ce223f9
add: restart chinac cloud phone
2025-05-18 20:43:18 +08:00
0O0o0oOoO00
03a59cca17
Merge branch 'dev' into feature/more
2025-05-11 15:29:08 +08:00
ZuoSiZhu
9304e3931a
Fix: config_updater will correctly handle dashboard items
2025-05-11 00:24:12 +08:00
0O0o0oOoO00
92d3616459
add: global speedup
2025-05-10 13:45:15 +08:00
nEEtdo0d
09caf9704f
Add: [EN] Private Quarters support
2025-04-27 13:12:08 -04:00
LA-DI-DA
62c33f27e0
Merge the remaining functions in MoreAlas
2025-04-24 23:30:50 +08:00
ZuoSiZhu
166b49f8f0
Merge branch 'master_lme' into dev
...
# Conflicts:
# alas.py
# module/config/config_manual.py
# module/ui/page.py
# module/ui/ui.py
2025-03-28 08:34:41 +08:00
LmeSzinc
985f49279f
Add: Configs for task Hospital
2025-03-28 01:05:09 +08:00
guoh064
e8afd8a5a9
Merge remote-tracking branch 'guoh064/shop_event_3' into dev
2025-03-23 21:32:39 +08:00
LA_DI_DA
01b24293c4
add: setting for luahook
2025-03-18 13:38:09 +08:00
ZuoSiZhu
b82b79988d
Merge remote-tracking branch 'lme/master' into dev
...
# Conflicts:
# module/config/argument/override.yaml
2025-03-14 00:57:23 +08:00
LmeSzinc
c5f1d6e18b
Add: Tools to do event story
2025-03-10 23:02:16 +08:00
guoh064
1f059ff84e
Add: Event Shop
...
Fix: correct pt locations to adapt
Fix: missing self parameter in ur_ship_costs
Opt: Refactor event shop item handling and improve max amount calculation
Fix: ensure bought_all is set correctly after confirming purchase
Fix: update ship buying logic to handle multiple purchases and ensure pt_ur is set correctly
2025-02-23 10:55:35 +08:00
xhqss
2ddc7fff1c
Merge branch 'master_lme'
...
# Conflicts:
# module/campaign/gems_farming.py
# module/config/config_manual.py
# module/handler/assets.py
# module/retire/retirement.py
# module/tactical/tactical_class.py
2025-01-16 08:52:42 +08:00
LmeSzinc
da81498211
Add: Task Awaken to GUI
2025-01-04 22:19:30 +08:00
LA_DI_DA
356c7f097b
Add: research farming for opsi hazard1
2024-07-17 22:36:01 +08:00
LA-DI-DA
23152493b1
Add: pick out auto research farming from more alas
2024-07-07 11:53:00 +08:00
LA_DI_DA
72acfd999b
fix(AutoRestart): lack of gui setting of InstanceRestart
2024-05-20 22:38:08 +08:00
LmeSzinc
6987d60c96
Add: Alas.EmulatorInfo settings
2024-03-28 12:44:42 +08:00
LA_DI_DA
3dba1cf7f9
Add: ship filter for GemsFarming
2024-03-04 22:35:19 +08:00
LA-DI-DA
c45954c4b0
Merge branch 'zuosizhu-alas/20230309' into smallkai-dev
...
# Conflicts:
# module/device/device.py
2023-12-23 11:07:19 +08:00
Zuosizhu
ac2b891229
Merge branch 'LmeSzinc:master' into 20230309
2023-12-23 09:15:12 +08:00
weeswelai
56fe530310
Add: Buy time-limited furniture in dorm.
2023-12-23 00:32:30 +08:00
LA-DI-DA
8ecebef114
Add: higher priority option for OpsiHazard1Leveling
2023-11-11 12:31:58 +08:00
LA-DI-DA
dc69ce0d79
Merge branch 'zuosizhu-alas/20230309' into smallkai
...
# Conflicts:
# module/map/assets.py
2023-10-22 12:07:37 +08:00
Zuosizhu
12e8a83005
Opt: Allow to set opsifleet in opsistronghold
2023-10-20 09:06:27 +08:00
LA-DI-DA
afa68adf00
Add: change ship's attribute
2023-10-11 11:19:21 +08:00
LA-DI-DA
e3db31de2e
Merge branch 'zuosizhu-alas/20230309' into smallkai-dev
2023-09-30 16:50:09 +08:00
LA-DI-DA
b077bf9719
Add: change ship type for GemsFarming when set C or D map
2023-09-30 16:50:01 +08:00
Zuosizhu
4d4d2377dc
Merge branch 'master_lme'
...
# Conflicts:
# module/device/method/droidcast.py
2023-09-28 18:09:13 +08:00
LA-DI-DA
09f4a227bb
Merge branch 'zuosizhu-alas/20230309' into smallkai
...
# Conflicts:
# module/config/argument/task.yaml
2023-09-23 22:30:37 +08:00
Zuosizhu
3b27323132
Merge remote-tracking branch 'LmeSzinc/feature' into merged_origin_feature
2023-09-11 20:24:49 +08:00
LmeSzinc
4e6f51ed7c
Sync: [SRC] Emulator settings
2023-09-10 15:04:32 +08:00
