0O0o0oOoO00
f1cfd90deb
fix: conflict between exit when server is under maintenance and instance restart
2025-07-17 17:14:36 +08:00
0O0o0oOoO00
acd749852f
fix: when merging "more", there is a lack of exiting the instance during server maintenance
2025-07-13 22:22:11 +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
77569a4532
Fix: find_emulator_instance may return None
2025-07-11 22:05:37 +08:00
dragonheart107
4c016a7830
Fix: PQ home button moved ( #4942 )
...
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com >
2025-07-11 21:49:37 +08:00
guoh064
a94dee218a
Merge pull request #4945 from guoh064/private_quarters
...
Add: [JP] assets for private quarters
2025-07-11 21:48:03 +08:00
LmeSzinc
cbba8f024a
Fix: Missing series in FILTER_REGEX
2025-07-11 00:37:33 +08:00
LmeSzinc
ba3a9a9e1e
Chore: format code
2025-07-11 00:14:47 +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
da837c391e
Upd: Research S8 series assets
2025-07-11 00:02:48 +08:00
LmeSzinc
75d802fdef
Upd: Research S8 projects and regex
2025-07-10 23:17:04 +08:00
LmeSzinc
d28ace6294
Upd: Research S8 configs and presets
2025-07-10 22:42:17 +08:00
guoh064
7c7c568ca3
Fix: missing HiddenZoneDataLogger in regex ( #4939 )
2025-07-10 22:41:57 +08:00
LmeSzinc
f016e7a2d6
Upd: patch mimetype
2025-07-10 03:03:52 +08:00
LmeSzinc
6a80e8c190
Upd: [TW] assets for _reward_wait_mission_list
2025-07-10 02:41:31 +08:00
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
sui-feng-cb
3001ae011a
Add: war_archives_20220728_cn
2025-07-07 18:00:53 +08:00
ZuoSiZhu
5974efbf21
Fix: GGHandler won't restart game if Hook enabled
2025-07-06 00:51:46 +08:00
LmeSzinc
ad10cd4c72
Upd: Battle UI Star
2025-07-04 23:41:29 +08:00
LmeSzinc
98501877ee
Pref: [ALAS] Avoid global importing lz4
2025-07-04 20:34:21 +08:00
LmeSzinc
1764aef553
Fix: [ALAS] nemuipc lib might be None
2025-07-04 19:51:32 +08:00
LmeSzinc
0ab6d50656
Upd: [TW] Event Toward Tulipa’s Seas ( #4922 )
2025-07-03 22:59:22 +08:00
LmeSzinc
ee6f360901
Fix: [ALAS] Handle JobTimeout at the nemu ipc connection trials
2025-07-03 22:59:22 +08:00
nEEtdo0d
4af6852f70
Upd: restrict private quarters task to EN for master merge; other servers should review and capture own assets to support task
2025-06-28 16:20:26 -04: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
9e256ce249
Fix: NEONCITY UI back and home
2025-06-28 19:36:07 +08:00
dragonheart107
9b63eaee7c
Fix: assets for EN and JP
2025-06-27 22:18:08 +02:00
LmeSzinc
f000dd0997
Fix: Close coalition preparation before switching task
2025-06-27 04:57:12 +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
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
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
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
