0O0o0oOoO00
fe63274fe7
Adj: remove the minimum oil limit of coalition
2025-07-09 18:28:57 +08:00
0O0o0oOoO00
81359c242e
Adj: remove the minimum oil limit of event hospital
2025-07-09 17:56:44 +08:00
ZuoSiZhu
5974efbf21
Fix: GGHandler won't restart game if Hook enabled
2025-07-06 00:51:46 +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
e74c0a5507
Merge pull request #4917 from LmeSzinc/bug_fix
...
Bug fix
2025-06-28 19:39:34 +08:00
LmeSzinc
9e256ce249
Fix: NEONCITY UI back and home
2025-06-28 19:36:07 +08:00
LmeSzinc
dea60200ce
Merge pull request #4916 from dragonheart107/assets
...
Upd: EN + JP coalition assets
2025-06-28 18:59:11 +08:00
dragonheart107
9b63eaee7c
Fix: assets for EN and JP
2025-06-27 22:18:08 +02:00
dragonheart107
100f3da214
Merge upstream
2025-06-27 21:11:43 +02:00
LmeSzinc
f000dd0997
Fix: Close coalition preparation before switching task
2025-06-27 04:57:12 +08:00
LmeSzinc
05f419fd13
Merge pull request #4909 from LmeSzinc/bug_fix
...
Add: Event Neon City Investigator (coalition_20250626)
2025-06-27 00:34:58 +08:00
LmeSzinc
7a773a4c02
Fix: Check empty fleets in coalition
2025-06-27 00:32:14 +08:00
LmeSzinc
cd86ef82ec
Fix: Swapped switch states
2025-06-27 00:24:56 +08:00
LmeSzinc
f6f7b7779d
Upd: UI page switching
2025-06-27 00:10:44 +08:00
LmeSzinc
37ad6c9d12
Upd: stage convert
2025-06-27 00:08:42 +08:00
LmeSzinc
118d80f61a
Add: Assets for coalition NEONCITY
2025-06-26 23:49:31 +08:00
LmeSzinc
373cf7e919
Add: Event entrance of Neon City Investigator (coalition_20250626)
2025-06-26 23:46:41 +08:00
LmeSzinc
aa3f4338fe
Chore: [ALAS] Reuse Switch.get() in Switch.appear()
2025-06-26 23:31:55 +08:00
Zuosizhu
f3b901e677
Fix: handle CrackerError in loop
2025-06-26 16:26:36 +08:00
Zuosizhu
5951073eb7
Fix: handle CrackerError
2025-06-26 16:08:23 +08:00
LmeSzinc
e630e550eb
Merge pull request #4908 from LmeSzinc/bug_fix
...
Bug fix
2025-06-26 01:23:54 +08:00
LmeSzinc
d4f1a44d20
Pref: no copy of scrcpy screenshots
2025-06-26 01:09:56 +08:00
LmeSzinc
b65932b404
Fix: Mute handle_exp_info in META combat
2025-06-26 01:03:18 +08:00
LmeSzinc
3f49aa47ad
Fix: [ALAS] ascreencap returns read-only images
2025-06-24 23:29:18 +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
ZuoSiZhu
e79777c792
Adj: Remove Method in OthersLogin
2025-06-21 16:55:43 +08:00
ZuoSiZhu
bff32b75e7
fix: delay interval option not working
2025-06-21 14:32:31 +08:00
LmeSzinc
59c9503ce1
Bug fix ( #4897 )
...
* Merge pull request #4890 from dragonheart107/assets
Fix: Meta sync tap
* Upd: Event entrance of Confluence of Nothingness
---------
Co-authored-by: dragonheart107 <153553566+dragonheart107@users.noreply.github.com >
2025-06-19 22:53:06 +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
dragonheart107
0757f0aef8
Merge pull request #4890 from dragonheart107/assets
...
Fix: Meta sync tap
2025-06-18 18:26:29 +08:00
guoh064
7967c3114c
Opt: speed up the frequency of opsi level check
2025-06-17 14:43:47 +09: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
dragonheart107
6accfdeba0
Fix: Meta sync tap
2025-06-15 05:23:38 +02:00
0O0o0oOoO00
8ecf55b508
add: add request time limit to luahook api
2025-06-14 19:12:58 +08:00
LmeSzinc
5fcf1aee95
Merge pull request #4882 from LmeSzinc/bug_fix
...
Bug fix
2025-06-14 01:33:39 +08:00
LmeSzinc
73a5ce7f02
Upd: [TW] Remove switches of storage disassemble, all server synced now
2025-06-14 01:31:44 +08:00
LmeSzinc
d1015d9e39
Upd: [TW] BOX assets ( #4879 )
2025-06-14 01:31:41 +08:00
LmeSzinc
3b4ac53d6c
Fix: [ALAS] Ignore errors in brute force connect
2025-06-14 01:16:09 +08:00
LmeSzinc
b2724dca64
Fix: [ALAS] Add notice to disable network bridging
2025-06-14 01:10:22 +08:00
LmeSzinc
c15bce0ab5
Pref: [ALAS] Replace ThreadPoolExecutor with alas threadpool
2025-06-14 00:44:57 +08:00
LmeSzinc
eb084ed591
Fix: [ALAS] Match 7555 in vbox config with MuMu instance_id
2025-06-14 00:18:56 +08:00
LmeSzinc
ac3ce726a5
Add: [ALAS] Support MuMuPlayer12 5.0
2025-06-14 00:18:56 +08:00
LmeSzinc
999a121625
Fix: SSL fields in deploy templates
2025-06-13 22:46:07 +08:00
LmeSzinc
9014b9640b
Upd: [TW] Event A Rose on the High Tower (event_20250520_cn)
2025-06-13 22:45:12 +08:00
LmeSzinc
370b44573b
Bug fix ( #4872 )
...
* Fix: [ALAS] close pillow Image object
* Merge pull request #4866 from dragonheart107/assets
Fix: Meta-sync asset change for EN
---------
Co-authored-by: dragonheart107 <153553566+dragonheart107@users.noreply.github.com >
2025-06-10 21:29:54 +08:00
dragonheart107
86eaac9375
Merge pull request #4866 from dragonheart107/assets
...
Fix: Meta-sync asset change for EN
2025-06-10 17:56:24 +08:00
LmeSzinc
25c81f08f4
Fix: [ALAS] close pillow Image object
2025-06-09 13:06:52 +08:00
